Changeset 10253 for trunk/gsdl/perllib/classify/HFileHierarchy.pm

Timestamp:

2005-07-19T16:18:25+12:00 (19 years ago)

Author:

kjdon

Message:

added 'use strict' to all classifiers, and made modifications (mostly adding 'my') to make them compile

File:

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

trunk/gsdl/perllib/classify/HFileHierarchy.pm

@@ -33 +33 @@
 use cfgread;
 use sorttools;
+
+use strict;
+no strict 'refs'; # allow filehandles to be variables and viceversa
 
 sub BEGIN {
@@ -92 +95 @@
 
     my $self = (defined $hashArgOptLists)? new BasClas($classifierslist,$inputargs,$hashArgOptLists): new BasClas($classifierslist,$inputargs); 
+
+    if ($self->{'info_only'}) {
+    # don't worry about any options etc
+    return bless $self, $class;
+    }
 
     my $metadata = $self->{'metadata'};
@@ -177 +185 @@
     # hash is a list of two items. The first item is the OID and the second item
     # is the title
-    foreach $descriptor (keys (%$list)) {
+    foreach my $descriptor (keys (%$list)) {
         $self->{'descriptorlist'}->{$descriptor} = $list->{$descriptor}->[0];
         unless (defined $self->{'locatorlist'}->{$list->{$descriptor}->[0]}) {
@@ -218 +226 @@
 
     # sorted the keys - otherwise funny things happen - kjdon 03/01/03
-    foreach $OID (sort keys (%$list)) {
+    foreach my $OID (sort keys (%$list)) {
     my $tempinfo = $self->get_OID_entry ($OID, $classifyinfo, $list->{$OID}->{'title'}, "VList");
     
     if (defined $self->{'sort'}) {
         if ($self->{'reverse_sort'}) {
-        foreach $subOID (sort {$b->[1] cmp $a->[1];} @{$list->{$OID}->{'contents'}}) {
+        foreach my $subOID (sort {$b->[1] cmp $a->[1];} @{$list->{$OID}->{'contents'}}) {
             push (@{$tempinfo->{'contains'}}, {'OID'=>$subOID->[0]});
         }
         }
         else {
-        foreach $subOID (sort {$a->[1] cmp $b->[1];} @{$list->{$OID}->{'contents'}}) {
+        foreach my $subOID (sort {$a->[1] cmp $b->[1];} @{$list->{$OID}->{'contents'}}) {
             push (@{$tempinfo->{'contains'}}, {'OID'=>$subOID->[0]});
         }
@@ -234 +242 @@
     }
     else {
-        foreach $subOID (@{$list->{$OID}->{'contents'}}) {
+        foreach my $subOID (@{$list->{$OID}->{'contents'}}) {
         push (@{$tempinfo->{'contains'}}, {'OID'=>$subOID->[0]});
         }