Changeset 28015 for gs2-extensions

Timestamp:

2013-08-09T13:16:06+12:00 (11 years ago)

Author:

jmt12

Message:

Add an extra option that allows me to pass in the directory to write log files to, and add extra check when copying logs (by *.*) that the log directory isn't empty

File:

• gs2-extensions/parallel-building/trunk/src/bin/script/hadoop_import.pl (modified) (5 diffs)

gs2-extensions/parallel-building/trunk/src/bin/script/hadoop_import.pl

@@ -18 +18 @@
 # 0. Init
 my $collection = 'test';
-my $use_thrift = 1;
+my $use_thrift = 0;
 my $start_thrift = 0;
 my $debug = 0;
@@ -35 +35 @@
 my $username = `whoami`;
 chomp($username);
+my $gs_results_dir = '';
 
 `rocks > /dev/null 2>&1`;
@@ -88 +89 @@
     $use_nfs = 1;
   }
+  if ($ARGV[$offset] eq '-logdir')
+  {
+    $offset++;
+    $gs_results_dir = $ARGV[$offset];
+  }
   $offset++;
 }
@@ -106 +112 @@
   die("Error! Collection's import directory cannot be found: " . $gs_import_dir . "\n");
 }
-my $gs_results_dir = $gs_collection_dir . '/results';
-if (!-d $gs_results_dir)
-{
-  mkdir($gs_results_dir, 0755);
-}
-$gs_results_dir .= '/' . time();
+if ($gs_results_dir eq '')
+{
+  $gs_results_dir = $gs_collection_dir . '/results';
+  if (!-d $gs_results_dir)
+  {
+    mkdir($gs_results_dir, 0755);
+  }
+  $gs_results_dir .= '/' . time();
+}
 if (!-d $gs_results_dir)
 {
@@ -402 +411 @@
   &shellCommand('cp /tmp/greenstone/*.* ' . $gs_results_dir);
 }
-if (-d $gs_collection_dir . '/logs')
+if (-d $gs_collection_dir . '/logs' && !&dirIsEmpty($gs_collection_dir . '/logs'))
 {
   &shellCommand('cp ' . $gs_collection_dir . '/logs/*.* ' . $gs_results_dir);