Changeset 7829

Timestamp:

2004-07-30T12:57:57+12:00 (20 years ago)

Author:

jrm21

Message:

use strict and declare all vars (think this fixes a "not a glob reference" bug)

import the gsprintf() function from the gsprintf.pm module, instead of
declaring our own local function.

File:

• trunk/gsdl/perllib/plugin.pm (modified) (12 diffs)

trunk/gsdl/perllib/plugin.pm

@@ -26 +26 @@
 package plugin;
 
+use strict; # to pick up typos and undeclared variables...
+no strict 'refs'; # ...but allow filehandles to be variables and vice versa
+
 require util;
-use gsprintf;
-
+use gsprintf 'gsprintf';
+
+# global variables
 my $stats = {'num_processed' => 0,
          'num_blocked' => 0,
@@ -36 +40 @@
          };
 
-
-sub gsprintf
-{
-    return &gsprintf::gsprintf(@_);
-}
-
 #globaloptions contains any options that should be passed to all plugins
+my ($verbosity, $outhandle, $failhandle, $globaloptions);
+
 sub load_plugins {
     my ($plugin_list) = shift @_;
@@ -49 +49 @@
 
     $verbosity = 2 unless defined $verbosity;
-    $outhandle = STDERR unless defined $outhandle;
-    $failhandle = STDERR unless defined $failhandle;
+    $outhandle = 'STDERR' unless defined $outhandle;
+    $failhandle = 'STDERR' unless defined $failhandle;
 
     map { $_ = "\"$_\""; } @$globaloptions;
     my $globals = join (",", @$globaloptions);
 
-    foreach $pluginoptions (@$plugin_list) {
+    foreach my $pluginoptions (@$plugin_list) {
     my $pluginname = shift @$pluginoptions;
     next unless defined $pluginname;
@@ -66 +66 @@
     if (-e $colplugname) { require $colplugname; }
     elsif (-e $mainplugname) { require $mainplugname; }
-    else { &gsprintf(STDERR, "{plugin.could_not_find_plugin}\n", $pluginname) && die "\n";
-           # die "ERROR - couldn't find plugin \"$pluginname\"\n";
-       }
+    else {
+        gsprintf($outhandle, "{plugin.could_not_find_plugin}\n",
+             $pluginname);
+        die "\n";
+    }
 
     # create a plugin object
@@ -117 +119 @@
     # an import.pl or buildcol.pl process
     if (-e &util::filename_cat ($ENV{'GSDLCOLLECTDIR'}, ".kill")) {
-    &gsprintf($outhandle, "{plugin.kill_file}\n");
+    gsprintf($outhandle, "{plugin.kill_file}\n");
     die "\n";
     }
@@ -129 +131 @@
     # 0 - blocked
     # anything else for successful processing
-    foreach $plugobj (@$pluginfo) {
+    foreach my $plugobj (@$pluginfo) {
     $rv = $plugobj->read($pluginfo, $base_dir, $file, 
                  $metadata, $processor, $maxdocs, $gli, $aux);
@@ -146 +148 @@
     # was recognised but couldn't be processed
     if ($verbosity >= 2) {
-        &gsprintf($outhandle, "{plugin.no_plugin_could_process}\n", $file);
-        # print $outhandle "WARNING - no plugin could process $file\n";
+        gsprintf($outhandle, "{plugin.no_plugin_could_process}\n", $file);
     }
     # tell the GLI that it was not processed
@@ -153 +154 @@
     
     $file =~ s/.*?([^\\\/]+)$/$1/;
-    &gsprintf($failhandle, "$file: {plugin.no_plugin_could_process_this_file}\n");
-    # print $failhandle "$file: no plugin could process this file\n";
+    gsprintf($failhandle, "$file: {plugin.no_plugin_could_process_this_file}\n");
     $stats->{'num_not_processed'} ++;
     } else {
     # was not recognised
     if ($verbosity >= 2) {
-        &gsprintf($outhandle, "{plugin.no_plugin_could_recognise}\n", $file);
-        # print $outhandle "WARNING - no plugin could process $file\n";
+        gsprintf($outhandle, "{plugin.no_plugin_could_recognise}\n",$file);
     }
     # tell the GLI that it was not processed
@@ -166 +165 @@
     
     $file =~ s/.*?([^\\\/]+)$/$1/;
-    &gsprintf($failhandle, "$file: {plugin.no_plugin_could_recognise_this_file}\n");
-    # print $failhandle "$file: no plugin could process this file\n";
+    gsprintf($failhandle, "$file: {plugin.no_plugin_could_recognise_this_file}\n");
     $stats->{'num_not_recognised'} ++;
-    
     }
 
@@ -183 +180 @@
     $gli = 0 unless defined $gli;
 
-    foreach $plugobj (@$pluginfo) {
+    foreach my $plugobj (@$pluginfo) {
     $plugobj->compile_stats($stats);
     }
@@ -193 +190 @@
 
     if ($total == 1) {
-    &gsprintf($statshandle, "* {plugin.one_considered}\n");
+    gsprintf($statshandle, "* {plugin.one_considered}\n");
     } else {
-    &gsprintf($statshandle, "* {plugin.n_considered}\n", $total);
+    gsprintf($statshandle, "* {plugin.n_considered}\n", $total);
     }
     if ($stats->{'num_archives'}) {
     if ($stats->{'num_archives'} == 1) {
-        &gsprintf($statshandle, "   ({plugin.including_archive})\n");
+        gsprintf($statshandle, "   ({plugin.including_archive})\n");
     }
     else {
-        &gsprintf($statshandle, "   ({plugin.including_archives})\n", $stats->{'num_archives'});
+        gsprintf($statshandle, "   ({plugin.including_archives})\n",
+             $stats->{'num_archives'});
     }
     }
     if ($stats->{'num_processed'} == 1) {
-    &gsprintf($statshandle, "* {plugin.one_included}\n");
+    gsprintf($statshandle, "* {plugin.one_included}\n");
     } else {
-    &gsprintf($statshandle, "* {plugin.n_included}\n", $stats->{'num_processed'});
+    gsprintf($statshandle, "* {plugin.n_included}\n", $stats->{'num_processed'});
     }
     if ($stats->{'num_not_recognised'}) {
     if ($stats->{'num_not_recognised'} == 1) {
-        &gsprintf($statshandle, "* {plugin.one_unrecognised}\n");
+        gsprintf($statshandle, "* {plugin.one_unrecognised}\n");
     } else {
-        &gsprintf($statshandle, "* {plugin.n_unrecognised}\n", $stats->{'num_not_recognised'});
+        gsprintf($statshandle, "* {plugin.n_unrecognised}\n",
+             $stats->{'num_not_recognised'});
     }
 
@@ -220 +219 @@
     if ($stats->{'num_not_processed'}) {
     if ($stats->{'num_not_processed'} == 1) {
-        &gsprintf($statshandle, "* {plugin.one_rejected}\n");
+        gsprintf($statshandle, "* {plugin.one_rejected}\n");
     } else {
-        &gsprintf($statshandle, "* {plugin.n_rejected}\n", $stats->{'num_not_processed'});
+        gsprintf($statshandle, "* {plugin.n_rejected}\n",
+             $stats->{'num_not_processed'});
     }
     }
     if ($stats->{'num_not_processed'} || $stats->{'num_not_recognised'}) {
-    &gsprintf($statshandle, " {plugin.see_faillog}\n", $faillog);
+    gsprintf($statshandle, " {plugin.see_faillog}\n", $faillog);
     }
 }