Changeset 10254 for trunk/gsdl/perllib/plugins/MACROPlug.pm

Timestamp:

2005-07-19T16:27:51+12:00 (19 years ago)

Author:

kjdon

Message:

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

File:

• trunk/gsdl/perllib/plugins/MACROPlug.pm (modified) (7 diffs)

trunk/gsdl/perllib/plugins/MACROPlug.pm

@@ -29 +29 @@
 use parsargv;
 
+use strict;
+no strict 'refs'; # allow filehandles to be variables and viceversa
 
 sub BEGIN {
-    @ISA = ('BasPlug');
+    @MACROPlug::ISA = ('BasPlug');
 }
 
@@ -175 +177 @@
     my $image_macro = "false";
     my $norm_macro = "false";
-
+    my $currpackage = "";
+    
     #print STDERR "FILE@@@@@ $file\n";
 
     #foreach my $ta (@textarray) {
     
-    for ($k = 0; $k < scalar(@textarray); $k++) {
-    
-    $ta = $textarray[$k];
+    for (my $k = 0; $k < scalar(@textarray); $k++) {
+    
+    my $ta = $textarray[$k];
 
         #print STDERR "$ta\n" if ($file =~ m/port/);
@@ -370 +373 @@
     $results = $self->{'textcat'}->classify(\$text);
 
-    foreach $r (@$results) {
+    foreach my $r (@$results) {
     print $outhandle "Results: $r\n";
     
@@ -385 +388 @@
     while (<LANGFILE>) {
         
-        $line = $_;
+        my $line = $_;
         chomp($line);
 
-        $fn = $filename;
+        my $fn = $filename;
         $fn =~ s/.*\/(.*)\..*/$1/;
 
@@ -398 +401 @@
         print $outhandle "language code is $line\n";
 
-        foreach $r (@$results) {
+        foreach my $r (@$results) {
             print $outhandle "MY1 $r\n";
 
-            $roar = $& if($r =~ m/../);
+            my $roar = $& if($r =~ m/../);
 
             if ($roar eq $line) {
@@ -486 +489 @@
 
     while ($try_len>=4) {
-        $try_fn = substr($fn,0,$try_len);
+        my $try_fn = substr($fn,0,$try_len);
 
         if (defined $lang_table->{$try_fn}) {
@@ -509 +512 @@
     $fn =~ s/\d+$//; # remove any digits from end of filename
 
-    my $languge;
+    my $language;
     my $encoding = "utf8";