Changeset 34105 for main/trunk

Timestamp:

2020-04-24T00:38:28+12:00 (4 years ago)

Author:

ak19

Message:

A bugfix related to the commits 33737 and thereabouts which is the work I did to get encoded filenames in subdirs (or with & and + signs in the relative import path) to work with metadata assigned to such files through GLI. Metadata in doc.xml and metadata.xml should stick to such filenames, and which wasn't happening before that work. This latest bugfix would strike when the file_rename_method was base64 and there was no subdir, just import/file. The import folder itself is not supposed to get renamed with base64 or url encoding. The bug wasn't apparent during the earlier testing which focused on file_rename_method =url, as the import folder's name just resolves to being import if url encoded. However, it became noticeable now when debugging a warning message for Renate, when import got base64 encoded and GLI didn't know what was going on as import is not ever supposed to get encoded, only subdirs and files therein. The bug was an off by one error. Still need to create a ticket wherein I bring together all the related commits for the GLI with metadata work that this bugfix goes with.

File:

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

main/trunk/greenstone2/perllib/doc.pm

@@ -301 +301 @@
     
     # Don't encode the first folder ("import" or "tmp"): GLI's DocXMLFile.java looks for literal "import"
-    # or "tmp" before it knows what the file rename method to be used decode the rest of gsdlsourcefilename is.
-    if(scalar (@dirs) > 1) {
-        $dirpath = shift(@dirs); 
+    # or "tmp" before it knows what the file rename method is that is to be used decode the rest of gsdlsourcefilename.
+    if(scalar (@dirs) >= 1) {
+        $dirpath = shift(@dirs);
     }
     foreach my $subdir (@dirs) {
-    print STDERR "@@@@ Found subdir: $subdir\n";
+    #print STDERR "@@@@ Found subdir: $subdir\n";
     
     $subdir = &util::rename_file($subdir, $rename_method);