Changeset 9241

Timestamp:

2005-03-01T22:34:08+13:00 (19 years ago)

Author:

davidb

Message:

Incorrect parsing of gsdlassocfile in METS code. Can have a directory
after final ":" but code had assumed this would be empty. Now fixed.

File:

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

trunk/gsdl/perllib/doc.pm

@@ -345 +345 @@
        
        if ($data->[0] eq "gsdlassocfile"){
-      $escaped_value =~ m/^(.*?):(.*):$/;
-
-      my $assfilePath = $dirPath . '/'. $1;
+
+       $escaped_value =~ m/^(.*?):(.*):(.*)$/;
+       my $assoc_file = $1;
+       my $mime_type  = $2;
+       my $assoc_dir  = $3;
+
+      my $assfilePath = $dirPath . '/'. $assoc_file;
           ++$fileID;
 
-      $all_text .= '    <mets:file MIMETYPE="'.$2.'" ID="default.'.$fileID. '">'. "\n";
+      $all_text .= '    <mets:file MIMETYPE="'.$mime_type.'" ID="default.'.$fileID. '">'. "\n";
       $all_text .= '      <mets:FLocat LOCTYPE="URL" xlink:href="file:'.$assfilePath.'" />'."\n";
           
@@ -1096 +1100 @@
         push (@metadata, $data->[1]) if ($data_name eq $field);
     }
-        
+
     return \@metadata;
 }