Changeset 7569

Timestamp:

2004-06-09T11:27:35+12:00 (20 years ago)

Author:

kjdon

Message:

can now set gsdlconvertedfilename - gsdlsourcefilename is the original file, gsdlconvertedfilename is the converted file. calculating hash ids now uses converted filename is available, otherwise uses the source filename

File:

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

trunk/gsdl/perllib/doc.pm

@@ -117 +117 @@
 }
 
+sub set_converted_filename {
+    my $self = shift (@_);
+    my ($converted_filename) = @_;
+
+    $self->set_metadata_element ($self->get_top_section(), 
+                 "gsdlconvertedfilename", 
+                 $converted_filename);
+}
+
+
 # returns the source_filename as it was provided
 sub get_source_filename {
@@ -122 +132 @@
 
     return $self->get_metadata_element ($self->get_top_section(), "gsdlsourcefilename");
+}
+
+# returns converted filename if available else returns source filename
+sub get_filename_for_hashing {
+    my $self = shift (@_);
+
+    my $filename = $self->get_metadata_element ($self->get_top_section(), "gsdlconvertedfilename");
+
+    if (!defined $filename) {
+    $filename = $self->get_metadata_element ($self->get_top_section(), "gsdlsourcefilename");
+    }
+    return $filename;
 }
 
@@ -264 +286 @@
     } else {
         # "hash" OID - feed file to hashfile.exe
-        my $filename = $self->get_source_filename();
+        #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();
         if (defined($filename) && -e $filename) {
-
         $OID = $self->_calc_OID ($filename);
-
         } else {
         $filename = &util::get_tmp_filename();