Changeset 8796

Timestamp:

2004-12-14T14:07:09+13:00 (19 years ago)

Author:

kjdon

Message:

added new oidtypes 'assigned' (from stephen de gabrielle) and 'dirname' (from emanuel dejanu)

Location:

trunk/gsdl

Files:

• bin/script/import.pl (modified) (3 diffs)
• perllib/strings.rb (modified) (1 diff)

trunk/gsdl/bin/script/import.pl

@@ -54 +54 @@
         'desc' => "{import.OIDtype.hash}" },
       { 'name' => "incremental",
-        'desc' => "{import.OIDtype.incremental}" } ];
+        'desc' => "{import.OIDtype.incremental}" },
+      { 'name' => "assigned",
+        'desc' => "{import.OIDtype.assigned}" },
+      { 'name' => "dirname",
+        'desc' => "{import.OIDtype.dirname}" } ];
 
 #** define to use the original GA format or METS format
@@ -207 +211 @@
              'gzip', \$gzip, 
              'groupsize/\d+/1', \$groupsize, 
-             'OIDtype/^(hash|incremental)$/', \$OIDtype,
+             'OIDtype/^(hash|incremental|assigned|dirname)$/', \$OIDtype,
              'sortmeta/.*/', \$sortmeta, 
              'debug', \$debug,
@@ -334 +338 @@
         }
     }
-    if ($OIDtype !~ /^(hash|incremental)$/) {
-        if (defined $collectcfg->{'OIDtype'} && $collectcfg->{'OIDtype'} =~ /^(hash|incremental)$/) {
+    if ($OIDtype !~ /^(hash|incremental|assigned|dirname)$/) {
+        if (defined $collectcfg->{'OIDtype'} && $collectcfg->{'OIDtype'} =~ /^(hash|incremental|assigned|dirname)$/) {
         $OIDtype = $collectcfg->{'OIDtype'};
         } else {

trunk/gsdl/perllib/strings.rb

@@ -181 +181 @@
 import.OIDtype:The method to use when generating unique identifiers for each document.
 import.OIDtype.hash:Hashes the contents of the file. Document identifier will be the same every time the collection is imported.
+
 import.OIDtype.incremental:A simple document count that is significantly faster than "hash". It is not guaranteed to always assign the same identifier to a given document though and does not allow further documents to be added to existing xml archives.
+
+import.OIDtype.assigned:Uses 'D' plus the value of dc.Identifier as the document identifier. dc.Identifiers should be unique. If no dc.Identifier is assigned to the document, a hash id will be used instead.
+
+import.OIDtype.dirname:Uses 'J' plus the parent directory name as the identifier. This relies on there being only one document per directory, and all directory names being unique. E.g. import/b13as/h15ef/page.html will get an identifier of Jh15ef.
 
 import.saveas:This is to decide the archives format to be generated. The default setting is to GA.