Changeset 10339

Timestamp:

2005-07-28T11:52:21+12:00 (19 years ago)

Author:

kjdon

Message:

uses new parse2 arg parsing, added 'use strict'

File:

• trunk/gsdl/bin/script/exportcol.pl (modified) (10 diffs)

trunk/gsdl/bin/script/exportcol.pl

@@ -31 +31 @@
 }
 
+use strict;
+no strict 'refs'; # allow filehandles to be variables and vice versa
+no strict 'subs'; # allow barewords (eg STDERR) as function arguments
+
 use util;
-use parsargv;
+use parse2;
 use printusage;
 
@@ -39 +43 @@
     'desc' => "{scripts.language}",
     'type' => "string",
-    'reqd' => "no" },
-      { 'name' => "xml",
-    'desc' => "{scripts.xml}",
-    'type' => "flag",
     'reqd' => "no" },
       { 'name' => "out",
@@ -62 +62 @@
     'type' => "string",
     'deft' => "exported_collections",
-    'reqd' => "no" } ];
+    'reqd' => "no" },
+      { 'name' => "xml",
+    'desc' => "{scripts.xml}",
+    'type' => "flag",
+    'reqd' => "no",
+    'hiddengli' => "yes" },
+      { 'name' => "gli",
+    'desc' => "",
+    'type' => "flag",
+    'reqd' => "no",
+    'hiddengli' => "yes" },
+
+      ];
 
 my $options = { 'name' => "exportcol.pl",
@@ -77 +89 @@
 
 sub main {
-    my ($language, $out, $cdname, $gli);
+    my ($language, $out, $cdname, $cddir, $gli);
 
     my $xml = 0;
-    my $no_netscape = 0;
-
-    if (!parsargv::parse(\@ARGV,
-             'language/.*/', \$language,
-             'out/.*/STDERR', \$out,
-             'cdname/.*/Greenstone Collections', \$cdname,
-             'cddir/.*/exported_collections', \$cddir,
-             'gli', \$gli,
-             'nonetscape', \$no_netscape,
-             q^xml^, \$xml)) {
-
-    &PrintUsage::print_txt_usage($options, "{exportcol.params}");
-    die "\n";
-    }
-
-    my $use_netscape = ($no_netscape) ? 0 : 1;
+    my $nonetscape = 0;
+
+    my $hashParsingResult = {};
+    my $blnParseFailed = "false";
+    # parse options
+    my $intArgLeftinAfterParsing = parse2::parse(\@ARGV,$arguments,$hashParsingResult,"allow_extra_options");
+    # don't care how many args are left - can have multiple collection names
+    foreach my $strVariable (keys %$hashParsingResult)
+    {
+    eval "\$$strVariable = \$hashParsingResult->{\"\$strVariable\"}";
+    }
+    
+    # If $language has been specified, load the appropriate resource bundle
+    # (Otherwise, the default resource bundle will be loaded automatically)
+    if ($language && $language =~ /\S/) {
+    &gsprintf::load_language_specific_resource_bundle($language);
+    }
+    
+    if ($xml) {
+        &PrintUsage::print_xml_usage($options);
+    print "\n";
+    return;
+    }
+    
+    if ($gli) { # the gli wants strings to be in UTF-8
+    &gsprintf::output_strings_in_UTF8; 
+    }
+    
+    my $use_netscape = ($nonetscape) ? 0 : 1;
 
     # If $language has been specified, load the appropriate resource bundle
@@ -112 +137 @@
     }
 
-# No longer needed now -cddir flag also included (with default)    
-#    my $dirname=""; 
-#    if ($cdname eq "") {
-#   $cdname = "Greenstone Collections";
-#   $dirname = "exported_collections";
-#    } else {
-#   $dirname = $cdname;
-#   $dirname =~ s/\s//g;
-#   $dirname = "exported_".$dirname;
-#    }
-
     my @coll_list = @ARGV;
-
+    
     if (not @coll_list) { # empty list
     &PrintUsage::print_txt_usage($options, "{exportcol.params}");
@@ -148 +162 @@
     # check each collection
     my @valid_coll_list = ();
-    foreach $c (@coll_list) {
+    foreach my $c (@coll_list) {
     my $colldir = &util::filename_cat ($ENV{'GSDLHOME'}, "collect", $c);
     if (! -d $colldir) {
@@ -217 +231 @@
     print MANIFESTCFG "database:\n";
     print MANIFESTCFG '  etc ';
-    foreach $c (@valid_coll_list) {
+    foreach my $c (@valid_coll_list) {
     print MANIFESTCFG "collect\\$c\\index\\text\\$c.ldb ";
     }
@@ -296 +310 @@
 
     # copy the collections over 
-    foreach $c (@valid_coll_list) {
+    foreach my $c (@valid_coll_list) {
     #old directories
     my $colldir = &util::filename_cat ($ENV{'GSDLHOME'}, "collect", $c);
@@ -316 +330 @@
     open INFILE, "<$collectcfg";
     open OUTFILE, ">$collectcfg.tmp";
+    my $line;
     while ($line = <INFILE>) {
         if ($line =~ /^\s*public\s+false/) {
@@ -336 +351 @@
     my $successcolls = "";
     my $first = 1;
-    foreach $c (@valid_coll_list) {
+    foreach my $c (@valid_coll_list) {
     if ($first) {
         $first=0;