From fd74bc388c5b0476861919c21b162bfff3076aca Mon Sep 17 00:00:00 2001
From: f1ori <f1ori@6c8d7289-2bf4-0310-a012-ef5d649a1542>
Date: Sun, 21 Nov 2010 23:55:40 +0000
Subject: [PATCH] * fix small bug in sessionid-removal * add testcase for
 seesionid-removal

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@7333 6c8d7289-2bf4-0310-a012-ef5d649a1542
---
 .../yacy/cora/document/MultiProtocolURI.java  |  2 +-
 .../cora/document/MultiProtocolURITest.java   | 35 +++++++++++++++++++
 2 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 test/net/yacy/cora/document/MultiProtocolURITest.java

diff --git a/source/net/yacy/cora/document/MultiProtocolURI.java b/source/net/yacy/cora/document/MultiProtocolURI.java
index 79cb3f75e..4d0a31a08 100644
--- a/source/net/yacy/cora/document/MultiProtocolURI.java
+++ b/source/net/yacy/cora/document/MultiProtocolURI.java
@@ -682,7 +682,7 @@ public class MultiProtocolURI implements Serializable, Comparable<MultiProtocolU
                 }
                 int p = q.toLowerCase().indexOf("&" + sid.toLowerCase() + "=");
                 if (p < 0) continue;
-                int p1 = q.indexOf('&', p);
+                int p1 = q.indexOf('&', p+1);
                 if (p1 < 0) {
                     q = q.substring(0, p);
                 } else {
diff --git a/test/net/yacy/cora/document/MultiProtocolURITest.java b/test/net/yacy/cora/document/MultiProtocolURITest.java
new file mode 100644
index 000000000..4f55c509d
--- /dev/null
+++ b/test/net/yacy/cora/document/MultiProtocolURITest.java
@@ -0,0 +1,35 @@
+package net.yacy.cora.document;
+
+import static org.junit.Assert.*;
+
+import java.net.MalformedURLException;
+import java.util.TreeSet;
+
+import net.yacy.cora.document.MultiProtocolURI;
+
+import org.junit.Test;
+
+
+public class MultiProtocolURITest {
+
+	@Test public void testSessionIdRemoval() throws MalformedURLException {
+		String[][] testURIs = new String[][] {
+			// meaning:  original uri, stripped version
+			new String[]{"http://test.de/bla.php?phpsessionid=asdf", "http://test.de/bla.php"},
+			new String[]{"http://test.de/bla?phpsessionid=asdf&fdsa=asdf", "http://test.de/bla?fdsa=asdf"},
+			new String[]{"http://test.de/bla?asdf=fdsa&phpsessionid=asdf", "http://test.de/bla?asdf=fdsa"},
+			new String[]{"http://test.de/bla?asdf=fdsa&phpsessionid=asdf&fdsa=asdf", "http://test.de/bla?asdf=fdsa&fdsa=asdf"},
+		};
+		TreeSet<String> idNames = new TreeSet<String>();
+		idNames.add("phpsessionid");
+
+		MultiProtocolURI.initSessionIDNames(idNames);
+
+		for (int i=0; i<testURIs.length; i++) {
+			MultiProtocolURI uri = new MultiProtocolURI(testURIs[i][0]);
+    
+   			assertEquals(uri.toNormalform(true, true, true), testURIs[i][1]);
+		}
+	}
+}
+