Changeset 24624 for gs2-extensions/parallel-building

Timestamp:

2011-09-21T15:59:57+12:00 (13 years ago)

Author:

jmt12

Message:

Rather than having the Greenstone output sent to some obscure log, use popen to output back through the calling Perl script

File:

• gs2-extensions/parallel-building/trunk/src/src/mpibuildcol-src/mpibuildcol.cpp (modified) (2 diffs)

gs2-extensions/parallel-building/trunk/src/src/mpibuildcol-src/mpibuildcol.cpp

@@ -415 +415 @@
             TiXmlText* text_command = text_grandchild->ToText();
             stringstream commandstrstr;
-            commandstrstr << text_command->Value();
+            commandstrstr << text_command->Value() << " 2>&1";
             // - and create the new task given the command string and
             //   accounting for any preqrequisites via the the parent task id
@@ -480 +480 @@
     message += command;
     debugPrint(worker_id, message);
-    system(command); // asynchronous
+    // asynchronous
+    //system(command);
+    FILE *pipe = popen(command, "r");
+    if (!pipe)
+    {
+      cerr << "Warning! Failed to open pipe to command: " << command << endl;
+    }
+    else
+    {
+      char buffer[1024];
+      while(fgets(buffer, sizeof(buffer), pipe) != NULL)
+      {
+        cout << buffer;
+      }
+      pclose(pipe);
+    }
     // 2. Send a reply back containing the id of the task just completed
     debugPrint(worker_id, "complete");