Changeset 15887

Timestamp:

2008-06-06T10:36:57+12:00 (16 years ago)

Author:

mdewsnip

Message:

Added "use strict" to the few files that were missing it, and fixing resulting problems in MediaWikiPlug.pm.

Location:

gsdl/trunk/perllib/plugins

Files:

• AcronymExtractor.pm (modified) (1 diff)
• DateExtractor.pm (modified) (1 diff)
• EmailAddressExtractor.pm (modified) (1 diff)
• KeyphraseExtractor.pm (modified) (1 diff)
• MediaWikiPlugin.pm (modified) (5 diffs)

gsdl/trunk/perllib/plugins/AcronymExtractor.pm

@@ -3 +3 @@
 use acronym;
 use PrintInfo;
+use strict;
 
 BEGIN {

gsdl/trunk/perllib/plugins/DateExtractor.pm

@@ -3 +3 @@
 use DateExtract;
 use PrintInfo;
+use strict;
 
 BEGIN {

gsdl/trunk/perllib/plugins/EmailAddressExtractor.pm

@@ -2 +2 @@
 
 use PrintInfo;
+use strict;
 
 BEGIN {

gsdl/trunk/perllib/plugins/KeyphraseExtractor.pm

@@ -3 +3 @@
 use Kea;
 use PrintInfo;
+use strict;
+no strict 'subs';
 
 BEGIN {

gsdl/trunk/perllib/plugins/MediaWikiPlugin.pm

@@ -34 +34 @@
 
 use HTMLPlugin;
-# use ImagePlugin;
-# use File::Copy;
 use unicode;
 
-
-#use strict; # every perl program should have this!
-#no strict 'refs'; # make an exception so we can use variables as filehandles
+use strict; # every perl program should have this!
+no strict 'refs'; # make an exception so we can use variables as filehandles
+
 
 sub BEGIN {
@@ -508 +506 @@
         elsif ($about_package !~ /\S/) {          
           # read _content_ macro from $GSDLHOME/macros/about.dm file          
-      my $global_about_package = &read_content_from_about_dm();     
+      my $global_about_package = $self->read_content_from_about_dm();       
             
           # create the extra _content_ macro for this collection           
@@ -539 +537 @@
           else {
             my $new_about_package = $about_package;            
-            $content_macro = &read_content_from_about_dm();
+            my $content_macro = &read_content_from_about_dm();
             $content_macro =~ m/{(.|\n)*<\/div>\n\n/;            
             
@@ -646 +644 @@
 sub read_content_from_about_dm
 {
+    my $self = shift(@_);
+
   my $about_macro_file = &util::filename_cat($ENV{'GSDLHOME'}, "macros", "about.dm");
   my $about_page_content = "";
@@ -653 +653 @@
     }
   } else {
+      my $outhandle = $self->{'outhandle'};
     print $outhandle "can't open file $about_macro_file\n";
   }