Changeset 8797

Timestamp:

2004-12-14T14:08:32+13:00 (19 years ago)

Author:

kjdon

Message:

added new oidtypes 'assigned' (from stephen de gabrielle) and fixed up the dirname one too. both of these default to hash ids if they can't get a valid id

Location:

trunk/gsdl/perllib

Files:

• doc.pm (modified) (3 diffs)
• docproc.pm (modified) (1 diff)

trunk/gsdl/perllib/doc.pm

@@ -128 +128 @@
     my ($type) = @_;
 
-    if ($type =~ /^(hash|incremental|dirname)$/) {
+    if ($type =~ /^(hash|incremental|dirname|assigned)$/) {
     $self->{'OIDtype'} = $type;
     } else {
@@ -631 +631 @@
     my ($OID) = @_;
     
+    my $use_hash_oid = 0;
     # if an OID wasn't provided claculate one
     if (!defined $OID) {
     $OID = "NULL";
-
-    if ($self->{'OIDtype'} eq "incremental") {
+    if ($self->{'OIDtype'} eq "hash") {
+        $use_hash_oid = 1;
+    } elsif ($self->{'OIDtype'} eq "incremental") {
         $OID = "D" . $OIDcount;
         $OIDcount ++;
@@ -642 +644 @@
         $OID = 'J';
         my $filename = $self->get_source_filename();
-        if (defined($filename) && -e $filename) {
+        if (defined($filename)) { # && -e $filename) {
         $OID = &File::Basename::dirname($filename);
         if (defined $OID) {
             $OID = 'J'.&File::Basename::basename($OID);
+            $OID =~ s/\.//; #remove any periods
         } else {
-            print STDERR "Failed to find base for filename ($filename).....\n";
-            die("\n");  
+            print STDERR "Failed to find base for filename ($filename)...generating hash id\n";
+            $use_hash_oid = 1;
         }
         } else {
-        print STDERR "Failed to find filename.....\n";
-        die("\n");
+        print STDERR "Failed to find filename, generating hash id\n";
+        $use_hash_oid = 1;
         }    
         
+    } elsif ($self->{'OIDtype'} eq "assigned") {
+        my $identifier = $self->get_metadata_element ($self->get_top_section(), "dc.Identifier");
+        if (defined $identifier && $identifier ne "") {
+        $OID = "D" . $self->get_metadata_element ($self->get_top_section(), "dc.Identifier");
+        $OID =~ s/\.//; #remove any periods
+        } else {
+        # need a hash id
+        print STDERR "no dc.Identifier found, generating hash id\n";
+        $use_hash_oid = 1;
+        }
+                
     } else {
+        $use_hash_oid = 1;
+    }
+
+    if ($use_hash_oid) {
+        
         # "hash" OID - feed file to hashfile.exe
         #my $filename = $self->get_source_filename();

trunk/gsdl/perllib/docproc.pm

@@ -45 +45 @@
 }
 
-# OIDtype may be "hash" or "incremental" or "dirname"
+# OIDtype may be "hash" or "incremental" or "dirname" or "assigned"
 sub set_OIDtype {
     my $self = shift (@_);
     my ($type) = @_;
 
-    if ($type =~ /^(hash|incremental|dirname)$/) {
+    if ($type =~ /^(hash|incremental|dirname|assigned)$/) {
     $self->{'OIDtype'} = $type;
     } else {