Changeset 19668

Timestamp:

2009-05-29T12:37:08+12:00 (14 years ago)

Author:

ak19

Message:

Not working. Changes made for collectiongroup.

Location:

gli/branches/glicolgroup/src/org/greenstone/gatherer

Files:

• cdm/CollectionConfiguration.java (modified) (2 diffs)
• cdm/GeneralManager.java (modified) (1 diff)
• cdm/MacrosManager.java (modified) (1 diff)
• collection/BasicCollectionConfiguration.java (modified) (1 diff)
• collection/CollectionManager.java (modified) (7 diffs)
• greenstone/LocalLibraryServer.java (modified) (2 diffs)
• gui/DeleteCollectionPrompt.java (modified) (1 diff)
• gui/ExplodeMetadataDatabasePrompt.java (modified) (1 diff)
• gui/Preferences.java (modified) (1 diff)
• gui/ReplaceSrcDocWithHtmlPrompt.java (modified) (2 diffs)
• metadata/MetadataXMLFileManager.java (modified) (1 diff)
• metadata/ProfileXMLFile.java (modified) (1 diff)
• remote/RemoteGreenstoneServerAction.java (modified) (5 diffs)

gli/branches/glicolgroup/src/org/greenstone/gatherer/cdm/CollectionConfiguration.java

@@ -3697 +3697 @@
         
         // If we're using the Local Library we must release the collection before writing to the collect.cfg file
-        String collection_name = Gatherer.c_man.getCollection ().getName ();
+        String collection_name = Gatherer.c_man.getCollection().getGroupQualifiedName(true);
         boolean collection_released = false;
         if (Gatherer.c_man.built () && LocalLibraryServer.isRunning () == true) {
@@ -3786 +3786 @@
         
         // 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.getLoadedGroupQualifiedCollectionName(true);
         boolean collection_released = false;
         if (Gatherer.c_man.built () && LocalLibraryServer.isRunning () == true) {

gli/branches/glicolgroup/src/org/greenstone/gatherer/cdm/GeneralManager.java

@@ -369 +369 @@
                 if (Gatherer.isGsdlRemote) {
                 Gatherer.remoteGreenstoneServer.uploadCollectionFile(
-                                   CollectionManager.getLoadedCollectionName(), collection_image_file);
+                                   CollectionManager.getLoadedGroupQualifiedCollectionName(true), collection_image_file);
                 }
             }

gli/branches/glicolgroup/src/org/greenstone/gatherer/cdm/MacrosManager.java

@@ -221 +221 @@
         // Users need to wait until the upload has finished before pressing Preview Collection!
         if (Gatherer.isGsdlRemote) {
-            Gatherer.remoteGreenstoneServer.uploadCollectionFile(CollectionManager.getLoadedCollectionName(), extra_dm_file);
+            Gatherer.remoteGreenstoneServer.uploadCollectionFile(CollectionManager.getLoadedGroupQualifiedCollectionName(true), extra_dm_file);
         }
         }

gli/branches/glicolgroup/src/org/greenstone/gatherer/collection/BasicCollectionConfiguration.java

@@ -257 +257 @@
     
     }
+
+    /** This current file is in .../<col_name>/etc/collect.cfg. This method returns .../<col_name>
+     * @return the short name of this collection as a String
+     */
+    public String getCollectionPath() {
+    return file.getParentFile().getParentFile().getAbsolutePath();
+    }
+
     
     /** set the site for this coll */

gli/branches/glicolgroup/src/org/greenstone/gatherer/collection/CollectionManager.java

@@ -398 +398 @@
     // Remove the lock file on the server
     if (Gatherer.isGsdlRemote) {
-        Gatherer.remoteGreenstoneServer.deleteCollectionFile(collection.getName(), lock_file);
+        Gatherer.remoteGreenstoneServer.deleteCollectionFile(collection.getGroupQualifiedName(true), lock_file);
     }
 
@@ -572 +572 @@
 
         // for remote case, scheduling causes an Exception on creating a new collection that 
-        // can't be recovered from. For GS3, it doesn't work since it it trying to access etc/main.cfg
+        // can't be recovered from. For GS3, it doesn't work since it is trying to access etc/main.cfg
         if (canDoScheduling()) {
         scheduling();
@@ -583 +583 @@
         // Import default metadata sets, if any
         // for (int i = 0; metadata_sets != null && i < metadata_sets.size(); i++) {
-        // importMetadataSet((MetadataSet) metadata_sets.get(i));
+        // importMetadataSet((MetadataSecollection_namet) metadata_sets.get(i));
         // }
 
@@ -1106 +1106 @@
         // If we're using a remote Greenstone server, upload the metadata file
         if (Gatherer.isGsdlRemote) {
-            Gatherer.remoteGreenstoneServer.uploadCollectionFile(collection.getName(), metadata_set_file);
+            Gatherer.remoteGreenstoneServer.uploadCollectionFile(collection.getGroupQualifiedName(true), metadata_set_file);
         }
         }
