Changeset 1401 for trunk

Timestamp:

2000-08-15T10:51:03+12:00 (24 years ago)

Author:

davidb

Message:

Fixed small problem with associated files.

File:

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

trunk/gsdl/perllib/plugins/GMLPlug.pm

@@ -149 +149 @@
     # add the associated files
     my $assoc_files = $doc_obj->get_metadata($doc_obj->get_top_section(), "gsdlassocfile");
-    my ($assoc_file_info, $afile);
-    foreach $assoc_file_info (@$assoc_files) {
+    my ($assoc_file_info);
+
+    foreach $assoc_file_info (@$assoc_files) 
+    {
         my ($assoc_file, $mime_type, $dir) = split (":", $assoc_file_info);
-        if (defined $dir && $dir =~ /\w/) {
-        $afile = &util::filename_cat($dir, $assoc_file);
-        } else {
-        $afile = $assoc_file;
-        }
-        $doc_obj->associate_file(&util::filename_cat($parent_dir, $assoc_file),
-                     $afile, $mime_type);
+        my $real_dir = &util::filename_cat($parent_dir, $assoc_file),
+        my $assoc_dir = (defined $dir && $dir ne "") 
+        ? &util::filename_cat($dir, $assoc_file) : $assoc_file;
+        $doc_obj->associate_file($real_dir, $assoc_dir, $mime_type);
+        
     }
     $doc_obj->delete_metadata($doc_obj->get_top_section(), "gsdlassocfile");
-    
+
     # add metadata passed in from elsewhere
     $self->extra_metadata ($doc_obj, $doc_obj->get_top_section(), $metadata);
@@ -169 +169 @@
 
     # assume the document has an OID already
-    
+
     # process the document
     $processor->process($doc_obj, $file);
@@ -177 +177 @@
     last unless defined $gml && $gml =~ /\w/;
     } # while(1) document level
-
+    
     return $no_docs; # no of docs processed
 }