updates

[IRC.git] / Robust / src / Benchmarks / Spider / dsm / LocalQuery.java

diff --git a/Robust/src/Benchmarks/Spider/dsm/LocalQuery.java b/Robust/src/Benchmarks/Spider/dsm/LocalQuery.java
index 2315b1e537910453360faa3f4aa26ffec443b829..1beeadbe305c51c05b060dff598b6638ca349b47 100644 (file)
--- a/Robust/src/Benchmarks/Spider/dsm/LocalQuery.java
+++ b/Robust/src/Benchmarks/Spider/dsm/LocalQuery.java
@@ -40,23 +40,37 @@ public class LocalQuery {
 
        public String getHostName(String page) {
                String http = new String("http://");
-               if (page.indexOf(http) == -1) {
+               String https = new String("https://");
+               int beginindex;
+               int endindex;
+
+               if ((page.indexOf(http) == -1) && (page.indexOf(https) == -1)) {
                        return getHostName();
-               } else {
-                       int beginindex = page.indexOf(http) + http.length();
-                       int endindex = page.indexOf('/',beginindex+1);
-                       if ((beginindex == -1)) {
-                               System.printString("ERROR");
-                       }
-                       if (endindex == -1)
-                               endindex=page.length();
-                       return page.subString(beginindex, endindex);
+               } 
+               else if (page.indexOf(https) != -1) {
+                       beginindex = page.indexOf(https) + https.length();
+               }
+               else {
+                       beginindex = page.indexOf(http) + http.length();
                }
+               endindex = page.indexOf('/',beginindex+1);
+
+               if ((beginindex == -1)) {
+                       System.printString("ERROR");
+               }
+               if (endindex == -1)
+                       endindex = page.length();
+
+               return page.subString(beginindex, endindex);
        }
 
        public String getPathName(String page) {
                String http = new String("http://");
-               if (page.indexOf(http) == -1) {
+               String https = new String("https://");
+               int beginindex;
+               int nextindex;
+
+               if ((page.indexOf(http) == -1) && (page.indexOf(https) == -1)) {
                        String path = getPath();
                        int lastindex = path.lastindexOf('/');
                        if (lastindex == -1)
@@ -65,12 +79,17 @@ public class LocalQuery {
                        StringBuffer sb = new StringBuffer(path.subString(0,lastindex+1));
                        sb.append(page);
                        return sb.toString();
-               } else {
-                       int beginindex = page.indexOf(http) + http.length();
-                       int nextindex = page.indexOf('/',beginindex+1);
-                       if ((beginindex==-1) || (nextindex==-1))
-                               return new String("index.html");
-                       return page.subString(nextindex+1, page.length());
                }
+               else if (page.indexOf(https) != -1) {
+                       beginindex = page.indexOf(https) + https.length();
+               }
+               else {
+                       beginindex = page.indexOf(http) + http.length();
+               }
+               nextindex = page.indexOf('/',beginindex+1);
+
+               if ((beginindex==-1) || (nextindex==-1))
+                       return new String("index.html");
+               return page.subString(nextindex+1, page.length());
        }
 }