Changeset 22410 for main/trunk/gli/src/org/greenstone/gatherer/file

Timestamp:

2010-07-15T22:10:59+12:00 (14 years ago)

Author:

ak19

Message:

Getting collectgroup to work for a remote Greenstone server. Need to update gliserver.pl still to work with the collectgroup changes. 1. GLI side changes: no longer does the collectdir parameter to import and build include the colgroup at the end, it is now back to being everything upto the GS collect dir. Instead, the loaded collection is colgroup/subcolname. 2. Changed CollectionManager.getLoadedCollectionName() to return (colgroup/)subcolname instead of the subcolname excluding groupname. 3. This required changes in other classes, including replacing unnecessary explicit calls to getLoadedGroupQualifiedCollectionName(). 4. Added another variant: getLoadedCollectionName(boolean). If the parameter is true, it will put a url style slash between colgroup and subcolname, otherwise use the OS dependent FileSeparator. 5. Changes to RemoteGreenstoneServer to pass the group/subcol as the collectionname to gliserver.pl, with a vertical bar separator. 6. Minor changes like: WorkspaceTreeNode now knows not to load a collection group if it's already in the loaded collection (previously handed only sub collection name), removed old debugging statements and unused import statements.

Location:

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

Files:

• FileManager.java (modified) (6 diffs)
• WorkspaceTree.java (modified) (1 diff)
• WorkspaceTreeNode.java (modified) (1 diff)

main/trunk/gli/src/org/greenstone/gatherer/file/FileManager.java

@@ -171 +171 @@
         file_queue.addJob(id, source, source_nodes, target, target_node, type);
         if (Gatherer.isGsdlRemote) {
-            String collection_name = CollectionManager.getLoadedGroupQualifiedCollectionName(true);
+            String collection_name = CollectionManager.getLoadedCollectionName();
 
             // Perform the appropriate action based on the job type (RemoteGreenstoneServer will queue)
@@ -274 +274 @@
         if (file.getAbsolutePath().startsWith(Gatherer.getCollectDirectoryPath()) && file.length() == 0) {
             if (Gatherer.remoteGreenstoneServer.downloadCollectionFile(
-                                 CollectionManager.getLoadedGroupQualifiedCollectionName(true), file).equals("")) {
+                                 CollectionManager.getLoadedCollectionName(), file).equals("")) {
             // Something has gone wrong downloading the file
             return;
@@ -350 +350 @@
                 if (Gatherer.isGsdlRemote) {
                 Gatherer.remoteGreenstoneServer.uploadCollectionFile(
-                                         CollectionManager.getLoadedGroupQualifiedCollectionName(true), folder_file);
+                                         CollectionManager.getLoadedCollectionName(), folder_file);
                 }
             }
@@ -357 +357 @@
                 if (Gatherer.isGsdlRemote) {
                 Gatherer.remoteGreenstoneServer.newCollectionDirectory(
-                                         CollectionManager.getLoadedGroupQualifiedCollectionName(true), folder_file);
+                                         CollectionManager.getLoadedCollectionName(), folder_file);
                 }
             }
@@ -418 +418 @@
         if (Gatherer.isGsdlRemote) {
             Gatherer.remoteGreenstoneServer.moveCollectionFile(
-                             CollectionManager.getLoadedGroupQualifiedCollectionName(true), collection_file, new_collection_file);
+                             CollectionManager.getLoadedCollectionName(), collection_file, new_collection_file);
         }
         }
@@ -467 +467 @@
         file_queue.addJob(System.currentTimeMillis(), Gatherer.g_man.gather_pane.workspace_tree, new FileNode[] { source_node }, collection_tree, (FileNode)collection_tree_node.getParent(),  FileJob.COPY_FILE_ONLY);
         if (Gatherer.isGsdlRemote) {
-        String collection_name = CollectionManager.getLoadedGroupQualifiedCollectionName(true);
+        String collection_name = CollectionManager.getLoadedCollectionName();
         Gatherer.remoteGreenstoneServer.deleteCollectionFile(collection_name, collection_tree_node.getFile());
         Gatherer.remoteGreenstoneServer.uploadFilesIntoCollection(collection_name, new File[] { new_file }, target_directory);

main/trunk/gli/src/org/greenstone/gatherer/file/WorkspaceTree.java

@@ -169 +169 @@
         // If the specified folder is open, it must be refreshed
         if (tree_node_path_str.equals(folder_path_str)) {
-        System.err.println("Must refresh node " + tree_node_path_str + "!");
+        //System.err.println("Must refresh node " + tree_node_path_str + "!");
         ((WorkspaceTreeModel) getModel()).refresh(expanded_tree_path);
         }

main/trunk/gli/src/org/greenstone/gatherer/file/WorkspaceTreeNode.java

@@ -168 +168 @@
               
               // One last piece of magic so we can determine the current collection
-              // I don't think this will work properly with groups,
-              // as it may give a false positive??
-              collection_root.is_in_loaded_collection = cols[i].getName().equals(CollectionManager.getLoadedCollectionName());
+              // Now made to work with collection groups
+              String groupQualifiedColName = cols[i].getName();
+              if(is_group_node) { // then title would have stored the colgroup name
+                  groupQualifiedColName = title + File.separator + cols[i].getName();
+              }
+              collection_root.is_in_loaded_collection = groupQualifiedColName.equals(CollectionManager.getLoadedCollectionName());
               child_nodes.add(collection_root);
             }