Changeset 15703 for gsdl/trunk/perllib/classify.pm

Timestamp:

2008-05-26T16:32:50+12:00 (16 years ago)

Author:

mdewsnip

Message:

Added "use strict", and fixed a whole bunch of warnings as a consequence.

File:

• gsdl/trunk/perllib/classify.pm (modified) (10 diffs)

gsdl/trunk/perllib/classify.pm

@@ -30 +30 @@
 require util;
 require AllList;
+
 use gsprintf;
-
-#use GDBM_File;
+use strict; no strict 'subs';
 use unbuildutil;
 
@@ -42 +42 @@
 
 
-$oid_to_clids = {};
+my $oid_to_clids = {};
 
 sub load_classifier_for_info {
@@ -79 +79 @@
      unshift (@INC, $colclassdir);
     
-    foreach $classifyoption (@$classify_list) {
+    foreach my $classifyoption (@$classify_list) {
 
     # get the classifier name
@@ -146 +146 @@
     my ($classifiers) = @_;
     
-    foreach $classobj (@$classifiers) {
+    foreach my $classobj (@$classifiers) {
     $classobj->init();
     }
@@ -161 +161 @@
     my $children = undef;
 
-    $childs = $doc_db_hash->{'contains'};
-    if (defined ($childs)) {
-    $childs =~ s/\@$//;  #remove trailing @
-    $childs =~ s/^\"\.//; #remove initial ".
-    @$children = split /\;\"\./, $childs;
-    
+    my $contains = $doc_db_hash->{'contains'};
+    if (defined ($contains)) {
+    $contains =~ s/\@$//;  #remove trailing @
+    $contains =~ s/^\"\.//; #remove initial ".
+    @$children = split /\;\"\./, $contains;
     }
 
@@ -202 +201 @@
     my ($doc_obj, $cursection, $doc_db_hash) = @_;
  
-    foreach $key (keys %$doc_db_hash) {
+    foreach my $key (keys %$doc_db_hash) {
     #don't need to store these metadata
     next if $key =~ /(thistype|childtype|contains|docnum|doctype|classifytype)/i;
@@ -221 +220 @@
 
     my @entries = split(/\n/, $gdb_str_ref);
-    foreach $entry (@entries) {
+    foreach my $entry (@entries) {
     my($key, $value) = ($entry =~ /^<([^>]*)>(.*?)$/ );
     $hashref->{$key} .= '@' if defined $hashref->{$key};
@@ -288 +287 @@
     my ($classifiers, $doc_obj) = @_;
     
-    foreach $classobj (@$classifiers) {
+    foreach my $classobj (@$classifiers) {
     my $title = $classobj->{'title'};
     $classobj->classify($doc_obj);
@@ -309 +308 @@
     # get each of the classifications
     my $next_classify_num = 1;
-    foreach $classifier (@$classifiers)
+    foreach my $classifier (@$classifiers)
     {
     my $classifier_info = $classifier->get_classify_info($gli);
@@ -456 +455 @@
     return $classifyinfo->{'numleafdocs'} if (defined $classifyinfo->{'numleafdocs'});
 
-    foreach $content (@{$classifyinfo->{'contains'}}) {
+    foreach my $content (@{$classifyinfo->{'contains'}}) {
     if (defined $content->{'OID'}) {
         # found a book