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

trunk/gsdl/perllib/plugins/GISBasPlug.pm

@@ -28 +28 @@
 use util;
 use locale;
+
+use strict;
+no strict 'refs'; # allow filehandles to be variables and viceversa
 
 #field categories in DataBase files
@@ -35 +38 @@
 my $DSG = 10;
 #$CC1 = 12;
-$FULL_NAME = 22;
+my $FULL_NAME = 22;
 
 BEGIN {
@@ -76 +79 @@
 }
 
+sub print_txt_usage
+{
+   BasPlug::print_txt_usage(@_);
+}
 
 sub has_mapdata
@@ -153 +160 @@
 sub placename_to_anchorname {
     my ($placename) = @_;
-    $p_tag = lc($placename);
+    my $p_tag = lc($placename);
     $p_tag =~ s/\s+//g;
     return $p_tag;
@@ -202 +209 @@
     #finds 'dangerous' placenames (eg York and New York). Dangerous because program will find "York" within "New York"  
     my %danger = ();    
-    foreach $x (keys %$uniquePlaces){
-    foreach $y (keys %$uniquePlaces){
+    foreach my $x (keys %$uniquePlaces){
+    foreach my $y (keys %$uniquePlaces){
         if(($y =~ m/ /) && ($y =~ m/$x/) && ($y ne $x)){
             $y =~ s/($x\s)|(\s$x)//;
@@ -220 +227 @@
     foreach my $name (sort (keys %$uniquePlaces)){
     if(!defined($danger{$name})){
-        $name_tag = placename_to_anchorname($name);
+        my $name_tag = placename_to_anchorname($name);
         print FOUT "$name\t" . $uniquePlaces->{$name}->[$LONG] . "\t" . $uniquePlaces->{$name}->[$LAT] . "\n";
         if($self->{'place_list'}) {$names = $names . "<a href=\"#" . $name_tag . "1\">" . $name . "</a>" . "\n";}