Changeset 37413

Timestamp:

2023-03-06T09:07:24+13:00 (3 weeks ago)

Author:

davidb

Message:

New block of code added to webswing version of Preview uses 'localhost' version of library_url. This is so it doesn't have to authenticate to run the GS3 recofigure command. This commit is a rough-cut at the needed code. It works by reading build.properties every time Preview button (either on the Create pane or Format pane) is pressed. This code should be refactored to for instance use a member field to store the property file read in

File:

• main/trunk/gli/src/org/greenstone/gatherer/Gatherer.java (modified) (1 diff)

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

@@ -1249 +1249 @@
         
         try {
+            String full_context_url = null;
+            
+            if (!isWebswing) {
+                full_context_url = Configuration.library_url.toString();
+            }
+            else {
+                // In the case of WebSwing, we can use the internal (e.g. localhost) form
+                // of GS3 configuration service request, meaning we don't need to provide
+                // authentication credentials
+                
+                /* **** !!!! */
+                /* Need to rewrite this to avoid having to load in the build.properties file every time */
+                
+                String local_context = "greenstone3"; // Default
+            
+                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));
+                    local_context = props.getProperty("greenstone.context", local_context);
+                    
+                    ProtocolPortProperties protocol_port_props = new ProtocolPortProperties(props); // can throw Exception
+                    
+                    full_context_url= protocol_port_props.getLocalHttpBaseAddress() + "/" + local_context;
+                }
+                catch(Exception e) {
+                    DebugStream.println("Could not load build.properties file");
+                    System.err.println("Could not load build.properties file");
+                }
+                }
+                
+                if (full_context_url == null) {
+                System.err.println("Setting base configuration URL to Greenstone3 default:");
+                full_context_url = "http://localhost:8383/greenstone3/";
+                System.err.println("    " + full_context_url);
+                }
+            }
+
+            String library_servlet_name = Configuration.getServletPath();
+
+            /* The above replaces the old way of doing this, which is just the single following line */
             // need to add the servlet name to the exec address
-            String raw_url = Configuration.library_url.toString() + Configuration.getServletPath() + command;
+            //String raw_url = Configuration.library_url.toString() + Configuration.getServletPath() + command;
+            
+            String raw_url = full_context_url + library_servlet_name + command;         
+            
+            
             URL url = new URL(raw_url);
             DebugStream.println("Action: " + raw_url);
+            
             HttpURLConnection library_connection = (HttpURLConnection) url.openConnection();
             int response_code = library_connection.getResponseCode();