Changeset 22358 for main

Timestamp:

2010-07-06T15:36:14+12:00 (14 years ago)

Author:

kjdon

Message:

.col file now called gli.col, not collname.col. This means that collections can be renamed and will still open in GLI (although any saved settings in .col file will not be used). If gli.col doesn't exist, look for a collname.col and rename it (for legacy colls). Can now open non-GLI collections. Don't do the scheduling update unless the coll file exists otherwise GLI craps out.

File:

• main/trunk/gli/src/org/greenstone/gatherer/collection/CollectionManager.java (modified) (7 diffs)

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

@@ -581 +581 @@
 
         // Now create the collection object around the directory.
-        collection = new Collection(new File(collection_directory_path, name + ".col"));
+        collection = new Collection(new File(collection_directory_path, "gli.col"));
 
         // for remote case, scheduling causes an Exception on creating a new collection that 
@@ -884 +884 @@
     static public String getLoadedCollectionColFilePath()
     {
-    return getLoadedCollectionDirectoryPath() + collection.getName() + ".col";
+    return getLoadedCollectionDirectoryPath() + "gli.col";
     }
 
@@ -1184 +1184 @@
     DebugStream.println("Loading collection " + location + "...");
 
-    if (Gatherer.isGsdlRemote) {
-        String collection_name = location.substring(location.lastIndexOf(File.separator) + 1, location.length() - ".col".length());
-        if (Gatherer.remoteGreenstoneServer.downloadCollection(collection_name).equals("")) {
-        return;
-        }
-    }
 
     // Check we have actually been given a .col file.
@@ -1197 +1191 @@
         return;
     }
-
+    
     // Check that the collection configuration file is available
     File collection_file = new File(location);
 
-    // Ensure that the directory exists
     File collection_directory = collection_file.getParentFile();
-       
+    String collection_name = collection_directory.getName();
+
+    if (Gatherer.isGsdlRemote) {
+        if (Gatherer.remoteGreenstoneServer.downloadCollection(collection_name).equals("")) {
+        return;
+        }
+    }
+    
+    // Ensure that the collection directory exists
     if (collection_directory == null || !collection_directory.exists()) {
         // We can't open this
@@ -1244 +1245 @@
 
     // Now determine if a lock already exists on this collection.
-    String collection_name = collection_directory.getName();
     File lock_file = new File(collection_file.getParentFile(), LOCK_FILE);
     if (lock_file.exists()) {
@@ -1261 +1261 @@
 
         lock_file.delete();
+    }
+
+    // now we are using gli.col - old colls may have used the collection name
+    if (!collection_file.exists()) {
+      File old_coll_file = new File(collection_directory, collection_name+".col");
+      if (old_coll_file.exists()) {
+        try {
+          old_coll_file.renameTo(collection_file);
+        } catch (Exception e) {
+          DebugStream.println("Couldn't rename "+old_coll_file.getName()+" to gli.col. Will just carry on with default gli.col");
+          // but just carry on.
+        }
+      }
     }
 
@@ -1283 +1296 @@
         }
         
-        if (canDoScheduling()) {
-        //THIS LOOKS LIKE THE BEST PLACE TO TRY AND UPDATE .col FILES FOR EXISTING COLLECTIONS...Wendy
- 
+        // need to fix this up as currently it craps out if the .col file is not there, which is may not always be.
+        if (canDoScheduling() && collection_file.exists()) {
+          //THIS LOOKS LIKE THE BEST PLACE TO TRY AND UPDATE .col FILES FOR EXISTING COLLECTIONS...Wendy
+          // Don't need to update anything if collection_file doesn't exist yet.
         //First, see if "Schedule" exists in the XMl File... 
         BufferedReader bir = new BufferedReader(new FileReader(collection_file));