Changeset 32526

Show
Ignore:
Timestamp:
19.10.2018 16:55:50 (5 weeks ago)
Author:
ak19
Message:

MySQLPlugout now calls SUPER::method_name() instead of GreenstoneXMLPlugout::method_name(). Debug statements still left in until after MySQLPlugin has been written.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/perllib/plugouts/MySQLPlugout.pm

    r32524 r32526  
    11########################################################################### 
    22# 
    3 # GreenstoneXMLPlugout.pm -- the plugout module for Greenstone Archives 
     3# MySQLPlugout.pm -- plugout module for writing all or some the Greenstone 
     4# document format (metadata and/or fulltext) into a MySQL database. 
     5# The rest is then still written out by GreenstoneXMLPlugout as usual. 
    46# A component of the Greenstone digital library software 
    57# from the New Zealand Digital Library Project at the  
     
    149151    # finally, can call begin on super - important as doc.xml is opened as a group etc 
    150152     
    151     $self->GreenstoneXMLPlugout::begin(@_); 
     153    $self->SUPER::begin(@_); 
    152154} 
    153155 
     
    158160 
    159161    # do the superclass stuff first, as any sql db failures should not prevent superclass cleanup 
    160     $self->GreenstoneXMLPlugout::end(@_);     
     162    $self->SUPER::end(@_);     
    161163     
    162164    $self->disconnect_from_db() || warn("Unable to disconnect from database " . $self->{'site_name'} . "\n"); # disconnect_from_db() will also issue a warning, but this may be clearer 
     
    176178 
    177179    # must call superclass (pre/post) saveas methods, as they handle assoc_files too 
    178     my ($docxml_outhandler, $output_file) = $self->GreenstoneXMLPlugout::pre_saveas(@_); 
     180    my ($docxml_outhandler, $output_file) = $self->SUPER::pre_saveas(@_); 
    179181 
    180182    $self->{'debug_outhandle'} = $docxml_outhandler if ($self->{'debug'}); # STDOUT if debug 
     
    210212     
    211213    # 3. post save out 
    212     #$self->GreenstoneXMLPlugout::post_saveas(@_); 
    213     $self->GreenstoneXMLPlugout::post_saveas($doc_obj, $doc_dir, $docxml_outhandler, $output_file); 
     214    #$self->SUPER::post_saveas(@_); 
     215    $self->SUPER::post_saveas($doc_obj, $doc_dir, $docxml_outhandler, $output_file); 
    214216     
    215217