Changeset 25094 for main/trunk/greenstone2/perllib/plugins/MetadataXMLPlugin.pm

Timestamp:

2012-02-16T15:10:43+13:00 (12 years ago)

Author:

kjdon

Message:

extrametadata must have url style filepaths, ie / for dirsep. and they are regex. FileName entires in metadata.xml must be regex, but they allow
on windows for dirsep, which we convert to /

File:

• main/trunk/greenstone2/perllib/plugins/MetadataXMLPlugin.pm (modified) (2 diffs)

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

@@ -158 +158 @@
     $self->{'in_filename'} = 0;
     
-    
     return bless $self, $class;
 }
@@ -329 +328 @@
     foreach my $target (@{$self->{'saved_targets'}}) {
     
-        # Indexing into the extrameta data structures requires the filename's style of slashes to be in URL 
-        # format. But if metadata.xml was user-constructed, its FileName fields (stored in the saved_targets 
-        # map) could represent pathnames in Windows format using \ as file separator, instead of pathnames 
-        # being in URL format as Greenstone would've generated. Need to convert such filepaths to URL style 
-        # paths. Then need convert this to a regex to protect special characters like brackets in the 
-        # filepath, such as "C:\Program Files (x86)\Greenstone".
-        
-        $target = &util::unregex_filename($target); # filename is a regex, before converting it to URL form, unregex it
-        $target = &util::filepath_to_url_format($target); # convert to URL form
-        $target = &util::filename_to_regex($target); # regex it. Now we have regexed URL form of filename
-    
-        my $file_metadata = &extrametautil::getmetadata($self->{'metadataref'}, $target);
+        # FileNames must be regex, but we allow \\ for path separator on windows. convert to /
+        $target = &util::filepath_regex_to_url_format($target);
+        my $file_metadata = &extrametautil::getmetadata($self->{'metadataref'}, $target);
         my $saved_metadata = $self->{'saved_metadata'};