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

Timestamp:

2012-11-28T11:59:17+13:00 (11 years ago)

Author:

davidb

Message:

Introduction of two new OIDtype values (hash_on_full_filename and full_filename) designed to help provide more stable document IDs for collections that are rebuilt over time, including rebuilt after the Greenstone install has been upgraded

File:

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

main/trunk/greenstone2/perllib/inexport.pm

@@ -297 +297 @@
 
     if (!defined $self->{'OIDtype'} 
-    || ($self->{'OIDtype'} !~ /^(hash|incremental|assigned|dirname)$/ )) {
+    || ($self->{'OIDtype'} !~ /^(hash|hash_on_full_filename|incremental|assigned|dirname|full_filename)$/ )) {
+    # OIDtype was either not defined on the command-line, or if it was not one of the recognized values
     if (defined $collectcfg->{'OIDtype'} 
-        && $collectcfg->{'OIDtype'} =~ /^(hash|incremental|assigned|dirname)$/) {
+        && $collectcfg->{'OIDtype'} =~ /^(hash|hash_on_full_filename|incremental|assigned|dirname|full_filename)$/) {
         $self->{'OIDtype'} = $collectcfg->{'OIDtype'};
     } else {
@@ -548 +549 @@
     $processor->setoutputdir ($archivedir);
     $processor->set_sortmeta ($sortmeta, $removeprefix, $removesuffix) if defined $sortmeta;
+
     $processor->set_OIDtype ($OIDtype, $OIDmetadata);