Changeset 15919

Timestamp:

2008-06-09T13:38:03+12:00 (16 years ago)

Author:

kjdon

Message:

moved the loadGISDatabase code into a new method initialise_gis_extractor which is now called by AutoExtactMetadata. arg parsing not done in GISExtractor::new so it needs to be done later

Location:

gsdl/trunk/perllib/plugins

Files:

• AutoExtractMetadata.pm (modified) (1 diff)
• GISExtractor.pm (modified) (2 diffs)

gsdl/trunk/perllib/plugins/AutoExtractMetadata.pm

@@ -84 +84 @@
     #initialise those extractors that need initialisation
     $self->initialise_acronym_extractor();
+    $self->initialise_gis_extractor();
 }
 

gsdl/trunk/perllib/plugins/GISExtractor.pm

@@ -80 +80 @@
     push(@{$hashArgOptLists->{"OptList"}},$options);
     #}
+
     my $self = new PrintInfo($pluginlist, $inputargs, $hashArgOptLists, 1);
 
+    return bless $self, $class;
+
+}
+
+sub initialise_gis_extractor {
+    my $self = shift (@_);
+
     if ($self->{'extract_placenames'}) {
-
+    
     my $outhandle = $self->{'outhandle'};
     
@@ -98 +106 @@
     }
     }
-
-    return bless $self, $class;
-
-}
-
+    
+    
+}
 
 sub extract_gis_metadata