Changeset 18528 for gsdl/trunk/bin/script/import.pl

Timestamp:

2009-02-17T15:36:44+13:00 (15 years ago)

Author:

davidb

Message:

OIDmetadata wasn't supported in collect.cfg, but OIDtype was. Now rectified. Also introduced OIDcount as a file saved in the archives folder to help doc.pm use the correct value when working incrementally

File:

• gsdl/trunk/bin/script/import.pl (modified) (4 diffs)

gsdl/trunk/bin/script/import.pl

@@ -197 +197 @@
     'desc' => "{import.OIDmetadata}",
     'type' => "metadata",
-    'deft' => "dc.Identifier",
+    # parsearg left "" as default
+    #'deft' => "dc.Identifier",
     'reqd' => "no",
     'modegli' => "2" },
@@ -440 +441 @@
     }
 
+    if ((!defined $OIDmetadata) || ($OIDmetadata eq "")) {
+    if (defined $collectcfg->{'OIDmetadata'}) {
+        $OIDmetadata = $collectcfg->{'OIDmetadata'};
+    } else {
+        $OIDmetadata = "dc.Identifier"; # the default
+    }
+    }
+
     if (defined $collectcfg->{'sortmeta'} && (!defined $sortmeta || $sortmeta eq "")) {
     $sortmeta = $collectcfg->{'sortmeta'};
@@ -575 +584 @@
 
     if (!$removeold) {
+
+        &inexport::prime_doc_oid_count($archivedir);
+
+
         # Can now work out which files were new, already existed, and have
         # been deleted
@@ -620 +633 @@
     &plugin::deinit($pluginfo, $processor);
 
+    # Store the value of OIDCount (used in doc.pm) so it can be
+    # restored correctly to this value on an incremental build
+    &inexport::store_doc_oid_count($archivedir);
+
     # write out the archive information file
     $processor->close_file_output() if $groupsize > 1;