Changeset 22771 for main

Timestamp:

2010-08-24T19:49:00+12:00 (14 years ago)

Author:

ak19

Message:

More changes for ticket 152: making the collectdir moveable. When using server.exe, if GLI was last shutdown when another collectdir was active, this needs to be read in from the user config.xml by GLI, and server.exe needs to use it.

Location:

main/trunk/gli/src/org/greenstone/gatherer

Files:

• Gatherer.java (modified) (3 diffs)
• cdm/CollectionConfiguration.java (modified) (1 diff)
• collection/CollectionManager.java (modified) (2 diffs)
• greenstone/LocalLibraryServer.java (modified) (3 diffs)

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

@@ -708 +708 @@
     }
 
-    /** Returns the path of the Greenstone "collect" directory. */
+    /** Returns the path of the current collect directory. */
     static public String getCollectDirectoryPath()
     {
@@ -714 +714 @@
         return non_standard_collect_directory_path;
     }
-
-    if (!GS3) {
-        return Configuration.gsdl_path + "collect" + File.separator;
-    }
-    else {
-        return getSitesDirectoryPath() + Configuration.site_name + File.separator + "collect" + File.separator;
-    }
-    }
-
+    
+    return getDefaultGSCollectDirectoryPath();
+    
+    }
+
+    /** Returns the path of the Greenstone "collect" directory. */
+    static public String getDefaultGSCollectDirectoryPath() {
+        if (!GS3) {
+            return Configuration.gsdl_path + "collect" + File.separator;
+        }
+        else {
+            return getSitesDirectoryPath() + Configuration.site_name + File.separator + "collect" + File.separator;
+        }
+    }   
 
     /** Returns the path of the GLI directory. */
@@ -833 +838 @@
     // non-destructive update of gsdl(3)site.cfg (comments preserved)
     String collectDir = Gatherer.getCollectDirectoryPath();
+    //collectDir = "\"" + collectDir.substring(0, collectDir.length()-1) + "\""; // remove file separator at end    
     collectDir = collectDir.substring(0, collectDir.length()-1); // remove file separator at end    
     Utility.updatePropertyConfigFile(gsdlsitecfg, "collecthome", collectDir);

main/trunk/gli/src/org/greenstone/gatherer/cdm/CollectionConfiguration.java

@@ -410 +410 @@
        
     // If we're using the Local Library we must release the collection before writing to the collect.cfg file
-    String collection_name = CollectionManager.getLoadedCollectionName ();
+    String collection_name = CollectionManager.getLoadedCollectionName (false); // url style slash
     boolean collection_released = false;
     if (Gatherer.c_man.built () && LocalLibraryServer.isRunning () == true) {

main/trunk/gli/src/org/greenstone/gatherer/collection/CollectionManager.java

@@ -425 +425 @@
 
     // If we're using the Local Library we must release the collection before writing to the collect.cfg file
-    if(Gatherer.isLocalLibrary) {
-        LocalLibraryServer.releaseCollection(collection.getName());
+    if(Gatherer.isLocalLibrary) {       
+        LocalLibraryServer.releaseCollection(getLoadedCollectionName()); // URL style slash //collection.getName());
     }
     
@@ -1850 +1850 @@
         // Ensure that the local library has released this collection so we can delete the index directory
         if (LocalLibraryServer.isRunning() == true) {
-        LocalLibraryServer.releaseCollection(collection.getName());
+        LocalLibraryServer.releaseCollection(getLoadedCollectionName()); // URL style slash //collection.getName());
         }
         // deactivate it in tomcat so that windows will release the index files

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

@@ -162 +162 @@
     }
 
-
+    /** collection name can be a group-qualified collect name */
     static public void releaseCollection(String collection_name)
     {
@@ -693 +693 @@
         useGLISiteCfg(server_exe);
         }
+        
+        // We're in the constructor, so we'll be running the LLS the first time,  if we're 
+        // running *server.exe* and if the current collect dir at Local Lib's startup is 
+        // anything other than the default GS collect dir, then use that:
+        if (isPersistentServer) { // server.exe, so we're dealing with a local GS2
+            String collectDir = Configuration.getString("general.open_collection_gs2", true);
+
+            // If opening a collection outside the standard GS collect folder, need
+            // to open the non-standard collect folder that the collection resides in
+            if (!collectDir.startsWith(Gatherer.getDefaultGSCollectDirectoryPath())) {
+                File collectFolder = null;
+                if(!collectDir.endsWith("gli.col")) { // then it's a collect folder
+                    collectFolder = new File(collectDir);
+                } else {
+                    // the filepath is a gli.col file. To get the collect folder: the 1st level
+                    // up is collection folder, 2 two levels up is the containing collect folder
+                    collectFolder = new File(collectDir).getParentFile().getParentFile();
+                }
+
+                // Need to deal with colgroups as well: while there's an etc/collect.cfg in the current
+                // collectFolder, move one level up
+                if(new File(collectFolder.getAbsolutePath()+File.separator+Utility.CONFIG_FILE).exists()) {
+                    collectFolder = collectFolder.getParentFile();              
+                }   
+                collectDir = collectFolder.getAbsolutePath();               
+                
+                // write out the non-standard collectDir (minus file separator at end) to the lls site conf 
+                // file being used
+                if(collectDir.endsWith(File.separator)) {
+                    collectDir = collectDir.substring(0, collectDir.length()); 
+                }
+                put(COLLECTHOME, collectDir);
+                save();
+                lastModified = configFile.lastModified();
+            }
+        } // now the correct current collect dir will get loaded when the server is started up hereafter        
     }
 
@@ -976 +1012 @@
         
             // write out the line
-            out.write(line + "\n");
+            out.write(line);
+            out.newLine();
         }