Changeset 3629

Timestamp:

2002-12-10T17:44:16+13:00 (21 years ago)

Author:

jrm21

Message:

need to look for associated files in the assocfilepath, if this metadata
exists. This is not necessarily the same directory as doc.xml is in -
for example if using the -groupsize option to put more than one doc in
each .xml file.

File:

• trunk/gsdl/perllib/plugins/GAPlug.pm (modified) (1 diff)

trunk/gsdl/perllib/plugins/GAPlug.pm

@@ -149 +149 @@
     $self->{'doc_obj'}->get_metadata($self->{'doc_obj'}->get_top_section(), "gsdlassocfile");
 
-    my $parent_dir = $self->{'filename'};
-    $parent_dir =~ s/[^\\\/]*$//;
+    # for when "assocfilepath" isn't the same directory that doc.xml is in...
+    my $assoc_filepath_list= $self->{'doc_obj'}->get_metadata($self->{'doc_obj'}->get_top_section(), "assocfilepath");
+
+    my $assoc_filepath=shift (@$assoc_filepath_list);
+    if (defined ($assoc_filepath)) {
+    # make absolute rather than relative...
+    $self->{'filename'} =~ m@^(.*[\\/]archives)@;
+    $assoc_filepath = "$1/$assoc_filepath/";
+    } else {
+    $assoc_filepath = $self->{'filename'};
+    $assoc_filepath =~ s/[^\\\/]*$//;
+    }
 
     foreach my $assoc_file_info (@$assoc_files) {
     my ($assoc_file, $mime_type, $dir) = split (":", $assoc_file_info);
-    my $real_dir = &util::filename_cat($parent_dir, $assoc_file),
+    my $real_dir = &util::filename_cat($assoc_filepath, $assoc_file),
     my $assoc_dir = (defined $dir && $dir ne "") 
         ? &util::filename_cat($dir, $assoc_file) : $assoc_file;