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

Timestamp:

2012-01-24T16:19:58+13:00 (12 years ago)

Author:

ak19

Message:

1. Introduced the util::filepath_to_url_format subroutine which will be used to convert filenames to URL style filenames to match the slashes used in the filename regex-es in extrameta keys used to index into extrameta data structures. 2. Fixed bug on windows where metadata.xml specifies filenames as regex with backslash in front of the file extension's period mark: DirectoryPlugin needed to unregex the filepath before calling fileparse on it, else the escaping backslash would interfere with perl's fileparse routine (only on windows, since backslash also represents a dirsep here). 3. Updated all those perl plugins where the new util::filepath_to_url_format needs to be called so that they use URL style filenames (thereafter regexed) to index into the extrameta data structures.

File:

• main/trunk/greenstone2/perllib/plugins/MetadataXMLPlugin.pm (modified) (1 diff)

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

@@ -328 +328 @@
     if ($element eq "FileSet") {
     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);
         my $saved_metadata = $self->{'saved_metadata'};