@@ -1169 +1169 @@
     {
     DebugStream.println("Loading collection " + location + "...");
+    System.err.println("*** Loading collection " + location + "...");
 
     if (Gatherer.isGsdlRemote) {
-        String collection_name = location.substring(location.lastIndexOf(File.separator) + 1, location.length() - ".col".length());
+        //String collection_name = location.substring(location.lastIndexOf(File.separator) + 1, location.length() - ".col".length());
+        String collection_name = location.substring(0, location.lastIndexOf(File.separator));
+        collection_name = Gatherer.remoteGreenstoneServer.getPathRelativeToDirectory(new File(collection_name), getDefaultCollectDirectory());
         if (Gatherer.remoteGreenstoneServer.downloadCollection(collection_name).equals("")) {
         return;
@@ -1670 +1673 @@
         // If we're using a remote Greenstone server, delete the metadata file on the server
         if (Gatherer.isGsdlRemote) {
-        Gatherer.remoteGreenstoneServer.deleteCollectionFile(collection.getName(), metadata_set_file);
+        Gatherer.remoteGreenstoneServer.deleteCollectionFile(collection.getGroupQualifiedName(true), metadata_set_file);
         }
     }
@@ -1806 +1809 @@
         if (Gatherer.isGsdlRemote) {
             Gatherer.remoteGreenstoneServer.deleteCollectionFile(
-                             collection.getName(), new File(getLoadedCollectionIndexDirectoryPath()));
-            Gatherer.remoteGreenstoneServer.moveCollectionFile(collection.getName(), 
+                             collection.getGroupQualifiedName(true), new File(getLoadedCollectionIndexDirectoryPath()));
+            Gatherer.remoteGreenstoneServer.moveCollectionFile(collection.getGroupQualifiedName(true), 
                     new File(getLoadedCollectionBuildingDirectoryPath()), new File(getLoadedCollectionIndexDirectoryPath()));
         }

gli/branches/glicolgroup/src/org/greenstone/gatherer/greenstone/LocalLibraryServer.java

@@ -378 +378 @@
      * in an independently launched GSI (one not launched by GLI). */
     static public boolean isURLPending() {
-    /*if(Configuration.library_url != null) {
-        System.err.println("**** Configuration.library_url: " + Configuration.library_url );
-        return false; // don't need to do anything as we already have the url
-        }*/
 
     llssite_cfg_file.load(true); // don't force reload, load only if modified
@@ -426 +422 @@
         Configuration.library_url = new URL(url);
         running = true;
+        // Run the server interface
+        //Gatherer.spawnApplication(local_library_server_command, ID);
         }
         catch (MalformedURLException exception) {

gli/branches/glicolgroup/src/org/greenstone/gatherer/gui/DeleteCollectionPrompt.java

@@ -293 +293 @@
             details.setCaretPosition(0);
         } else { // trying to delete the collection that is open at present
-            // add a tooltip saying to the confirmation checkbox saying that the current collection can't be deleted 
+            // add a tooltip to the confirmation checkbox saying that the current collection can't be deleted 
             String tooltip = Dictionary.get("DeleteCollectionPrompt.Cannot_Delete_Open_Collection_Tooltip", 
                             collection.getName());

gli/branches/glicolgroup/src/org/greenstone/gatherer/gui/ExplodeMetadataDatabasePrompt.java

@@ -356 +356 @@
             Utility.delete(metadata_file.getParentFile());
             Gatherer.remoteGreenstoneServer.downloadCollectionFile(
-                             CollectionManager.getLoadedCollectionName(), metadata_file.getParentFile());
+                             CollectionManager.getLoadedGroupQualifiedCollectionName(true), metadata_file.getParentFile());
         }
 

gli/branches/glicolgroup/src/org/greenstone/gatherer/gui/Preferences.java

@@ -1032 +1032 @@
             if (Gatherer.c_man.getCollection()!=null){
             File lock_file = new File(Gatherer.c_man.getLoadedCollectionDirectoryPath() + "gli.lck");
-            Gatherer.remoteGreenstoneServer.deleteCollectionFile(Gatherer.c_man.getLoadedCollectionName(),lock_file);
+            Gatherer.remoteGreenstoneServer.deleteCollectionFile(Gatherer.c_man.getLoadedGroupQualifiedCollectionName(true),lock_file);
             Gatherer.g_man.closeCurrentCollection();
             }

gli/branches/glicolgroup/src/org/greenstone/gatherer/gui/ReplaceSrcDocWithHtmlPrompt.java

@@ -394 +394 @@
             // into the import directory on the client side
             Gatherer.remoteGreenstoneServer.downloadCollectionFile(
-                          CollectionManager.getLoadedCollectionName(),
+                          CollectionManager.getLoadedGroupQualifiedCollectionName(true),
                           new File(srcdoc_files[i].getParentFile(), htmlFile));
             
@@ -401 +401 @@
             
             // If an associated_folder by such a name exists, download it
-            if(Gatherer.remoteGreenstoneServer.exists(CollectionManager.getLoadedCollectionName(), assoc_folder)) {
+            if(Gatherer.remoteGreenstoneServer.exists(CollectionManager.getLoadedGroupQualifiedCollectionName(true), assoc_folder)) {
                 Gatherer.remoteGreenstoneServer.downloadCollectionFile(
-                                    CollectionManager.getLoadedCollectionName(), assoc_folder);
+                                    CollectionManager.getLoadedGroupQualifiedCollectionName(true), assoc_folder);
             }
             }

