Changeset 25094 for main/trunk/greenstone2

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 /

Location:

main/trunk/greenstone2/perllib/plugins

Files:

• DirectoryPlugin.pm (modified) (1 diff)
• MetadataXMLPlugin.pm (modified) (2 diffs)

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

@@ -482 +482 @@
     # filter out any extrametakeys that mention subdirectories and store
     # for later use (i.e. when that sub-directory is being processed)
-    foreach my $ek (@extrametakeys) { # where each Extrametakey (which is a filename) is stored as a regex
-    my $ek_non_re = &util::unregex_filename($ek); # unregex it. This step is *also* required for the fileparse operation since the file suffix
-                                                  # will be specified as \.txt and we don't want fileparse to split it there making \.txt the "filename"
-    my ($subdir_re,$extrakey_dir) = &File::Basename::fileparse($ek_non_re);     
-    my $dirsep_re = &util::get_re_dirsep(); 
-    if ($ek_non_re =~ m/$dirsep_re/) { # specifies at least one directory
+    foreach my $ek (@extrametakeys) { # where each Extrametakey (which is a filename) is stored as a  url-style regex
+    
+    my ($subdir_re,$extrakey_dir) = &util::url_fileparse($ek);
+    
+    if ($extrakey_dir ne "") {
+        # a subdir was specified
         my $md = &extrametautil::getmetadata(\%extrametadata, $ek);
         my $mf = &extrametautil::getmetafile(\%extrametafile, $ek);
 
         my $subdir_extrametakeys = $self->{'subdir_extrametakeys'};
-        
-    # Indexing into the extrameta data structures requires the filename's style of slashes to be in URL format
-    # Then need to convert the filename to a regex, no longer to protect windows directory chars \, but for
-    # protecting special characters like brackets in the filepath such as "C:\Program Files (x86)\Greenstone".
-    $subdir_re = &util::filepath_to_url_format($subdir_re); # Possibly not necessary since subdir_re is the last segment of the filepath $ek #### 
-    $subdir_re = &util::filename_to_regex($subdir_re);      # Escape any special chars like brackets and . in subdir_re
-        
         my $subdir_rec = { 're' => $subdir_re, 'md' => $md, 'mf' => $mf };
 
         # when it's looked up, it must be relative to the base dir
         push(@{$subdir_extrametakeys->{"$local_dirname$extrakey_dir"}},$subdir_rec);
-        #push(@{$subdir_extrametakeys->{"$extrakey_dir"}},$subdir_rec);
     }
     }

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'};