Changeset 24932 for main/trunk/greenstone2/perllib/plugins/DirectoryPlugin.pm

Timestamp:

2012-01-10T16:18:19+13:00 (12 years ago)

Author:

ak19

Message:

Diego noticed how the metadata in a toplevel metadata.xml, which specifies metadata for files in import's subfolders, does not get attached to the files on Windows, while this works on Linux. It had to do with the difference between the file slashes used on the OS versus the URL-type fileslashes used in the metadata.xml Diego had constructed. This has now been fixed and Dr Bainbridge came up with a tidier solution of a new method in util.pm that would handle the details.

File:

• main/trunk/greenstone2/perllib/plugins/DirectoryPlugin.pm (modified) (3 diffs)

main/trunk/greenstone2/perllib/plugins/DirectoryPlugin.pm

@@ -382 +382 @@
     $dirname = &util::filename_cat ($base_dir, $file) if $base_dir =~ /\w/;
     }
-
+    
     my $directory_ok = $self->check_directory_path($dirname);
     return $directory_ok unless (defined $directory_ok && $directory_ok == 1);
@@ -424 +424 @@
 
 
-    my $os_dirsep = &util::get_os_dirsep();
+    my $os_dirsep = &util::get_os_dirsep();
     my $dirsep    = &util::get_dirsep();
     my $base_dir_regexp = $base_dir;
     $base_dir_regexp =~ s/\//$os_dirsep/g;
-    my $local_dirname = $dirname;
-    
-    $local_dirname =~ s/^$base_dir_regexp($os_dirsep)*//;
+       
+    # Want to get relative path of local_dirname within the base_directory
+    # but with URL style slashes. 
+    my $local_dirname = &util::filename_within_directory_url_format($dirname, $base_dir);
+
     # if we are in import folder, then local_dirname will be empty
     if ($local_dirname ne "") {
-    # look for extra metadata passed down from higher folders 
-    $local_dirname .= $dirsep;
+    # look for extra metadata passed down from higher folders   
+    $local_dirname .= "/"; # closing slash must be URL type slash also and not $dirsep;
     if (defined $self->{'subdir_extrametakeys'}->{$local_dirname}) {
         my $extrakeys = $self->{'subdir_extrametakeys'}->{$local_dirname};
@@ -491 +493 @@
 
         my $subdir_extrametakeys = $self->{'subdir_extrametakeys'};
-
+        
         my $subdir_rec = { 're' => $subdir_re, 'md' => $md, 'mf' => $mf };