Changeset 10254 for trunk/gsdl/perllib/plugins/W3ImgPlug.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/W3ImgPlug.pm (modified) (9 diffs)

trunk/gsdl/perllib/plugins/W3ImgPlug.pm

@@ -117 +117 @@
 use util;
 use parsargv;
-use strict 'subs';
+use strict; # 'subs';
+no strict 'refs'; # allow filehandles to be variables and viceversa
 
 sub BEGIN {
-    @ISA = qw( HTMLPlug );
+    @W3ImgPlug::ISA = qw( HTMLPlug );
 }
 
@@ -423 +424 @@
         $doc_obj = new doc ("", "indexed_doc");
         $section = $doc_obj->get_top_section();
-        $prevpos = ( $i == 0 ? 0 : $imgs->{$fplist[$i - 1]}{'pos'});
-        $nextpos = ( $i >= ($nimgs -1) ? -1 : $imgs->{$fplist[$i + 1]}{'pos'} );
+        my $prevpos = ( $i == 0 ? 0 : $imgs->{$fplist[$i - 1]}{'pos'});
+        my $nextpos = ( $i >= ($nimgs -1) ? -1 : $imgs->{$fplist[$i + 1]}{'pos'} );
 
         $self->extract_image_info($imgtag, $filepath, $textref, $doc_obj, $section, $tndir, $prevpos, $nextpos);
@@ -459 +460 @@
     $orig_fp =~ s/\\/\//g;
     $filepath = "$self->{'htpath'}/$filepath";
-    ($onlyfn) = $filename =~ /([^\\\/]*)$/;
+    my ($onlyfn) = $filename =~ /([^\\\/]*)$/;
     ($fn, $ext) = $onlyfn =~ /(.*)\.(.*)/;
     $fn = lc $fn; $ext = lc $ext;
@@ -601 +602 @@
     if ( $self->{'aggressiveness'} == 5 && ! $self->{'smallpage'} ) {
     @pagemeta = $self->get_page_metadata($textref);
-    foreach $value ( @pagemeta ) {
+    foreach my $value ( @pagemeta ) {
         $context .= "$value."; # make each into psuedo-sentence
     }
@@ -611 +612 @@
 
     # extract general references
-    foreach $rw ( @refwords ) {
+    foreach my $rw ( @refwords ) {
     while ( $context =~ /[\.\?\!\,](.*?$rw\W.*?[\.\?\!\,])/ig ) {
-        $sentence = $1;
+        my $sentence = $1;
         $sentence =~ s/\s+/ /g;
         $sentences{$sentence}+=2;
@@ -621 +622 @@
     my ($fignum) = $context =~ /[\.\?\!].*?(?:figure|table)s?[\-\_\ \.](\d+\w*)\W.*?[\.\?\!]/ig;
     if ( $fignum ) {
-    foreach $rw ( @refwords ) {
+    foreach my $rw ( @refwords ) {
         while ( $context =~ /[\.\?\!](.*?(figure|table)[\-\_\ \.]$fignum\W.*?[\.\?\!])/ig ) {
-        $sentence = $1;
+        my $sentence = $1;
         $sentence =~ s/\s+/ /g;
         $sentences{$sentence}+=4;
@@ -632 +633 @@
     # sentences with occurances of important words
     @relwords = $reltext =~ /([a-zA-Z]{4,})/g; # take out small words
-    foreach $word ( @relwords ) {
+    foreach my $word ( @relwords ) {
     if ( $self->{'stopwords'}{$word} ) { next } # skip stop words
     while ( $context =~ /([^\.\?\!]*?$word\W.*?[\.\?\!])/ig ) {
-        $sentence = $1;
+        my $sentence = $1;
         $sentence =~ s/\s+/ /g;
         $sentences{$sentence}++;
     }
     }
-    foreach $sentence ( keys %sentences ) {
+    foreach my $sentence ( keys %sentences ) {
     if ($sentences{$sentence} < $self->{'textrefs_threshold'}) {
         delete $sentences{$sentence};
@@ -656 +657 @@
 sub extract_caption_text {
     my ($self, $tag, $textref, $prevpos, $pos, $nextpos) = (@_);
-    my (@neartext, $len, $hdelim, $goodlen,
+    my (@neartext, $len, $hdelim, $mintext, $goodlen,
     $startpos, $context, $context_size);
     
@@ -1003 +1004 @@
     }
     $num = 0;
-    foreach $i ( keys %{$imgs} ) {
+    foreach my $i ( keys %{$imgs} ) {
     if ( $imgs->{$i}{'pos'} ) {
         $num++;