Changeset 18131

Timestamp:

2008-12-05T18:13:28+13:00 (14 years ago)

Author:

ak19

Message:

Updated method missingEXEC() to present the user with the likely URL of the greenstone 3 server when GLI is launched in a GS3 context. (Previously the URL field was empty and the message was a bit more like a warning.)

Location:

gli/trunk

Files:

• classes/dictionary.properties (modified) (1 diff)
• src/org/greenstone/gatherer/Gatherer.java (modified) (3 diffs)

gli/trunk/classes/dictionary.properties

@@ -836 +836 @@
 MissingEXEC.Title:Missing Greenstone Library Address
 #***** Missing EXEC_GS3 *****
-MissingEXEC_GS3.Message:Warning! You will not be able to view your new collections within the Librarian Interface unless you specify the path to the Greenstone context in the locally running Tomcat Webserver. You can enter this now in the text field below, or later by going to Preferences and choosing the Connection tab. Remember that a valid url must start with the protocol "http://". The default address is http://localhost:8080/greenstone3.
-MissingEXEC_GS3.Title:Missing Greenstone 3 Library Address
+MissingEXEC_GS3.Message:Please enter the Greenstone 3 library URL. You will not be able to view your new collections within the Librarian Interface unless you specify the path to the Greenstone context in the locally running Tomcat Webserver. You can enter this now in the text field below, or later by going to Preferences and choosing the Connection tab. Remember that a valid URL must start with the protocol "http://".
+MissingEXEC_GS3.Title:Greenstone 3 Library URL
 #***** Missing GLIServer *****
 MissingGLIServer.Message:Enter the address of the remote Greenstone "gliserver.pl" script in the text field below. Remember that a valid URL must start with the protocol "http://" and end with "gliserver".

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

@@ -821 +821 @@
 
     if (GS3) {
-        dialog = new WarningDialog("warning.MissingEXEC", Dictionary.get("MissingEXEC_GS3.Title"), Dictionary.get("MissingEXEC_GS3.Message"), configPropertyName, false);
+        // Warning dialog with no cancel button and no "turn off warning" checkbox 
+        dialog = new WarningDialog("warning.MissingEXEC", Dictionary.get("MissingEXEC_GS3.Title"), Dictionary.get("MissingEXEC_GS3.Message"), configPropertyName, false, false);
     } else { // local case
         dialog = new WarningDialog("warning.MissingEXEC", Dictionary.get("MissingEXEC.Title"), Dictionary.get("MissingEXEC.Message"), configPropertyName, false);
     }
 
-    dialog.setValueField(new URLField.Text(Configuration.getColor("coloring.editable_foreground", false), Configuration.getColor("coloring.editable_background", false)));
+    JTextField field = new URLField.Text(Configuration.getColor("coloring.editable_foreground", false), Configuration.getColor("coloring.editable_background", false));
+
+    // Set the default library URL to the tomcat server and port number
+    // specified in the build.properties located in the gsdl3_src_path 
+    if (GS3) {
+        String host = "localhost";
+        String port = "8080";
+        
+        File buildPropsFile = new File(Configuration.gsdl3_src_path + File.separator + "build.properties");
+        if(buildPropsFile.exists()) {
+        Properties props = new Properties();
+        try{
+            props.load(new FileInputStream(buildPropsFile));
+            host = props.getProperty("tomcat.server", host); 
+            port = props.getProperty("tomcat.port", port); 
+        }catch(Exception e){
+            DebugStream.println("Could not load build.properties file");
+            System.err.println("Could not load build.properties file");
+        }
+        props = null;
+        }
+        String defaultURL = "http://"+host+":"+port+"/"+"greenstone3/library";
+        field.setText(defaultURL);
+        field.selectAll();
+    }
+    dialog.setValueField(field);
     dialog.display();
     dialog.dispose();
@@ -834 +860 @@
     if (!library_url_string.equals("")) {
         try {
+        // WarningDialog does not allow invalid URLs, so the following is ignored:
+        // make sure the URL the user provided contains the http:// prefix
+        // and then save the corrected URL
+        if(!library_url_string.startsWith("http://") 
+           && !library_url_string.startsWith("https://")) {
+            library_url_string = "http://"+library_url_string;
+            Configuration.setString(configPropertyName, true, configPropertyName);
+        }
         Configuration.library_url = new URL(library_url_string);
         }
@@ -864 +898 @@
     
     boolean showLogin = true;
- 
     do {
         if(!dialog.loginRequested()) { // user pressed cancel to exit the FedoraLogin dialog