Changeset 31191

Show
Ignore:
Timestamp:
09.12.2016 22:18:32 (3 years ago)
Author:
ak19
Message:

Correction to previous commit.

Location:
main/trunk/greenstone2/perllib
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/perllib/inexport.pm

    r31190 r31191  
    734734    # Prepare to work with the <collection>/etc/oai-inf.<db> that keeps track 
    735735    # of the OAI identifiers with their time stamps and deleted status.     
    736     my $oai_info = new oaiinfo(&util::get_parent_folder($self->{'importdir'}), $collectcfg->{'infodbtype'}); 
     736    my $oai_info = new oaiinfo($self->{'config_filename'}, $collectcfg->{'infodbtype'}); 
    737737    my $have_manifest = ($manifest eq '') ? 0 : 1;     
    738738    $oai_info->import_stage($removeold, $have_manifest); 
  • main/trunk/greenstone2/perllib/oaiinfo.pm

    r31190 r31191  
    195195#    print STDERR "@@@@@ oaidb: $self->{'oaidb_file_path'}\n"; 
    196196     
     197    return $self->{'do_pd_step'}; 
    197198} 
    198199 
     
    220221    my ($removeold, $have_manifest) = @_; 
    221222     
    222     $self->init_tmpdb($removeold, $have_manifest); 
    223  
    224     my $do_pd_step = $self->{'do_pd_step'}; # 1 if the step to mark oaidb entries as PD is required 
    225     # if we're doing full rebuilding and it's NOT the first time creating the oai_inf db,  
    226     # then the tasks to do with PD (provisionally deleted) OAI OIDs should be carried out 
     223 
     224    my $do_pd_step = $self->init_tmpdb($removeold, $have_manifest); 
     225      # 1 if the step to mark oaidb entries as PD is required 
     226       # if we're doing full rebuilding and it's NOT the first time creating the oai_inf db,  
     227       # then the tasks to do with PD (provisionally deleted) OAI OIDs should be carried out 
    227228 
    228229