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

Timestamp:

2013-05-28T11:38:08+12:00 (11 years ago)

Author:

jmt12

Message:

removing doubled up debug comments and putting some paths in speechmarks to be safer

File:

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

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

@@ -85 +85 @@
 my $gs_archives_dir = $gs_collection_dir . '/archives';
 # - directories within HDFS
-my $hdfs_input_dir = &urlCat('hdfs://' . $ENV{'HDFSHOST'} . ':' . $ENV{'HDFSPORT'}, 'user', $username, 'gsdl', 'collect', $collection, 'import');
-my $hdfs_output_dir = &urlCat('hdfs://' . $ENV{'HDFSHOST'} . ':' . $ENV{'HDFSPORT'}, 'user', $username, 'gsdl', 'collect', $collection, 'archives');
+#my $hdfs_input_dir = &urlCat('hdfs://' . $ENV{'HDFSHOST'} . ':' . $ENV{'HDFSPORT'}, 'user', $username, 'gsdl', 'collect', $collection, 'import');
+my $hdfs_input_dir = &urlCat('hdfs://', 'user', $username, 'gsdl', 'collect', $collection, 'import');
+#my $hdfs_output_dir = &urlCat('hdfs://' . $ENV{'HDFSHOST'} . ':' . $ENV{'HDFSPORT'}, 'user', $username, 'gsdl', 'collect', $collection, 'archives');
+my $hdfs_output_dir = &urlCat('hdfs://', 'user', $username, 'gsdl', 'collect', $collection, 'archives');
 
 # 2. Copy the import directory into HDFS
@@ -186 +188 @@
 print " * Running import using Hadoop...";
 my $hadoop_log = $gs_results_dir . '/hadoop.log';
-my $hadoop_command = $hadoop_exe . ' jar ' . $gsdl_hadoop_ext . '/lib/hadoop-greenstone.jar org.nzdl.gsdl.HadoopGreenstoneIngest "' . $gsdl_home . '" "' . $hdfs_fs_prefix . '" "' . $ENV{'HADOOP_PREFIX'} . '" ' . $collection . " " .  $hdfs_input_dir . " " . $hdfs_output_dir . " > " . $hadoop_log . " 2>&1";
+my $hadoop_command = $hadoop_exe . ' jar ' . $gsdl_hadoop_ext . '/lib/hadoop-greenstone.jar org.nzdl.gsdl.HadoopGreenstoneIngest "' . $gsdl_home . '" "' . $hdfs_fs_prefix . '" "' . $ENV{'HADOOP_PREFIX'} . '" ' . $collection . ' "' .  $hdfs_input_dir . '" "' . $hdfs_output_dir . '" > ' . $hadoop_log . ' 2>&1';
 &shellCommand($hadoop_command);
 print "Done!\n";
@@ -258 +260 @@
   my $paths = '"' . join('" "', @_) . '"';
   my $hdfs_command = $hadoop_exe . ' fs -' . $command . ' ' . $paths . ' 2>&1';
-  if ($debug)
-  {
-    print STDERR "[DEBUG] $hdfs_command\n";
-  }
   &shellCommand($hdfs_command);
   return $?;