Changeset 15895

Timestamp:

2008-06-06T11:19:09+12:00 (16 years ago)

Author:

mdewsnip

Message:

Added "use strict" to one more file, then fixed all the problems identified.

File:

• gsdl/trunk/perllib/DateExtract.pm (modified) (15 diffs)

gsdl/trunk/perllib/DateExtract.pm

@@ -3 +3 @@
 ##use BasPlug; ## no, DON'T use BasPlug, BasPlug uses us....
 use sorttools;
+use strict;
 use util;
 
@@ -71 +72 @@
     #get the text of the document, the "document object" concerned,
     #and the current section within the document
-    local ($text, $doc, $cursection, $keep_bib, $max_year, $max_century) = @_;
+    my ($text, $doc, $cursection, $keep_bib, $max_year, $max_century) = @_;
     
     #format a prechristian maximum century value to be negative so that it can
@@ -83 +84 @@
     }
    
-    local $extr = &remove_excess($text);    
+    my $extr = &remove_excess($text);    
     #print "EXTRACTION TEXT:\n $extr";
     $extr = &remove_tags($extr);
@@ -91 +92 @@
   
 
-    local @datelist = ();
+    my @datelist = ();
     while($extr =~ m!($range)|($millenium)|($qualified)|($centurydate)|($tri_digit)!i)
     { 
@@ -101 +102 @@
             {
 
-                local $date = $fulldate; if($date =~ /\d+/) {$date = $&;} 
+                my $date = $fulldate; if($date =~ /\d+/) {$date = $&;} 
                 else 
                 {
@@ -112 +113 @@
                     #if it BC, make it negative
                     $date = &convert_bc($fulldate,$date);
-                    $end = $date + 99; 
-                    @century = ($date..$end);
+                    my $end = $date + 99; 
+                    my @century = ($date..$end);
                     @datelist = (@datelist,@century);
                 }
@@ -124 +125 @@
             my @addlist = ();
             #print "Range: $fulldate\n";
-            $fullfirst = $`; 
-            $fullsecond = $'; 
-            $fullfirst =~ /\d+/; $first = $&; 
-            $fullsecond =~ /\d+/; $second = $&;
-            $len1 = length($first);
-            $len2 = length($second);
+            my $fullfirst = $`; 
+            my $fullsecond = $'; 
+            $fullfirst =~ /\d+/;
+        my $first = $&; 
+            $fullsecond =~ /\d+/;
+        my $second = $&;
+            my $len1 = length($first);
+            my $len2 = length($second);
             $second = (substr($first,0,($len1-$len2))).$second;
             $first = &convert_bc($fullfirst,$first);
@@ -151 +154 @@
         @datelist = sort { $a <=> $b } @datelist;
         @datelist = &post_process($max_year, @datelist);
-        foreach $date (@datelist)
+        foreach my $date (@datelist)
         {
             if($date>0){
@@ -162 +165 @@
 }
 sub convert_bc {
-    local ($full,$num) = @_;
+    my ($full,$num) = @_;
     if ($full =~ /B/) { $num *= -1; }
     $num;
@@ -168 +171 @@
 
 sub post_process {
-    local ($max_year, @list) = @_;
-    @cleanlist = ();
-    $prev = 0;
-    foreach $e (@list) {
+    my ($max_year, @list) = @_;
+    my @cleanlist = ();
+    my $prev = 0;
+    foreach my $e (@list) {
         if ($e!=$prev && $e <= $max_year) {
             push(@cleanlist, $e);
@@ -185 +188 @@
 #contain date lookalikes
 sub remove_tags {
-    local ($tmp) = @_;
+    my ($tmp) = @_;
    
-    local $parsed = "";
+    my $parsed = "";
     #while there is still text to be parsed and tags are still found
     while($tmp=~ m!<([^>])*(>|$)! && $tmp ne "")
@@ -200 +203 @@
 
 sub remove_excess {
-    local ($tmp) = @_;
-    local $parsed = "";
+    my ($tmp) = @_;
+    my $parsed = "";
    
 
@@ -213 +216 @@
         {
             $parsed .= $`;
-            $storage = $&;
+            my $storage = $&;
             $tmp = $';
             #match the pattern which indicates most recent alteration 
@@ -235 +238 @@
 
 sub remove_biblio{
-    local ($tmp) = @_;
-    local $parsed = "";
+    my ($tmp) = @_;
+    my $parsed = "";
     
     if($tmp =~ m!$bibheader!i)
@@ -259 +262 @@
             {
                 
-                local  $date = $&;
+                my $date = $&;
                 if($parsed =~ m!((\d)($Ord)$)|(($shortmth)$)|(($longmth)$)!i)
                 {