Changeset 12268

Timestamp:

2006-07-20T15:59:42+12:00 (18 years ago)

Author:

kjdon

Message:

set_OIDtype now takes a second argument which is the metadata element to use for the unique id

Location:

trunk/gsdl/perllib

Files:

• doc.pm (modified) (3 diffs)
• docproc.pm (modified) (2 diffs)

trunk/gsdl/perllib/doc.pm

@@ -143 +143 @@
 sub set_OIDtype {
     my $self = shift (@_);
-    my ($type) = @_;
+    my ($type, $metadata) = @_;
 
     if (defined $type && $type =~ /^(hash|incremental|dirname|assigned)$/) {
@@ -149 +149 @@
     } else {
     $self->{'OIDtype'} = "hash";
+    }
+    if ($type =~ /^assigned$/) {
+    if (defined $metadata) {
+        $self->{'OIDmetadata'} = $metadata;
+    } else {
+        $self->{'OIDmetadata'} = "dc.Identifier";
+    }
     }
 }
@@ -901 +908 @@
         
     } elsif ($self->{'OIDtype'} eq "assigned") {
-        my $identifier = $self->get_metadata_element ($self->get_top_section(), "dc.Identifier");
+        my $identifier = $self->get_metadata_element ($self->get_top_section(), $self->{'OIDmetadata'});
         if (defined $identifier && $identifier ne "") {
-        $OID = "D" . $self->get_metadata_element ($self->get_top_section(), "dc.Identifier");
+        $OID = "D" . $identifier;
         $OID =~ s/\.//; #remove any periods
         } else {
         # need a hash id
-        print STDERR "no dc.Identifier found, generating hash id\n";
+        print STDERR "no $self->{'OIDmetadata'} metadata found, generating hash id\n";
         $use_hash_oid = 1;
         }

trunk/gsdl/perllib/docproc.pm

@@ -49 +49 @@
 sub set_OIDtype {
     my $self = shift (@_);
-    my ($type) = @_;
+    my ($type, $metadata) = @_;
 
     if ($type =~ /^(hash|incremental|dirname|assigned)$/) {
@@ -55 +55 @@
     } else {
     $self->{'OIDtype'} = "hash";
+    }
+    if ($type =~ /^assigned$/) {
+    if (defined $metadata) {
+        $self->{'OIDmetadata'} = $metadata;
+    } else {
+        $self->{'OIDmetadata'} = "dc.Identifier";
+    }
     }
 }