Changeset 27985

Timestamp:

2013-08-06T15:38:51+12:00 (11 years ago)

Author:

ak19

Message:

Now prints out exit status and weights and passes commands that get run when verbosity is set high

Location:

main/trunk/greenstone2/perllib

Files:

• mgbuilder.pm (modified) (3 diffs)
• mgppbuilder.pm (modified) (3 diffs)

main/trunk/greenstone2/perllib/mgbuilder.pm

@@ -451 +451 @@
         die "mgbuilder::build_index - couldn't run $mg_perf_hash_build_exe\n";
     }
-    system ("mg_perf_hash_build$exe -f \"$fullindexprefix\" $osextra");
+    
+    my $hash_cmd = "mg_perf_hash_build$exe -f \"$fullindexprefix\" $osextra"
+    print $outhandle "\ncmd: $hash_cmd\n" if ($self->{'verbosity'} >= 4);
+    my $hash_status = system ($hash_cmd);
+    print $outhandle "\nstatus from running hash_cmd: $hash_status\n" if ($self->{'verbosity'} >= 4);
 
     if (!-e "$mg_passes_exe" || 
@@ -477 +481 @@
 
     close ($handle);
+    my $passes_exit_status = $?;
+    print $outhandle "\nMG passes exit status $passes_exit_status\n"  if ($self->{'verbosity'} >= 4);
     
     # create the weights file
@@ -485 +491 @@
         die "mgbuilder::build_index - couldn't run $mg_weights_build_exe\n";
     }
-    system ("mg_weights_build$exe -f \"$fullindexprefix\" -t \"$fulltextprefix\" $osextra");
+    my $weights_cmd = "mg_weights_build$exe -f \"$fullindexprefix\" -t \"$fulltextprefix\" $osextra";
+    print $outhandle "\ncmd: $weights_cmd\n" if ($self->{'verbosity'} >= 4);
+    system ($weights_cmd);
 
     # create 'on-disk' stemmed dictionary

main/trunk/greenstone2/perllib/mgppbuilder.pm

@@ -516 +516 @@
         die "mgppbuilder::build_index - couldn't run $mgpp_perf_hash_build_exe\n";
     }
-    system ("mgpp_perf_hash_build$exe -f \"$fullindexprefix\" $osextra");
-
+    my $hash_cmd = "mgpp_perf_hash_build$exe -f \"$fullindexprefix\" $osextra";
+    print $outhandle "\ncmd: $hash_cmd\n" if ($self->{'verbosity'} >= 4);
+    
+    my $hash_status = system ($hash_cmd);
+    print $outhandle "\nstatus from running hash_cmd: $hash_status\n" if ($self->{'verbosity'} >= 4);   
+    
     if (!-e "$mgpp_passes_exe" || 
         !open ($handle, "| mgpp_passes$exe -M $maxnumeric $mgpp_passes_sections -f \"$fullindexprefix\" -I2 $osextra")) {
@@ -540 +544 @@
 
     close ($handle);
+    my $passes_exit_status = $?;
+    print $outhandle "\nMGPP Passes exit status $passes_exit_status\n"  if ($self->{'verbosity'} >= 4); 
     
     # create the weights file
@@ -548 +554 @@
         die "mgppbuilder::build_index - couldn't run $mgpp_weights_build_exe\n";
     }
-    system ("mgpp_weights_build$exe -f \"$fullindexprefix\" $osextra");
+    my $weights_cmd = "mgpp_weights_build$exe -f \"$fullindexprefix\" $osextra";
+    print $outhandle "\ncmd: $weights_cmd\n" if ($self->{'verbosity'} >= 4);    
+    system ($weights_cmd);
 
     # create 'on-disk' stemmed dictionary