Skip to content

Commit

Permalink
more bugfixes for URL class, see:
Browse files Browse the repository at this point in the history 
http://www.yacy-forum.de/viewtopic.php?p=24844#24844

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@2431 6c8d7289-2bf4-0310-a012-ef5d649a1542
  • Loading branch information
orbiter committed Aug 21, 2006
1 parent 38c4248 commit 4c6e00d
Showing 1 changed file with 48 additions and 52 deletions.
100 changes: 48 additions & 52 deletions source/de/anomic/net/URL.java
View file
Expand Up @@ -84,7 +84,7 @@ public void parseURLString(String url) throws MalformedURLException {
if (q < 0) {
throw new MalformedURLException("wrong email address: " + url);
} else {
userInfo = url.substring(p + 3, q);
userInfo = url.substring(p + 1, q);
host = url.substring(q + 1);
path = null;
port = -1;
Expand Down Expand Up @@ -116,17 +116,22 @@ public URL(URL baseURL, String relPath) throws MalformedURLException {
this.path = baseURL.path;
} else if (relPath.startsWith("/")) {
this.path = relPath;
} else if (!(baseURL.path.endsWith("/"))) {
} else if (baseURL.path.endsWith("/")) {
if (relPath.startsWith("#") || relPath.startsWith("?")) {
this.path = baseURL.path + relPath;
throw new MalformedURLException("relative path malformed: " + relPath);
} else {
this.path = relPath;
this.path = baseURL.path + relPath;
}
} else {
if (relPath.startsWith("#") || relPath.startsWith("?")) {
this.path = baseURL.path + relPath;
} else {
this.path = baseURL.path + "/" + relPath;
int q = baseURL.path.lastIndexOf('/');
if (q < 0) {
this.path = relPath;
} else {
this.path = baseURL.path.substring(0, q + 1) + relPath;
}
}
}
this.quest = baseURL.quest;
Expand Down Expand Up @@ -158,6 +163,7 @@ private void resolveBackpath() throws MalformedURLException {
path = head.substring(0, q) + path.substring(p + 3);
}
}

private void identPort(String inputURL) throws MalformedURLException {
// identify ref in file
int r = host.indexOf(':');
Expand Down Expand Up @@ -292,53 +298,43 @@ public int compareTo(Object h) {
}

public static void main(String[] args) {
URL u, v;
try {

u = new URL("http://www.anomic.de/home/test?x=1#home");
System.out.println("toString=" + u.toString() + "\ntoNormalform=" + u.toNormalform() + "\n");

u = new URL("http://www.anomic.de/home/test?x=1");
System.out.println("toString=" + u.toString() + "\ntoNormalform=" + u.toNormalform() + "\n");

u = new URL("http://www.anomic.de/home/test#home");
System.out.println("toString=" + u.toString() + "\ntoNormalform=" + u.toNormalform() + "\n");

u = new URL("ftp://ftp.anomic.de/home/test#home");
System.out.println("toString=" + u.toString() + "\ntoNormalform=" + u.toNormalform() + "\n");

u = new URL("http://www.anomic.de/home/../abc/");
System.out.println("toString=" + u.toString() + "\ntoNormalform=" + u.toNormalform() + "\n");

u = new URL("mailto:abcdefg@nomailnomail.com");
System.out.println("toString=" + u.toString() + "\ntoNormalform=" + u.toNormalform() + "\n");

v = new URL("http://www.anomic.de/home");
u = new URL(v, "test");
System.out.println("toString u=" + u.toString() + "\ntoNormalform=" + u.toNormalform() + "\n");
u = new URL(v, "test/");
System.out.println("toString u=" + u.toString() + "\ntoNormalform=" + u.toNormalform() + "\n");

v = new URL("http://www.anomic.de/home/");
u = new URL(v, "test");
System.out.println("toString u=" + u.toString() + "\ntoNormalform=" + u.toNormalform() + "\n");
u = new URL(v, "test/");
System.out.println("toString u=" + u.toString() + "\ntoNormalform=" + u.toNormalform() + "\n");

u = new URL(v, "http://www.yacy.net/test");
System.out.println("toString u=" + u.toString() + "\ntoNormalform=" + u.toNormalform() + "\n");

u = new URL(v, "ftp://ftp.yacy.net/test");
System.out.println("toString u=" + u.toString() + "\ntoNormalform=" + u.toNormalform() + "\n");

u = new URL(v, "../test");
System.out.println("toString u=" + u.toString() + "\ntoNormalform=" + u.toNormalform() + "\n");

u = new URL(v, "mailto:abcdefg@nomailnomail.com");
System.out.println("toString u=" + u.toString() + "\ntoNormalform=" + u.toNormalform() + "\n");

} catch (MalformedURLException e) {
e.printStackTrace();
String[][] test = new String[][]{
new String[]{null, "http://www.anomic.de/home/test?x=1#home"},
new String[]{null, "http://www.anomic.de/home/test?x=1"},
new String[]{null, "http://www.anomic.de/home/test#home"},
new String[]{null, "ftp://ftp.anomic.de/home/test#home"},
new String[]{null, "http://www.anomic.de/home/../abc/"},
new String[]{null, "mailto:abcdefg@nomailnomail.com"},
new String[]{"http://www.anomic.de/home", "test"},
new String[]{"http://www.anomic.de/home", "test/"},
new String[]{"http://www.anomic.de/home/", "test"},
new String[]{"http://www.anomic.de/home/", "test/"},
new String[]{"http://www.anomic.de/home/index.html", "test.htm"},
new String[]{"http://www.anomic.de/home/index.html", "http://www.yacy.net/test"},
new String[]{"http://www.anomic.de/home/index.html", "ftp://ftp.yacy.net/test"},
new String[]{"http://www.anomic.de/home/index.html", "../test"},
new String[]{"http://www.anomic.de/home/index.html", "mailto:abcdefg@nomailnomail.com"}
};
String environment, url;
de.anomic.net.URL aURL = null;
java.net.URL jURL = null;
for (int i = 0; i < test.length; i++) {
environment = test[i][0];
url = test[i][1];
try {
if (environment == null) {
aURL = new de.anomic.net.URL(url);
jURL = new java.net.URL(url);
} else {
aURL = new de.anomic.net.URL(new de.anomic.net.URL(environment), url);
jURL = new java.net.URL(new java.net.URL(environment), url);
}
} catch (MalformedURLException e) {
e.printStackTrace();
}
if (!(aURL.toString().equals(jURL.toString()))) {
System.out.println("Difference for environment=" + environment + ", url=" + url + ":\njURL=" + jURL.toString() + "\naURL=" + aURL.toString() + "\n");
}
}
}
}

0 comments on commit 4c6e00d

Please sign in to comment.