Changeset 18131 for gli/trunk/src/org/greenstone/gatherer/Gatherer.java

Timestamp:

2008-12-05T18:13:28+13:00 (15 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.)

File:

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

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