Changeset 30298 for gs2-extensions/parallel-building/trunk/src/src/mpiimport-src/mpiimport.cpp

Timestamp:

2015-10-09T17:26:26+13:00 (9 years ago)

Author:

jmt12

Message:

Correcting path to manifest files for use in Greenstone3. Started to think about making this Windows safe by defining path separator by OS. However calls through to perl et al will need more work

File:

• gs2-extensions/parallel-building/trunk/src/src/mpiimport-src/mpiimport.cpp (modified) (4 diffs)

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

@@ -31 +31 @@
 #define BUFFERSIZE 512
 
+#if defined _WIN32 || defined __CYGWIN__
+const char path_sep = '\\';
+#else
+const char path_sep = '/';
+#endif
+
 int
 main ( int argc, char *argv [] )
@@ -142 +148 @@
     stringstream manifestfilename_strstr;
     if (site == NULL) {
-      manifestfilename_strstr << gsdlhomedir << "/collect/" << collection << "/tmp/manifest." << manifest_file_count << ".xml";
+      manifestfilename_strstr << gsdlhomedir << path_sep << "collect" << path_sep << collection << path_sep << "tmp" << path_sep << "manifest." << manifest_file_count << ".xml";
     }
     else {
-      manifestfilename_strstr << gsdlhomedir << "/sites/" << site << "/collect/" << collection << "/tmp/manifest." << manifest_file_count << ".xml";
+      manifestfilename_strstr << gsdlhomedir << path_sep << "web" << path_sep << "sites" << path_sep << site << path_sep << "collect" << path_sep << collection << path_sep << "tmp" << path_sep << "manifest." << manifest_file_count << ".xml";
     }
 
@@ -268 +274 @@
         // process a received job
         seconds = time(NULL);
-        fprintf(stderr, "[W%d:%lu] Processing: %s\n", rank, seconds, incoming, counter);
+        fprintf(stderr, "[W%d:%lu] Processing: %s (%d)\n", rank, seconds, incoming, counter);
         // create Greenstone import command
         // - incoming now contains the name of the manifest file to process
@@ -280 +286 @@
         char affinity[16] = "";
 #endif
-        if (site != NULL && strlen(site) > 0)
+
+    // In the commands below, need to consider Windows. In particular:
+    // /dev/null => NUL
+    // /tmp/file.log => %temp%\\file.log
+    // But we'll also have issues with affinity and source bash files
+    if (site != NULL && strlen(site) > 0)
         {
           if (gsdlhometest != NULL)
           {
-            sprintf(command, "%s import.pl -keepold -manifest %s -site %s %s > /tmp/gsimport-W%d-%d.log 2>&1", affinity, incoming, site, collection, rank, counter);
+        sprintf(command, "%s import.pl -keepold -manifest %s -site %s %s > /tmp/gsimport-W%d-%d.log 2>&1", affinity, incoming, site, collection, rank, counter);
           }
           else