Changeset 24684 for gs2-extensions/parallel-building/trunk/src

Timestamp:

2011-09-28T13:21:02+13:00 (13 years ago)

Author:

jmt12

Message:

Changed order of arguments to mpiimport to make site (a GS3 thing) last and optional

File:

• gs2-extensions/parallel-building/trunk/src/perllib/ParallelInexport.pm (modified) (1 diff)

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

@@ -49 +49 @@
    }
    close ($filelist); 
-   
+
    # invoke the farmer to start processing the files
-   $site = "localsite" if ((!defined $site) || ($site eq ""));
+   $site = "" if (!defined $site);
    my $gsdlhome = $ENV{'GSDLHOME'};
-   my $farmer_exe = &util::filename_cat($gsdlhome,"bin",$ENV{'GSDLOS'},"farmer".&util::get_os_exe());
-
-   my $mpi_cmd = "mpirun -np $jobs $farmer_exe $tmp_filelist $epoch $gsdlhome $site $collection";
-
+   my $farmer_exe = 'mpiimport'; # will be on PATH
+   my $mpi_cmd = "mpirun -np $jobs $farmer_exe $tmp_filelist $epoch $gsdlhome $collection $site";
    system ($mpi_cmd);
 }