gli/branches/glicolgroup/src/org/greenstone/gatherer/metadata/MetadataXMLFileManager.java

@@ -369 +369 @@
         // Upload the files modified since last time, then reset the list
         Gatherer.remoteGreenstoneServer.uploadCollectionFiles(
-                  CollectionManager.getLoadedCollectionName(), (File[]) modified_metadata_xml_files.toArray(new File[0]));
+                  CollectionManager.getLoadedGroupQualifiedCollectionName(true), (File[]) modified_metadata_xml_files.toArray(new File[0]));
         modified_metadata_xml_files.clear();
     }

gli/branches/glicolgroup/src/org/greenstone/gatherer/metadata/ProfileXMLFile.java

@@ -110 +110 @@
     // This is inefficient but for simplicity we'll just upload the file every time it is changed
     if (Gatherer.isGsdlRemote) {
-        Gatherer.remoteGreenstoneServer.uploadCollectionFile(CollectionManager.getLoadedCollectionName(), this);
+        Gatherer.remoteGreenstoneServer.uploadCollectionFile(CollectionManager.getLoadedGroupQualifiedCollectionName(true), this);
     }
 

gli/branches/glicolgroup/src/org/greenstone/gatherer/remote/RemoteGreenstoneServerAction.java

@@ -109 +109 @@
     public DeleteCollectionAction(String collection_name)
     {
-        this.collection_name = collection_name;
+        this.collection_name = collection_name; //.replace('/', File.separatorChar); // if colgroup contained url slashes
     }
 
@@ -137 +137 @@
     public DeleteCollectionFileAction(String collection_name, File collection_file)
     {
-        this.collection_name = collection_name;
+        this.collection_name = collection_name; //.replace('/', File.separatorChar); // if colgroup contained url slashes
         this.collection_file = collection_file;
     }
@@ -146 +146 @@
         String collection_directory_path = CollectionManager.getCollectionDirectoryPath(collection_name);
         String collection_file_relative_path = remote.getPathRelativeToDirectory(collection_file, collection_directory_path);
+        System.err.println("**** DeleteCollectionFile.\n\tcol_file: "+collection_file + "\n\t" + collection_directory_path);
+
         collection_file_relative_path = collection_file_relative_path.replaceAll((Utility.isWindows() ? "\\\\" : "\\/"), "|");
         progress_bar.setAction("Deleting collection file " + collection_file_relative_path + "...");
@@ -176 +178 @@
     {
         progress_bar.setAction("Downloading remote collection " + collection_name + "...");
+        System.err.println("*** RGSAction.DownloadCollectionAction, col_name: " + collection_name);
 
         String download_collection_command = "cmd=download-collection";
@@ -613 +616 @@
     public UploadFilesIntoCollectionAction(String collection_name, File[] source_files, File target_collection_directory)
     {
-        this.collection_name = collection_name;
+        this.collection_name = collection_name; //.replace('/', File.separatorChar); // if colgroup contained url slashes
         this.source_files = source_files;
         this.target_collection_directory = target_collection_directory;