Changeset 34394 for main/trunk/gli/src/org/greenstone/gatherer/util/Utility.java

Timestamp:

2020-09-15T20:26:19+12:00 (4 years ago)

Author:

ak19

Message:

Bugfix 1 for GLI metadata slowdown: selecting multiple Gathererd files in GLI became very slow. Kathy and Dr Bainbridge had tracked this down to code I had added to support non basic ASCII filenames in GLI, which was making an expensive win operating system function call on Windows for each selected file, launching a Java Process for each. The speed of selecting multiple files is now back to being almost as fast as in 3.09. Tested on Windows and linux. Had to treat windows as a special case because I can't get the code modifications to work on Linux: the perl code stores a hex-encoded string for the filename that GLI now uses when OS is Windows and compares against the hex encoded name of a file selected. But on linux the hex encoded value generated by perl is not the same as that which java generates and after trying repeatedly, I'e not been able to succeed to get it to work. So the code behaves as before for Linux.

File:

• main/trunk/gli/src/org/greenstone/gatherer/util/Utility.java (modified) (1 diff)

main/trunk/gli/src/org/greenstone/gatherer/util/Utility.java

@@ -94 +94 @@
     }   
     }
-
-    // Copied from GS3 main java code at GSDL3SRCHOME\src\java\org\greenstone/util\Misc.java
-    // Debugging function to print a string's non-basic chars in hex, so stringToHex on all non-basic and non-printable ASCII
-    // Dr Bainbridge said that printing anything with charCode over 128 in hex is okay, but I'd already made extra allowances for non-printable ASCII
-    // Based on https://stackoverflow.com/questions/923863/converting-a-string-to-hexadecimal-in-java
-    public static String debugUnicodeString(String str) {
-      String result = "";
-      for(int i = 0; i < str.length(); i++) {
-            int charCode = str.codePointAt(i); // unicode codepoint / ASCII code
-            
-            // ASCII table: https://cdn.sparkfun.com/assets/home_page_posts/2/1/2/1/ascii_table_black.png
-            // If the unicode character code pt is less than the ASCII code for space and greater than for tilda, let's display the char in hex (x0000 format)
-            if((charCode >= 20 && charCode <= 126) || charCode == 9 || charCode == 10 || charCode == 13) { // space, tilda, TAB, LF, CR are printable, leave them in for XML element printing
-                result += str.charAt(i);
-            } else {
-                result += "x{" + String.format("%04x", charCode) + "}"; // looks like: x{4-char-codepoint}
-            }
-      }
-      
-      return result;
-    }
-    
-    /**
+    
+    // Copied from GS3 main java code at GSDL3SRCHOME\src\java\org\greenstone/util\Misc.java
+    // Debugging function to print a string's non-basic chars in hex, so stringToHex on all non-basic and non-printable ASCII
+    // Dr Bainbridge said that printing anything with charCode over 128 in hex is okay, but I'd already made extra allowances for non-printable ASCII
+    // Based on https://stackoverflow.com/questions/923863/converting-a-string-to-hexadecimal-in-java
+    public static String debugUnicodeString(String str) {
+    String result = "";
+    for(int i = 0; i < str.length(); i++) {
+        int charCode = str.codePointAt(i); // unicode codepoint / ASCII code
+        
+        // ASCII table: https://cdn.sparkfun.com/assets/home_page_posts/2/1/2/1/ascii_table_black.png
+        // If the unicode character code pt is less than the ASCII code for space and greater than for tilda, let's display the char in hex (x0000 format)
+        if((charCode >= 20 && charCode <= 126) || charCode == 9 || charCode == 10 || charCode == 13) { // space, tilda, TAB, LF, CR are printable, leave them in for XML element printing
+        result += str.charAt(i);
+        } else {
+        result += "x{" + String.format("%04x", charCode) + "}"; // looks like: x{4-char-codepoint}              
+        }
+    }
+    
+    return result;
+    }
+    
+    // Version of debugUnicodeString that, on Windows, mimics perl unicode::debug_unicode_string
+    // exactly by producing hex/unicode codepoints for ALL codepoints beyond ASCII
+    public static String stringToHex(String str) {
+    String result = "";
+    for(int i = 0; i < str.length(); i++) {
+        int charCode = str.codePointAt(i); // unicode codepoint / ASCII code
+        
+        if(charCode <=127) { // ASCII
+        result += str.charAt(i);
+        } else { // non-ASCII
+        result += "\\x{" + String.format("%04x", charCode) + "}"; // looks like: \x{4-char-codepoint}
+        }
+    }    
+    
+    return result;
+    }
+    
+    /**
      * returns the short filename (8.3) for a file in Windows
      *