Changeset 31191

Timestamp:

2016-12-09T22:18:32+13:00 (7 years ago)

Author:

ak19

Message:

Correction to previous commit.

Location:

main/trunk/greenstone2/perllib

Files:

• inexport.pm (modified) (1 diff)
• oaiinfo.pm (modified) (2 diffs)

main/trunk/greenstone2/perllib/inexport.pm

@@ -734 +734 @@
     # Prepare to work with the <collection>/etc/oai-inf.<db> that keeps track
     # of the OAI identifiers with their time stamps and deleted status.    
-    my $oai_info = new oaiinfo(&util::get_parent_folder($self->{'importdir'}), $collectcfg->{'infodbtype'});
+    my $oai_info = new oaiinfo($self->{'config_filename'}, $collectcfg->{'infodbtype'});
     my $have_manifest = ($manifest eq '') ? 0 : 1;    
     $oai_info->import_stage($removeold, $have_manifest);

main/trunk/greenstone2/perllib/oaiinfo.pm

@@ -195 +195 @@
 #    print STDERR "@@@@@ oaidb: $self->{'oaidb_file_path'}\n";
     
+    return $self->{'do_pd_step'};
 }
 
@@ -220 +221 @@
     my ($removeold, $have_manifest) = @_;
     
-    $self->init_tmpdb($removeold, $have_manifest);
-
-    my $do_pd_step = $self->{'do_pd_step'}; # 1 if the step to mark oaidb entries as PD is required
-    # if we're doing full rebuilding and it's NOT the first time creating the oai_inf db, 
-    # then the tasks to do with PD (provisionally deleted) OAI OIDs should be carried out
+
+    my $do_pd_step = $self->init_tmpdb($removeold, $have_manifest);
+       # 1 if the step to mark oaidb entries as PD is required
+       # if we're doing full rebuilding and it's NOT the first time creating the oai_inf db, 
+       # then the tasks to do with PD (provisionally deleted) OAI OIDs should be carried out