Changeset 10255

Timestamp:

2005-07-19T16:56:45+12:00 (19 years ago)

Author:

kjdon

Message:

small mods, added use strict

File:

• trunk/gsdl/bin/script/import.pl (modified) (4 diffs)

trunk/gsdl/bin/script/import.pl

@@ -45 +45 @@
 use docprint;
 use util;
-use parsargv;
 use FileHandle;
 use gsprintf 'gsprintf';
 use printusage;
 use parse2;
+
+use strict;
+no strict 'refs'; # allow filehandles to be variables and vice versa
+no strict 'subs'; # allow barewords (eg STDERR) as function arguments
 
 my $oidtype_list = 
@@ -221 +224 @@
     $pluginfo, $sortmeta, $removeprefix, $removesuffix, 
     $archive_info_filename, $statsfile,
-    $archive_info, $processor, $out, $faillog, $collectdir, $gli);
+    $archive_info, $processor, $out, $faillog, $collectdir, $gli, $language);
 
     my $xml = 0;
@@ -230 +233 @@
     my $blnParseFailed = "false";
     # general options available to all plugins
-    $intArgLeftinAfterParsing = parse2::parse(\@ARGV,$arguments,$hashParsingResult,"allow_extra_options");
+    my $intArgLeftinAfterParsing = parse2::parse(\@ARGV,$arguments,$hashParsingResult,"allow_extra_options");
     # If there are more than one argument left after parsing, it mean user input too many arguments.
     # Error occoured  will return 0
     if($intArgLeftinAfterParsing != 1)
     {
-    $blnParseFailed = "true"; 
-    }
-    if($blnParseFailed eq "true")
-    {
     &PrintUsage::print_txt_usage($options, "{import.params}");
     die "\n";
     }
+    
     foreach my $strVariable (keys %$hashParsingResult)
     {
@@ -249 +249 @@
     # If $language has been specified, load the appropriate resource bundle
     # (Otherwise, the default resource bundle will be loaded automatically)
-    if ($language) {
+    if ($language && $language =~ /\S/) {
     &gsprintf::load_language_specific_resource_bundle($language);
     }