Changeset 17025 for gsdl/trunk/perllib

Timestamp:

2008-08-27T20:32:27+12:00 (16 years ago)

Author:

kjdon

Message:

modified set_OID to take hash_on_file and hash_on_gs_xml as oid types.

File:

• gsdl/trunk/perllib/doc.pm (modified) (4 diffs)

gsdl/trunk/perllib/doc.pm

@@ -127 +127 @@
     my ($type, $metadata) = @_;
 
-    if (defined $type && $type =~ /^(hash|incremental|dirname|assigned)$/) {
+    if (defined $type && $type =~ /^(hash|hash_on_file|hash_on_ga_xml|incremental|dirname|assigned)$/) {
     $self->{'OIDtype'} = $type;
     } else {
@@ -286 +286 @@
     if (!defined $OID) {
     $OID = "NULL";
-    if ($self->{'OIDtype'} eq "hash") {
+    if ($self->{'OIDtype'} =~ /^hash/) {
         $use_hash_oid = 1;
     } elsif ($self->{'OIDtype'} eq "incremental") {
@@ -312 +312 @@
         my $identifier = $self->get_metadata_element ($self->get_top_section(), $self->{'OIDmetadata'});
         if (defined $identifier && $identifier ne "") {
-        $OID = "D" . $identifier;
+        $OID = $identifier;
         $OID =~ s/\.//; #remove any periods
+        if ($OID =~ /^[\d]*$/) {
+            $OID = "D" . $OID;
+            print STDERR "OID only contains numbers, adding a D\n";
+        }
+        
         } else {
         # need a hash id
@@ -325 +330 @@
 
     if ($use_hash_oid) {
-        
-        # "hash" OID - feed file to hashfile.exe
-        #my $filename = $self->get_source_filename();
-        # we want to use the converted file for hashing if available
-        # cos its quicker
-        my $filename = $self->get_filename_for_hashing();
-        # -z: don't want to hash on the file if it is zero size
-        if (defined($filename) && -e $filename && !-z $filename) {
-        $OID = $self->_calc_OID ($filename);
-        } else {
-        $filename = &util::get_tmp_filename();
+        my $hash_on_file = 1;
+        if ($self->{'OIDtype'} eq "hash_on_ga_xml") {
+        $hash_on_file = 0;
+        }
+        if ($hash_on_file) {
+        # "hash" OID - feed file to hashfile.exe
+        my $filename = $self->get_filename_for_hashing();
+        # -z: don't want to hash on the file if it is zero size
+        if (defined($filename) && -e $filename && !-z $filename) {
+            $OID = $self->_calc_OID ($filename);
+        } else {
+            $hash_on_file = 0;
+        }
+        }
+        if (!$hash_on_file) {
+        my $filename = &util::get_tmp_filename();
         if (!open (OUTFILE, ">$filename")) {
             print STDERR "doc::set_OID could not write to $filename\n";