Changeset 24294

Timestamp:

2011-07-20T15:03:50+12:00 (12 years ago)

Author:

ak19

Message:

If the user has a non-standard collecthome (collecthome is not in the default location of the GS installation) a message appears informing the user of this at startup.

Location:

main/trunk/gli

Files:

• classes/dictionary.properties (modified) (1 diff)
• classes/xml/config.xml (modified) (1 diff)
• src/org/greenstone/gatherer/Gatherer.java (modified) (7 diffs)

main/trunk/gli/classes/dictionary.properties

@@ -889 +889 @@
 NoEncodingSupport.Message:Your locale seems to be in UTF-8. Non-UTF-8 filenames are not supported by your setup.
 NoEncodingSupport.Title:No Filename Encoding Support
+#******** Non-standard collect home *******
+NonStandardCollectHome.Message:Your current collect home {0} is located outside of your Greenstone installation and is not its default collect directory at {1}. To work with the collect directory of your choice, go to File > Preferences > Connection and set the Collect Directory field to a folder.
+NonStandardCollectHome.Title:Non-standard collect home
 #*****************************
 #

main/trunk/gli/classes/xml/config.xml

@@ -110 +110 @@
     <Argument name="warning.MissingPERL">true</Argument>
     <Argument name="warning.NoEncodingSupport">true</Argument>
+    <Argument name="warning.NonStandardCollectHome">true</Argument>
     <Argument name="warning.NoPluginExpectedToProcessFile">true</Argument>
     <Argument name="warning.LegacyCollection">true</Argument>

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

@@ -326 +326 @@
             }
             
-            initCollectDirectoryPath(open_collection); 
+            initCollectDirectoryPath(); 
             
             if (no_load || (isGsdlRemote && open_collection_file_path.equals(""))) {
@@ -649 +649 @@
         if (open_collection_file_path == null || new File(Gatherer.open_collection_file_path).isDirectory()) {
             
-            //the menu bar items, file and edit, are disabled from the moment of their creation. if there is no left-over collection from the last session, enable them; otherwise it is untill the collection finishes loading, will they be enabled in collectionManager.java
+            //the menu bar items, file and edit, are disabled from the moment of their creation. if there is no left-over collection from the last session, enable them; otherwise it's disabled until the collection finishes loading. They will be enabled in collectionManager.java
             setMenuBarEnabled(true);
         } else {
@@ -826 +826 @@
 
 
-    public static void initCollectDirectoryPath(String open_collection) {       
+    public static void initCollectDirectoryPath() {     
         String defaultColdir = getDefaultGSCollectDirectoryPath(false); // no file separator at end
         String coldir = defaultColdir;
@@ -832 +832 @@
         // need to open the non-standard collect folder that the collection resides in
         if (!isGsdlRemote 
-                && !open_collection_file_path.startsWith(defaultColdir))
-        {
+            && !open_collection_file_path.startsWith(defaultColdir))
+        {  
             File collectFolder = null;
             
-            if(!open_collection_file_path.equals("")) {         
+            if(!open_collection_file_path.equals("")) {
+                // Inform the user that their collecthome is non-standard (not inside GS installation)
+                nonStandardCollectHomeMessage(open_collection_file_path, defaultColdir); // display message
+
                 if(!open_collection_file_path.endsWith("gli.col")) { // then it's a collect folder
                     collectFolder = new File(open_collection_file_path);
@@ -874 +877 @@
             if(coldir.equals(defaultColdir)) {              
                 gsdlsite_collecthome = Utility.updatePropertyConfigFile(
-                gsdlsitecfg, "collecthome", null);                      
+                gsdlsitecfg, "collecthome", null);
             } else {
                 gsdlsite_collecthome = Utility.updatePropertyConfigFile(
@@ -965 +968 @@
             // cursor now the custom actionPerformed() processing is complete, regardless
             // of whether the processing method terminates normally or throws an exception
-            // and regardedless of where in the call stack the exception is caught.         
+            // and regardless of where in the call stack the exception is caught.           
             
             timer.cancel();
@@ -1303 +1306 @@
     }
 
+    /** Prints a message informing the user that their collecthome is non-standard (not inside GS installation) */
+    static private void nonStandardCollectHomeMessage(String open_collection_file_path, String defaultColDir) {
+    WarningDialog dialog = new WarningDialog("warning.NonStandardCollectHome", Dictionary.get("NonStandardCollectHome.Title"), Dictionary.get("NonStandardCollectHome.Message", new String[]{open_collection_file_path, defaultColDir}), null, false);
+        dialog.display();
+        dialog.dispose();
+        dialog = null;
+    }
+
     /** Prints a warning message about the OS not supporting multiple filename encodings.  */
     static private void multipleFilenameEncodingsNotSupported() {