Changeset 31190 for main/trunk/greenstone2/perllib/inexport.pm

Timestamp:

2016-12-09T21:37:52+13:00 (7 years ago)

Author:

ak19

Message:

First major commit to do with the new oaiinfo db that keeps track of which oids are deleted. Still need to fix up issue with the new remove and rename subroutines of dbutil's jdbm not being called to clean up *.lg log file associated with main db file. Still need to clean up unused methods in oaiinfo, remove debugging and test agains GS3 incr-build-with-manifest tutorial. (Previous 3 commits were commits, not all related.)

File:

• main/trunk/greenstone2/perllib/inexport.pm (modified) (3 diffs)

main/trunk/greenstone2/perllib/inexport.pm

@@ -35 +35 @@
 use dbutil;
 use doc;
+use oaiinfo;
 use plugin;
 use plugout;
@@ -354 +355 @@
     my $gs_mode = "gs".$self->{'gs_version'}; #gs2 or gs3
     my $config_filename = &colcfg::get_collect_cfg_name($out, $gs_mode);
+
+    # store the config file's name, so oaiinfo object constructor can be instantiated with it
+    $self->{'config_filename'} = $config_filename;
+
     my $collectcfg = &colcfg::read_collection_cfg ($config_filename, $gs_mode);
 
@@ -725 +730 @@
       print STDERR "Skipping global file scan due to manifest and complexmeta configuration\n";
     }
+
+
+    # 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 $have_manifest = ($manifest eq '') ? 0 : 1;    
+    $oai_info->import_stage($removeold, $have_manifest);
+
 
     if ($manifest ne "") {