Changeset 847 for trunk

Timestamp:

1999-12-16T16:02:43+13:00 (24 years ago)

Author:

sjboddie

Message:

fixed CVS burp

File:

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

trunk/gsdl/perllib/plugins/GMLPlug.pm

@@ -197 +197 @@
     }
 
-<<<<<<< GMLPlug.pm
-    # add the associated files
-    $assoc_files 
-        = $doc_obj->get_metadata($doc_obj->get_top_section(), 
-                     "gsdlassocfile");
-    my ($assoc_file_info);
-    foreach $assoc_file_info (@$assoc_files) {
-        my ($assoc_file, $mime_type) = split (":", $assoc_file_info);
-        $doc_obj->associate_file(&util::filename_cat($parent_dir, $assoc_file),
-                     $assoc_file, $mime_type);
-=======
     # add the associated files
     $assoc_files = $doc_obj->get_metadata($doc_obj->get_top_section(), "gsdlassocfile");
@@ -216 +205 @@
     $doc_obj->associate_file(&util::filename_cat($parent_dir, $assoc_file),
                  &util::filename_cat($dir, $assoc_file), $mime_type);
->>>>>>> 1.10
-                 
     }
     $doc_obj->delete_metadata($doc_obj->get_top_section(), "gsdlassocfile");