Changeset 29096 for main/trunk/greenstone2/perllib/inexport.pm

Timestamp:

2014-06-12T12:18:42+12:00 (10 years ago)

Author:

kjdon

Message:

new argument to print_txt_usage. Pass 1 if you don't want the output paged. We use this when there has been an error and we are outputing the options before quitting the import/build. If the output is paged, then the die doesn't end up getting through to the top level program. So for full-rebuild, if the import died because of a parsing error, if the output had been paged, then the import was stopped but the system return value was 0, and then it would go on to the next stage, trying to build. So now, if we are stopping because of an error, then don't page the output. Also added a few more (hopefully) helpful error messages

File:

• main/trunk/greenstone2/perllib/inexport.pm (modified) (5 diffs)

main/trunk/greenstone2/perllib/inexport.pm

@@ -195 +195 @@
     if ($intArgLeftinAfterParsing == -1)
     {
-    &PrintUsage::print_txt_usage($options, "{import.params}");
+    &PrintUsage::print_txt_usage($options, "{import.params}",1);
+    print STDERR "Something went wrong during parsing the arguments. Scroll up for details.\n";
     die "\n";
     }
-    
+
     my $language = $self->{'language'};
     # If $language has been specified, load the appropriate resource bundle
@@ -217 +218 @@
     }
 
-
     if ($self->{'xml'}) {
         &PrintUsage::print_xml_usage($options);
@@ -227 +227 @@
     &gsprintf::output_strings_in_UTF8; 
     }
-    
+
+    # If the user specified -h, then we output the usage
+    if (@$argv && $argv->[0] =~ /^\-+h/) {
+    &PrintUsage::print_txt_usage($options, "{import.params}");
+    die "\n";
+    }
     # now check that we had exactly one leftover arg, which should be 
     # the collection name. We don't want to do this earlier, cos 
     # -xml arg doesn't need a collection name
-    # Or if the user specified -h, then we output the usage also
-
-    if ($intArgLeftinAfterParsing != 1 || (@$argv && $argv->[0] =~ /^\-+h/))
+
+    if ($intArgLeftinAfterParsing != 1 )
     {
-    ## TODO if we had invalid arg, can we signal that to user???
-    &PrintUsage::print_txt_usage($options, "{import.params}");
+    &PrintUsage::print_txt_usage($options, "{import.params}", 1);
+    print STDERR "There should be one argument left after parsing the script args: the collection name.\n";
     die "\n";
     }
@@ -306 +310 @@
      
     if (($collection = &colcfg::use_collection($site, $collection, $collectdir)) eq "") {
-    &PrintUsage::print_txt_usage($options, "{import.params}");
+    #&PrintUsage::print_txt_usage($options, "{import.params}", 1);
     die "\n";
     }
@@ -1384 +1388 @@
         $doc_source_file = &util::placeholders_to_abspath($doc_source_file);
 
-        if (!&util::filename_is_absolute($doc_source_file)) {
+        if (!&FileUtils::isFilenameAbsolute($doc_source_file)) {
         $doc_source_file = &FileUtils::filenameConcatenate($ENV{'GSDLCOLLECTDIR'},$doc_source_file);
         }