Changeset 19306 for gli

Timestamp:

2009-05-01T14:57:14+12:00 (15 years ago)

Author:

ak19

Message:

The download panel should be available in client-gli if there's a gs2build folder inside the client-gli checkout. In such a case, the gsdl flag is set to the gs2build folder in client-gli.sh/bat scripts, and gli is launched with this. Still only partially complete: the download panel is available AND it no longer throws an exception when you try to download, but it doesn't download anything either at the moment.

Location:

gli/trunk/src/org/greenstone/gatherer

Files:

• Gatherer.java (modified) (2 diffs)
• download/DownloadJob.java (modified) (1 diff)
• gui/GUIManager.java (modified) (1 diff)
• gui/MenuBar.java (modified) (1 diff)
• gui/Preferences.java (modified) (1 diff)

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

@@ -122 +122 @@
     static public boolean isGsdlRemote = false;
 
+    /* TODO: If we're using local GLI, collections are built locally. If we're using client-GLI
+     * and it contains a gs2build folder in it, then localBuild will also be true (if this is not
+     * turned off in Preferences). If we're remote and this is turned off in Prefs, build remotely. */
+    /*static public boolean buildingLocally = true;*/
+    /** If we're using local GLI, we can always download. If we're using client-GLI, we can only
+     * download if we have a gs2build folder inside it. And if we don't turn off downloadEnabling
+     * in the preferences.
+    */
+    static public boolean isDownloadEnabled = true;
+
     // feedback stuff
     /** is the feedback feature enabled? */
@@ -171 +181 @@
 
         // We don't have a local Greenstone!
-        go.gsdl_path = null;
         go.gsdl3_path=null;
         go.gsdl3_src_path=null;
 
+        // Don't set go.gsdl_path to null, since gdsl_path may still be set 
+        // if we have a client-gli containing gs2build folder. 
+        // However, keep track of whether we can download.
+        if(go.gsdl_path == null) {
+        isDownloadEnabled = false;
+        }
+
         // We have to use our own collect directory since we can't use the Greenstone one
         setCollectDirectoryPath(getGLIUserDirectoryPath() + "collect" + File.separator);
     }
-    // No, we have a local Greenstone
-    else {
+    // We have a local Greenstone. OR we have a gs2build folder inside 
+    // the client-GLI folder (with which the Download panel becomes enabled) 
+    if(isDownloadEnabled) {
         LocalGreenstone.setDirectoryPath(go.gsdl_path);
     }

gli/trunk/src/org/greenstone/gatherer/download/DownloadJob.java

@@ -236 +236 @@
         command_list.add("-S");
     }
+
+    // the following also works for client-gli if downloading is enabled (when there's a gs2build directory inside gli)
     command_list.add(LocalGreenstone.getBinScriptDirectoryPath()+"downloadfrom.pl");
     command_list.add("-download_mode");

gli/trunk/src/org/greenstone/gatherer/gui/GUIManager.java

@@ -375 +375 @@
         tab_pane.setFont(Configuration.getFont("general.font", false));
 
-        if (Configuration.get("workflow.download", true)) {
+        if (Configuration.get("workflow.download", true) && Gatherer.isDownloadEnabled) {
         download_pane = new DownloadPane();
         // "GUI.Download_Tooltip" is used automatically

gli/trunk/src/org/greenstone/gatherer/gui/MenuBar.java

@@ -216 +216 @@
     help.add(help_general);
     help.add(new JSeparator());
-    if (Configuration.get("workflow.download", true)) {
+    if (Configuration.get("workflow.download", true) && Gatherer.isDownloadEnabled) {
         help.add(help_download);
     }

gli/trunk/src/org/greenstone/gatherer/gui/Preferences.java

@@ -638 +638 @@
     workflow_download = new JCheckBox(Dictionary.get("GUI.Download")+" - "+Dictionary.get("GUI.Download_Tooltip"));
         workflow_download.setComponentOrientation(Dictionary.getOrientation());
-    workflow_download.setSelected(Configuration.get("workflow.download", false));
+    workflow_download.setSelected(Configuration.get("workflow.download", false) && Gatherer.isDownloadEnabled);
     workflow_download.setPreferredSize(ROW_SIZE);