Changeset 15890

Timestamp:

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

Author:

mdewsnip

Message:

Adding "use strict", and fixing problems identified.

Location:

gsdl/trunk/perllib

Files:

• ClassifyTreeNode.pm (modified) (4 diffs)
• GDBMUtils.pm (modified) (4 diffs)
• IncrementalBuildUtils.pm (modified) (6 diffs)

gsdl/trunk/perllib/ClassifyTreeNode.pm

@@ -4 +4 @@
 use ClassifyTreePath;
 use GDBMUtils;
+use strict;
 
 # /** Constructor
@@ -121 +122 @@
         # and then replacing any occurance to the parents old clid with the
         # parents new clid
-        $old_child_clid = $child_node->getCLID();
+        my $old_child_clid = $child_node->getCLID();
         #rint STDERR "* considering: " . $old_child_clid . "\n";
         if($old_child_clid =~ /^CL/)
           {
-            $new_child_clid = $new_clid . substr($old_child_clid, length($old_clid));
+            my $new_child_clid = $new_clid . substr($old_child_clid, length($old_clid));
             #rint STDERR "* shifting child $old_child_clid to $new_child_clid\n";
             $child_node->changeCLID($new_child_clid);
@@ -407 +408 @@
             # children first!
             @children = reverse $self->getChildren();
-            $offset2 = scalar(@children) + 1;
+            my $offset2 = scalar(@children) + 1;
             foreach my $sibling_node (@children)
               {
@@ -432 +433 @@
     $child_node->setTitle($path->getLastPathComponent());
     # Update the contains metadata for this node
-    $contains = $self->getContains();
+    my $contains = $self->getContains();
     if($contains =~ /\w/)
       {

gsdl/trunk/perllib/GDBMUtils.pm

@@ -1 +1 @@
 package GDBMUtils;
 
+use strict;
 use util;
 
-$debug = 0;
+my $debug = 0;
 
 # /** Global variable to hold a string containing the last collection a gdbmGet 
@@ -42 +43 @@
       }
     # Where's the database?
-    $database = &getDatabasePath($collection);
+    my $database = &getDatabasePath($collection);
     # Are we in windows? Do we need .exe?
-    $exe = "";
+    my $exe = "";
     $exe = ".exe" if $ENV{'GSDLOS'} =~ /^windows$/i;
     # Retrieve the raw document content
     print STDERR "#Get document\ncmd: gdbmget$exe \"$database\" \"$oid\"\n" if $debug;
-    $value = `gdbmget$exe "$database" "$oid"`;
+    my $value = `gdbmget$exe "$database" "$oid"`;
     # Tidy up the ever growing number of newlines at the end of the value
     $value =~ s/(\r?\n)+/$1/g;
@@ -73 +74 @@
     my ($collection, $oid, $value) = @_;
     # Where's the database?
-    $database = &getDatabasePath($collection);
+    my $database = &getDatabasePath($collection);
     # Are we in windows? Do we need .exe?
     my $exe = &util::get_os_exe();
@@ -108 +109 @@
 sub getDatabasePath()
   {
-    $collection = shift(@_);
+    my $collection = shift(@_);
     # Find out the database extension
     my $ext = ".bdb";

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);