Changeset 23433 for main/trunk/gli/src/org/greenstone/gatherer/Gatherer.java

Timestamp:

2010-12-09T22:27:33+13:00 (13 years ago)

Author:

ak19

Message:

GLI now has a gs.FilenameEncoding metadata field which appears like all the others in GLI's EnrichPane, but is unique in that this metadata (once set, changed or removed) must be applied to the affected filenames in the Collection Tree. More importantly, the changes made for this are to allow GLI's java code to interact with the recent changes to Perl where strings were made unicode-aware (for proper regex matching) but which required other changes elsewhere. To still support filenames with different encodings Perl used URL encoded versions of filenames representing characters' code point values in URL encoding. This required that GLI write out URL encoded filenames to the metadata.xml files that are associated with each folder level of a collection, so that Perl can read them. In this way, they can both speak of the same filenames. Only works on unicode 16 (such as latin-1), non-UTF8 systems. The latter is a requirement since Java uses the filesystem encoding from startup. If it is UTF8, non-recognised characters are replaced by the invalid char for UTF8. This process being destructive, we can't get the original filenames' bytecodes back. The changes made to GLI will work on Windows which is UTF-16 (windows codepage 1252), presumably also Macs (some kind of UTF-16) and also works on Native Latin 1 Linux systems. UTF-8 Linux systems need to be reconfigured to Native Latin-1, or if not installed, an administrator can install it easily.

File:

• main/trunk/gli/src/org/greenstone/gatherer/Gatherer.java (modified) (4 diffs)

main/trunk/gli/src/org/greenstone/gatherer/Gatherer.java

@@ -56 +56 @@
 import org.greenstone.gatherer.gui.WarningDialog;
 import org.greenstone.gatherer.gui.FedoraLogin;
+import org.greenstone.gatherer.metadata.FilenameEncoding;
 import org.greenstone.gatherer.remote.RemoteGreenstoneServer;
 import org.greenstone.gatherer.util.JarTools;
@@ -471 +472 @@
         }
 
+        // Check that the local can support multiple filename encodings
+            //System.err.println("#### Java identifies current Locale as (file.encoding): "
+            //  + System.getProperty("file.encoding"));
+        if(System.getProperty("file.encoding").equals("UTF-8")){
+            // If the locale is UTF-8, Java will interpret all filename bytes as UTF-8, 
+            // which is a destructive process as it will convert characters not recognised
+            // by UTF-8 into the invalid character, rather than preserving the bytecodes.
+            // This has the effect that non-UTF8 encoded filenames on a system set to a 
+            // UTF-8 locale are not 'seen' by Java (if they contain non-ASCII characters).
+            multipleFilenameEncodingsNotSupported();        
+            FilenameEncoding.MULTIPLE_FILENAME_ENCODINGS_SUPPORTED = false; 
+            FilenameEncoding.URL_FILE_SEPARATOR = File.separator;
+        } else {
+            FilenameEncoding.MULTIPLE_FILENAME_ENCODINGS_SUPPORTED = true;
+            FilenameEncoding.URL_FILE_SEPARATOR = "/"; // URL file separator is always "/" 
+        }
+        
         // Set the default font for all Swing components.
         FontUIResource default_font = Configuration.getFont("general.font", true);
@@ -852 +870 @@
                 + File.separator + "cgi" + File.separator + "gsdl3site.cfg";
         } else { // cgi-bin/gsdlsite.cfg
-            return Configuration.gsdl_path + File.separator 
+            return Configuration.gsdl_path /* + File.separator */
                 + "cgi-bin" + File.separator + "gsdlsite.cfg";
         }
@@ -1258 +1276 @@
     }
 
+    /** Prints a warning message about the OS not supporting multiple filename encodings.  */
+    static private void multipleFilenameEncodingsNotSupported() {   
+        WarningDialog dialog = new WarningDialog("warning.NoEncodingSupport", 
+            Dictionary.get("General.MultipleFileNamesNotSupported.Title"), 
+            Dictionary.get("General.MultipleFileNamesNotSupported.Message"), null, false);
+        dialog.display();
+        dialog.dispose();
+        dialog = null;
+    }
 
     /** Sets up the proxy connection by setting JVM Environment flags and creating a new Authenticator.