Changeset 15919

Show
Ignore:
Timestamp:
09.06.2008 13:38:03 (12 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:
2 modified

Legend:

Unmodified
Added
Removed
  • gsdl/trunk/perllib/plugins/AutoExtractMetadata.pm

    r15869 r15919  
    8484    #initialise those extractors that need initialisation 
    8585    $self->initialise_acronym_extractor(); 
     86    $self->initialise_gis_extractor(); 
    8687} 
    8788 
  • gsdl/trunk/perllib/plugins/GISExtractor.pm

    r15881 r15919  
    8080    push(@{$hashArgOptLists->{"OptList"}},$options); 
    8181    #} 
     82 
    8283    my $self = new PrintInfo($pluginlist, $inputargs, $hashArgOptLists, 1); 
    8384 
     85    return bless $self, $class; 
     86 
     87} 
     88 
     89sub initialise_gis_extractor { 
     90    my $self = shift (@_); 
     91 
    8492    if ($self->{'extract_placenames'}) { 
    85  
     93     
    8694    my $outhandle = $self->{'outhandle'}; 
    8795     
     
    98106    } 
    99107    } 
    100  
    101     return bless $self, $class; 
    102  
    103 } 
    104  
     108     
     109     
     110} 
    105111 
    106112sub extract_gis_metadata