Changeset 10256

Timestamp:

2005-07-19T16:57:23+12:00 (19 years ago)

Author:

kjdon

Message:

added use strict, and fixed up compile erros

File:

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

trunk/gsdl/bin/script/buildcol.pl

@@ -40 +40 @@
 
 use colcfg;
-use parsargv;
 use util;
 use FileHandle;
@@ -46 +45 @@
 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 $mode_list =
@@ -167 +170 @@
         'args' => $arguments };
 
+
+# globals
+my $collection;
+my $configfilename;
+my $out;
+
 sub gsprintf
 {
@@ -173 +182 @@
 
 
+
 &main();
-
 
 sub main
 {
+    # command line args
     my ($verbosity, $archivedir, $cachedir, $builddir, $maxdocs, 
     $debug, $mode, $indexname, $keepold, $remove_empty_classifications,
-    $create_images, $collectdir, $out, $buildtype, $textindex,
-    $no_strip_html, $no_text, $faillog, $gli);
+    $create_images, $collectdir, $build, $type, $textindex,
+    $no_strip_html, $no_text, $faillog, $gli, $index, $language);
 
     my $xml = 0;
@@ -188 +198 @@
     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
@@ -208 +218 @@
     # 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);
     }
@@ -253 +263 @@
     # read the configuration file
     $configfilename = &util::filename_cat ($ENV{'GSDLCOLLECTDIR'}, "etc", "collect.cfg");
+    my ($collectcfg, $buildtype); 
+
     if (-e $configfilename) {
     $collectcfg = &colcfg::read_collect_cfg ($configfilename);
@@ -266 +278 @@
     if (defined $collectcfg->{'buildtype'}) {
         $buildtype = $collectcfg->{'buildtype'};
-    } elsif (defined $collectcfg->{'searchtype'}) {
+    } elsif (defined $collectcfg->{'searchtypes'} || defined $collectcfg->{'searchtype'}) {
         $buildtype = "mgpp";
     } else {
@@ -356 +368 @@
     # fill in the default archives and building directories if none
     # were supplied, turn all \ into / and remove trailing /
+
+    my ($realarchivedir, $realbuilddir);  
     $archivedir = &util::filename_cat ($ENV{'GSDLCOLLECTDIR'}, "archives") if $archivedir eq "";
     $archivedir =~ s/[\\\/]+/\//g;
@@ -386 +400 @@
     &util::mk_all_dir ($realbuilddir);
 
-
+    my ($buildertype, $builderdir,  $builder);
     # if a builder class has been created for this collection, use it
     # otherwise, use the mg or mgpp builder