Changeset 33738 for main/trunk/gli/src/org/greenstone/gatherer/metadata/FilenameEncoding.java

Timestamp:

2019-12-02T20:43:20+13:00 (4 years ago)

Author:

ak19

Message:

Got the filenameToURLEncoding(String) variant that reuses fileToURLEncoding(File) to work now. It just needed the current directory path (whatever . resolves to) to be removed from the String filepath returned, something Dr Bainbridge had anticipated could also happen with new URI() but that didn't happen there but does happen with file.toURI() as he had also expected.

File:

• main/trunk/gli/src/org/greenstone/gatherer/metadata/FilenameEncoding.java (modified) (2 diffs)

main/trunk/gli/src/org/greenstone/gatherer/metadata/FilenameEncoding.java

@@ -376 +376 @@
     
     // follows Dr Bainbridge's method below, but with a String parameter instead of a file parameter
-    public static String filenameToURLEncoding(String filename) {
+    public static String UNUSED_filenameToURLEncoding(String filename) {
         if(!MULTIPLE_FILENAME_ENCODINGS_SUPPORTED) {
             return filename;
@@ -424 +424 @@
     
     // follows Dr Bainbridge's method below, but with a String parameter instead of a file parameter    
-    public static String _filenameToURLEncoding(String filename) {
+    public static String filenameToURLEncoding(String filename) {
         if(!MULTIPLE_FILENAME_ENCODINGS_SUPPORTED) { // on a UTF-8 file system, DO NOT do the stuff below, just return input param
             return filename;