Changeset 1640 for trunk/gsdl/src/phind/client/Phind.java

Timestamp:

2000-11-01T12:19:42+13:00 (24 years ago)

Author:

paynter

Message:

Resolve partial URLs like "phindcgi" and /cgi-bin/library" with respect to
the URL of the document containing the applet. Also lets us pass in extra
parameters to cgi scripts, which will let us keep the Greenstone settings
stored in the "e=...." argument to library.

File:

• trunk/gsdl/src/phind/client/Phind.java (modified) (6 diffs)

trunk/gsdl/src/phind/client/Phind.java

@@ -191 +191 @@
         stop();
     }
+    phindcgi_address = tidy_URL(phindcgi_address, true);
     System.out.println("Phind phindcgi: " + phindcgi_address);
 
@@ -200 +201 @@
         stop();
     }
+    library_address = tidy_URL(library_address, true);
     System.out.println("Phind library: " + library_address);
 
@@ -206 +208 @@
     try { 
         backdrop_address = new String(getParameter("backdrop"));
+        backdrop_address = tidy_URL(backdrop_address, false);
         URL backdrop_url = new URL(backdrop_address);
         backgroundImage = getImage(backdrop_url);
@@ -489 +492 @@
     //
     // Send a query (a word or symbol number) to the server
-    // Open a socket connection to the server, send it a query,
-    // and pass the result to a ResultBox.
+    // and pass the response to a ResultBox.
 
     void queryServer(boolean keyKnown, String word, int queryMode, ResultBox area) 
@@ -496 +498 @@
 
     // Build the query
-    String query = phindcgi_address + "?x=1&c=" + collection;
+    String query = phindcgi_address + "x=1&c=" + collection;
 
     if (keyKnown) {
@@ -644 +646 @@
     }
 
+
+
+    // Tidy up URLs
+    //
+    // Ensure a URL address (as string) has a protocol, host, and file.
+    //
+    // If the URL is a CGI script URL, it should be tidied up so that it is
+    // appropriate to tage attrib=value pairs on the end.  This means it
+    // must either end with a "?" or (if it contains a question-mark
+    // internally) end with a "&".
+    String tidy_URL(String address, boolean isCGI) {
+
+    System.out.println("tidy URL: " + address);
+    
+    // make sure the URL has protocol, host, and file
+    if (address.startsWith("http")) {
+        // the address has all the necessary components
+    } else if (address.startsWith("/")) {
+        // there is not protocol and host
+        URL document = getDocumentBase();
+        address = "http://" + document.getHost() + address;
+    } else {
+        // this URL is relative to the dirwectory the document is in
+        URL document = getDocumentBase();
+        String directory = document.getFile();
+        int end = directory.lastIndexOf('/');
+        directory = directory.substring(0,end + 1);
+        address = "http://" + document.getHost() + directory + address;
+
+    }
+
+    // if the URL is a cgi script, make sure it has a "?" 
+    if (isCGI) {
+        if (address.indexOf((int) '?') == -1) { 
+        address = address + "?";
+        } else if (!address.endsWith("?")) {
+        address = address + "&";
+        }
+    }
+
+
+    System.out.println("tidy URL returning: " + address);
+    return address;
+    }
+
 }