Changeset 27179 for gs2-extensions

Timestamp:

2013-04-14T22:52:17+12:00 (11 years ago)

Author:

davidb

Message:

Mods to allow code to run with Greenstone3

Location:

gs2-extensions/parallel-building/trunk/src

Files:

• perllib/ParallelInexport.pm (modified) (1 diff)
• perllib/dbutil/gdbmserver.pm (modified) (2 diffs)
• src/mpiimport-src/mpiimport.cpp (modified) (1 diff)

gs2-extensions/parallel-building/trunk/src/perllib/ParallelInexport.pm

@@ -83 +83 @@
 
    # invoke the farmer to start processing the files
-   $site = "" if (!defined $site);
-   my $gsdlhome = $ENV{'GSDLHOME'};
-   my $farmer_exe = $gsdlhome . '/ext/parallel-building/linux/bin/mpiimport';
-   my $mpi_cmd = $gsdlhome . '/ext/parallel-building/linux/bin/mpirun ' . $mpi_flags . ' -n ' . $jobs . ' ' . $farmer_exe . ' ' . $tmp_filelist . ' ' . $epoch . ' ' . $gsdlhome . ' ' . $collection . ' ' . $site;
+   my $gsdlhome;
+
+   if (defined $site) {
+       $gsdlhome = $ENV{'GSDL3HOME'};
+   }
+   else {
+       $site = "";
+       $gsdlhome = $ENV{'GSDLHOME'};
+   }
+
+#   my $farmer_exe = $gsdlhome . '/ext/parallel-building/linux/bin/mpiimport';
+   my $farmer_exe = 'mpiimport';
+
+#   my $mpi_cmd = $gsdlhome . '/ext/parallel-building/linux/bin/mpirun ' . $mpi_flags . ' -n ' . $jobs . ' ' . $farmer_exe . ' ' . $tmp_filelist . ' ' . $epoch . ' ' . $gsdlhome . ' ' . $collection . ' ' . $site;
+   my $mpi_cmd = 'mpirun ' . $mpi_flags . ' -n ' . $jobs . ' ' . $farmer_exe . ' ' . $tmp_filelist . ' ' . $epoch . ' ' . $gsdlhome . ' ' . $collection . ' ' . $site;
    print STDERR "MPI Command: \"" . $mpi_cmd . "\"\n";
 #   system ($mpi_cmd);

gs2-extensions/parallel-building/trunk/src/perllib/dbutil/gdbmserver.pm

@@ -60 +60 @@
       &util::mk_dir($tmp_dir,1);
   }
-
 
   # 1. Check whether the server is already running by trying to locate the
@@ -206 +205 @@
   if (defined $create_server && $create_server == 1)
   {
+      my $tmp_collect_dir = &util::filename_cat($ENV{'GSDLCOLLECTDIR'},'tmp');
+      if (! &util::dir_exists($tmp_collect_dir)) {
+      &util::mk_dir($tmp_collect_dir,1);
+      }
+
     my $gdbm_client_handle = &_spawnClient($infodb_file_path);
     # Register this client on the server if necessary

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

@@ -141 +141 @@
         fprintf(stderr, "[M] Creating manifest file: %d\n", manifest_file_count);
     stringstream manifestfilename_strstr;
-    manifestfilename_strstr << gsdlhomedir << "/collect/" << collection << "/tmp/manifest." << manifest_file_count << ".xml";
+    if (site == NULL) {
+      manifestfilename_strstr << gsdlhomedir << "/collect/" << collection << "/tmp/manifest." << manifest_file_count << ".xml";
+    }
+    else {
+      manifestfilename_strstr << gsdlhomedir << "/sites/" << site << "/collect/" << collection << "/tmp/manifest." << manifest_file_count << ".xml";
+    }
+
     string manifestfilename_str = manifestfilename_strstr.str();
     char *manifestfilename = new char [manifestfilename_str.size() + 1];