2883: Moved addToLogViewer function out of the template and into assets and

reformatted it properly.

diff --git a/apps/workbench/app/assets/javascripts/log_viewer.js b/apps/workbench/app/assets/javascripts/log_viewer.js
new file mode 100644 (file)
index 0000000..e152c6f
--- /dev/null
+++ b/apps/workbench/app/assets/javascripts/log_viewer.js
@@ -0,0 +1,56 @@
+function addToLogViewer(logViewer, lines) {
+    var re = /((\d\d\d\d)-(\d\d)-(\d\d))_((\d\d):(\d\d):(\d\d)) ([a-z0-9]{5}-[a-z0-9]{5}-[a-z0-9]{15}) (\d+) (\d+)? (.*)/;
+    for (var a in lines) {
+        var v = lines[a].match(re);
+        if (v != null) {
+
+            var ts = new Date(Date.UTC(v[2], v[3], v[4], v[6], v[7], v[8]));
+
+            v11 = v[11];
+            if (typeof v[11] === 'undefined') {
+                v11 = ' ';
+            }
+
+            var message = v[12];
+            var type = "";
+            if (v11 != ' ') {
+                if (/^stderr /.test(message)) {
+                    if (/^stderr crunchstat: /.test(message)) {
+                        type = "crunchstat";
+                        message = message.substr(19);
+                    } else if (/^stderr srun: /.test(message)) {
+                        type = "task-dispatch";
+                        message = message.substr(7);
+                    } else if (/^stderr slurmd/.test(message)) {
+                        type = "task-dispatch";
+                        message = message.substr(7);
+                    } else {
+                        type = "task-output";
+                        message = message.substr(7);
+                    }
+                } else {
+                    type = "task-dispatch";
+                }
+            } else {
+                if (/^status: /.test(message)) {
+                    type = "job-status";
+                    message = message.substr(8);
+                } else {
+                    type = "crunch";
+                }
+            }
+
+            logViewer.add({
+                id: logViewer.items.length,
+                timestamp: ts.toLocaleDateString() + " " + ts.toLocaleTimeString(),
+                taskid: v11,
+                message: message,
+                type: type
+            });
+
+        } else {
+            console.log("Did not parse: " + lines[a]);
+        }
+    }
+    logViewer.update();
+}

diff --git a/apps/workbench/app/views/jobs/_show_log.html.erb b/apps/workbench/app/views/jobs/_show_log.html.erb
index 042e5cb6f896543f85d0ce22c5c0afcd07d5aae1..717eb71ad1234c1003f54b1c403833fa60ebe258 100644 (file)
--- a/apps/workbench/app/views/jobs/_show_log.html.erb
+++ b/apps/workbench/app/views/jobs/_show_log.html.erb
@@ -1,62 +1,4 @@
 <script>
-
-function addToLogViewer(logViewer, lines) {
-  var re = /((\d\d\d\d)-(\d\d)-(\d\d))_((\d\d):(\d\d):(\d\d)) ([a-z0-9]{5}-[a-z0-9]{5}-[a-z0-9]{15}) (\d+) (\d+)? (.*)/;
-  for (var a in lines) {
-    var v = lines[a].match(re);
-    if (v != null) {
-
-    var ts = new Date(Date.UTC(v[2], v[3], v[4], v[6], v[7], v[8]));
-
-    v11 = v[11];
-    if (typeof v[11] === 'undefined') {
-      v11 = '&nbsp;';
-    }
-
-  var message = v[12];
-  var type = "";
-  if (v11 != '&nbsp;') {
-    if (/^stderr /.test(message)) {
-        if (/^stderr crunchstat: /.test(message)) {
-          type = "crunchstat";
-          message = message.substr(19);
-        } else if (/^stderr srun: /.test(message)) {
-          type = "task-dispatch";
-          message = message.substr(7);
-        } else if (/^stderr slurmd/.test(message)) {
-          type = "task-dispatch";
-          message = message.substr(7);
-        } else {
-          type = "task-output";
-          message = message.substr(7);
-        }
-    } else {
-        type = "task-dispatch";
-    }
-  } else {
-    if (/^status: /.test(message)) {
-        type = "job-status";
-        message = message.substr(8);
-    } else {
-        type = "crunch";
-    }
-  }
-
-    logViewer.add({
-      id: logViewer.items.length,
-      timestamp: ts.toLocaleDateString() + " " + ts.toLocaleTimeString(),
-      taskid: v11,
-      message: message,
-      type: type
-    });
-
-    } else {
-      console.log("Did not parse: " + lines[a]);
-    }
-  }
-  logViewer.update();
-}
-
 (function() {
 var logViewer = new List('log-viewer', {
   valueNames: [ 'id', 'timestamp', 'taskid', 'message', 'type'],