Changeset 6269

Timestamp:

2003-12-16T11:09:46+13:00 (20 years ago)

Author:

mdewsnip

Message:

Added improvements to tidy_URL to work with https, thanks to Doug Carter.

File:

• trunk/gsdl/src/java/org/nzdl/gsdl/Phind/Phind.java (modified) (1 diff)

trunk/gsdl/src/java/org/nzdl/gsdl/Phind/Phind.java

@@ -498 +498 @@
         // the address has all the necessary components
     } else if (address.startsWith("/")) {
-        // there is not protocol and host
+        // there is no protocol and host
         URL document = getDocumentBase();
+        String protocol = document.getProtocol();
+        String host = document.getHost();
         String port = "";
         if (document.getPort()!=-1) {
         port = ":" + document.getPort();
         }
-        address = "http://" + document.getHost() + port  + address;
+        address = protocol + "://" + host + port + address;
     } else {
         // this URL is relative to the directory the document is in
         URL document = getDocumentBase();
+        String protocol = document.getProtocol();
+        String host = document.getHost();
         String directory = document.getFile();
         int end = directory.lastIndexOf('/');
         String port = "";
-        if (document.getPort()!=-1) {
+        if (document.getPort() != -1) {
         port = ":" + document.getPort();
         }
-        directory = directory.substring(0,end + 1);
-        address = "http://" + document.getHost() + port + directory + address;
-
-    }
-
-    // if the URL is a cgi script, make sure it has a "?" in ti,
+        directory = directory.substring(0, end + 1);
+        address = protocol + "://" + host + port + directory + address;
+    }
+
+    // if the URL is a cgi script, make sure it has a "?" in it,
     // and that it ends with a "?" or "&"
     if (isCGI) {