Changeset 14304

Timestamp:

2007-08-06T10:20:40+12:00 (17 years ago)

Author:

qq6

Message:

Added the configuration for the remote gs3

File:

• gli/trunk/src/org/greenstone/gatherer/Gatherer.java (modified) (10 diffs)

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

@@ -161 +161 @@
         // We have to use our own collect directory since we can't use the Greenstone one
         setCollectDirectoryPath(getGLIUserDirectoryPath() + "collect" + File.separator);
+        if (go.run_gsdl3){   
+        GS3=true;
+        go.gsdl3_path=null;
+        go.gsdl3_src_path=null;
+        }
     }
     // No, we have a local Greenstone
@@ -175 +180 @@
     if (isGsdlRemote) {
         Configuration.TEMPLATE_CONFIG_XML = "xml/configRemote.xml";
-        Configuration.CONFIG_XML = "configRemote.xml";
-        Configuration.GS3_CONFIG_XML = "config3Remote.xml";
+        if (!go.run_gsdl3){  
+        Configuration.CONFIG_XML = "configRemote.xml";
+        }else{
+        Configuration.GS3_CONFIG_XML = "config3Remote.xml";
+        }
 
         File collect_directory = new File(Gatherer.getCollectDirectoryPath());
@@ -232 +240 @@
         new Configuration(getGLIUserDirectoryPath(), gsdl_path, gsdl3_path, gsdl3_src_path, site_name);
 
-        if (GS3) {
-        // Load Greenstone 3 servlet configuration
-        servlet_config = new ServletConfiguration(gsdl3_path);
-        }
-
         // Check we know where Perl is
         Configuration.perl_path = perl_path;
@@ -248 +251 @@
         }
 
-        if (GS3 && Configuration.servlet_path == null) {
-        Configuration.servlet_path = servlet_config.getServletPath(Configuration.site_name);
-        }
-
         // the feedback dialog has been loaded with a default locale, 
         // now set the user specified one
@@ -291 +290 @@
         DebugStream.println("Configuration.library_url = " + Configuration.library_url);
         if (Configuration.library_url == null) {
-        missingEXEC();
+        missingEXEC(); 
+        //missingGLIServer();
         }
 
@@ -314 +314 @@
             gliserver_url_string = Configuration.gliserver_url.toString();
         }
+        }
+
+        if (GS3) {
+        // Load Greenstone 3 servlet configuration
+        if (isGsdlRemote){
+            servlet_config = new ServletConfiguration(Configuration.gli_user_directory_path);
+        }else{
+            servlet_config= new ServletConfiguration(gsdl3_path);
+        }
+        }
+
+        if (GS3 && Configuration.servlet_path == null) {
+        Configuration.servlet_path = servlet_config.getServletPath(Configuration.site_name);
         }
 
@@ -403 +416 @@
     g_man = new GUIManager(size);
 
