Changeset 15890 for gsdl/trunk/perllib/IncrementalBuildUtils.pm

Timestamp:

2008-06-06T11:04:57+12:00 (16 years ago)

Author:

mdewsnip

Message:

Adding "use strict", and fixing problems identified.

File:

• gsdl/trunk/perllib/IncrementalBuildUtils.pm (modified) (6 diffs)

gsdl/trunk/perllib/IncrementalBuildUtils.pm

@@ -52 +52 @@
 use cfgread;
 use colcfg;
+use strict;
 use util;
 
@@ -58 +59 @@
 
 # Change debugging to 1 if you want verbose debugging output
-$debug = 1;
+my $debug = 1;
 
 # Ensure the collection specific binaries are on the search path
@@ -301 +302 @@
             print STDERR "CMD: " . $cmd . "\n" unless !$debug;
             # Run command
-            $result = `$cmd 2>&1`;
+            my $result = `$cmd 2>&1`;
             print STDERR $result unless !$debug;
           }
@@ -362 +363 @@
             print STDERR "CMD: java -classpath \"$classpath:$jarpath\" $java_lucene $cur_java_args 2>&1\n" unless !$debug;
             # Run command
-            $result = `java -classpath \"$classpath:$jarpath\" $java_lucene $cur_java_args 2>&1`;
+            my $result = `java -classpath \"$classpath:$jarpath\" $java_lucene $cur_java_args 2>&1`;
             print STDERR $result unless !$debug;
           }
@@ -423 +424 @@
         print STDERR "* searching for classifier paths to be removed\n";
         
-        my $metadata = $doc_obj->getAllMetadata($section);
+        my $metadata = $doc_obj->getAllMetadata();
         foreach my $pair (@$metadata)
           {
@@ -430 +431 @@
             if (defined($classifier_tree_models{$key}))
               {
-                $model = $classifier_tree_models{$key};
+                my $model = $classifier_tree_models{$key};
                 print STDERR "* removing '" . $value . "' from classifier " . $model->getRootNode()->getCLID() . "\n";
                 $model->removeDocument($value, $oid, 1);