-    }
-
-
-    public void openGUI() {
-      // Size and place the frame on the screen
-      Rectangle bounds = Configuration.getBounds("general.bounds", true);
-      if (bounds == null) {
-        // Choose a sensible default value
-        bounds = new Rectangle(0, 0, 640, 480);
-      }
-      
-      // Ensure width and height are reasonable
-      size = bounds.getSize();
-      if (size.width < 640) {
-        size.width = 640;
-      } else if (size.width > Configuration.screen_size.width && Configuration.screen_size.width > 0) {
-        size.width = Configuration.screen_size.width;
-      }
-      if (size.height < 480) {
-        size.height = 480;
-      } else if (size.height > Configuration.screen_size.height && Configuration.screen_size.height > 0) {
-        size.height = Configuration.screen_size.height;
-      }
-      
-      if (!g_man_built) {
-        
-        g_man.display();
-        
-        // Place the window in the desired location on the screen, if this is do-able (not under most linux window managers apparently. In fact you're lucky if they listen to any of your screen size requests).
-        g_man.setLocation(bounds.x, bounds.y);
-        g_man.setVisible(true);
-        
-        // After the window has been made visible, check that it is in the correct place
-        // sometimes java places a window not in the correct place,
-        // but with an offset. If so, we work out what the offset is
-        // and change the desired location to take that into account
-        Point location = g_man.getLocation();
-        int x_offset = bounds.x - location.x;
-        int y_offset = bounds.y - location.y;
-        // If not, offset the window to move it into the correct location
-        if (x_offset > 0 || y_offset > 0) {
-          ///ystem.err.println("changing the location to "+(bounds.x + x_offset)+" "+ (bounds.y + y_offset));
-          g_man.setLocation(bounds.x + x_offset, bounds.y + y_offset);
-        }
-        
-        // The 'after-display' triggers several events which don't occur until after the visual components are actually available on screen. Examples of these would be the various html renderings, as they can't happen offscreen.
-        g_man.afterDisplay();
-        g_man_built = true;
-      } else {
-        g_man.setVisible(true);
-      }
-      // Get a list of the core Greenstone classifiers and plugins
-      Classifiers.loadClassifiersList(null);
-      Plugins.loadPluginsList(null);
-      
-      // If using a remote Greenstone we need to download the collection configurations now
-      if (Gatherer.isGsdlRemote) {
-        if (RemoteGreenstoneServer.downloadCollectionConfigurations().equals("")) {
-          // !! Something went wrong downloading the collection configurations
-          System.err.println("Error: Could not download collection configurations.");
-          System.exit(0);
-        }
-      }
-  
-  if (open_collection_file_path == null) {
+    // Get a list of the core Greenstone classifiers and plugins
+    Classifiers.loadClassifiersList(null);
+    Plugins.loadPluginsList(null);
+
+    // If using a remote Greenstone we need to download the collection configurations now
+    if (Gatherer.isGsdlRemote) {
+        if (RemoteGreenstoneServer.downloadCollectionConfigurations().equals("")) {
+        // !! Something went wrong downloading the collection configurations
+        System.err.println("Error: Could not download collection configurations.");
+        System.exit(0);
+        }
+    }
+
+    }
+
+    public void openGUI()
+    {
+    // Size and place the frame on the screen
+    Rectangle bounds = Configuration.getBounds("general.bounds", true);
+    if (bounds == null) {
+        // Choose a sensible default value
+        bounds = new Rectangle(0, 0, 640, 480);
+    }
+    
+    // Ensure width and height are reasonable
+    size = bounds.getSize();
+    if (size.width < 640) {
+        size.width = 640;
+    }
+    else if (size.width > Configuration.screen_size.width && Configuration.screen_size.width > 0) {
+        size.width = Configuration.screen_size.width;
+    }
+    if (size.height < 480) {
+        size.height = 480;
+    }
+    else if (size.height > Configuration.screen_size.height && Configuration.screen_size.height > 0) {
+        size.height = Configuration.screen_size.height;
+    }
+
+    if (!g_man_built) {
+
+        g_man.display();
+
+        // Place the window in the desired location on the screen, if this is do-able (not under most linux window managers apparently. In fact you're lucky if they listen to any of your screen size requests).
+        g_man.setLocation(bounds.x, bounds.y);
+        g_man.setVisible(true);
+
+        // After the window has been made visible, check that it is in the correct place
+        // sometimes java places a window not in the correct place, 
+        // but with an offset. If so, we work out what the offset is
+        // and change the desired location to take that into account 
+        Point location = g_man.getLocation();
+        int x_offset = bounds.x - location.x;
+        int y_offset = bounds.y - location.y;
+        // If not, offset the window to move it into the correct location
+        if (x_offset > 0 || y_offset > 0) {
+        ///ystem.err.println("changing the location to "+(bounds.x + x_offset)+" "+ (bounds.y + y_offset));
+        g_man.setLocation(bounds.x + x_offset, bounds.y + y_offset);
+        }
+
+        // The 'after-display' triggers several events which don't occur until after the visual components are actually available on screen. Examples of these would be the various html renderings, as they can't happen offscreen.
+        g_man.afterDisplay();
+        g_man_built = true;
+    }
+    else {
+        g_man.setVisible(true);
+    }
+
+    // Get a list of the core Greenstone classifiers and plugins
+    /*Classifiers.loadClassifiersList(null);
+    Plugins.loadPluginsList(null);
+
+    // If using a remote Greenstone we need to download the collection configurations now
+    if (Gatherer.isGsdlRemote) {
+        if (RemoteGreenstoneServer.downloadCollectionConfigurations().equals("")) {
+        // !! Something went wrong downloading the collection configurations
+        System.err.println("Error: Could not download collection configurations.");
+        System.exit(0);
+        }
+    }*/
+
+    // If there was a collection left open last time, reopen it
+     if (open_collection_file_path == null) {
       
       //the menu bar items, file and edit, are disabled from the moment of their creation. if there is no left-over collection from the last session, enable them; otherwise it is untill the collection finishes loading, will they be enabled in collectionManager.java
-      setMenuBarEnabled(true);
-  } else {
+      setMenuBarEnabled(true);
+      } else {
   
       // If there was a collection left open last time, reopen it
-      c_man.openCollectionFromLastTime();
-  }
-    }
+      c_man.openCollectionFromLastTime();
+      }
+    }
+
     public static void setMenuBarEnabled(boolean enabled) {
       g_man.menu_bar.file.setEnabled(enabled);
@@ -715 +747 @@
     WarningDialog dialog;
     if (GS3) {
-        dialog = new WarningDialog("warning.MissingEXEC_GS3", Dictionary.get("MissingEXEC_GS3.Title"), Dictionary.get("MissingEXEC_GS3.Message"), "general.library_url", false);
-    }
-    else {
+        dialog = new WarningDialog("warning.MissingEXEC", Dictionary.get("MissingEXEC_GS3.Title"), Dictionary.get("MissingEXEC_GS3.Message"), "general.library_url", false);
+    }else {
         dialog = new WarningDialog("warning.MissingEXEC", Dictionary.get("MissingEXEC.Title"), Dictionary.get("MissingEXEC.Message"), "general.library_url", false);
     }
@@ -739 +770 @@
     static private void missingGLIServer()
     {
-    WarningDialog dialog = new WarningDialog("warning.MissingGLIServer", Dictionary.get("MissingGLIServer.Title"), Dictionary.get("MissingGLIServer.Message"), "general.gliserver_url", false);
+    WarningDialog dialog;
+    if (GS3) {
+        dialog = new WarningDialog("warning.MissingGLIServer", Dictionary.get("MissingGLIServer_GS3.Title"), Dictionary.get("MissingGLIServer_GS3.Message"), "general.gliserver_url", false);
+    }else {
+        dialog = new WarningDialog("warning.MissingGLIServer", Dictionary.get("MissingGLIServer.Title"), Dictionary.get("MissingGLIServer.Message"), "general.gliserver_url", false);
+    }
     dialog.setValueField(new URLField(Configuration.getColor("coloring.editable_foreground", false), Configuration.getColor("coloring.editable_background", false)));
     dialog.display();
@@ -979 +1015 @@
         Process image_magick_process = Runtime.getRuntime().exec(command);
         image_magick_process.waitFor();
-        
+
         //new way of detection of ImageMagick
         InputStreamReader isr = new InputStreamReader(image_magick_process.getInputStream());