last commit removed

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@1301 6c8d7289-2bf4-0310-a012-ef5d649a1542

source/de/anomic/htmlFilter/htmlFilterContentScraper.java

@@ -160,7 +160,7 @@ public static String urlNormalform(URL url) {
         } else if (url.getProtocol().equals("https")) {
             if (url.getPort() < 0 || url.getPort() == 443) { defaultPort = true; }
         }
-        String path = url.getPath();
+        String path = url.getFile();
 
         // (this is different from previous normal forms where a '/' must not appear in root paths; here it must appear. Makes everything easier.)
         if (path.length() == 0 || path.charAt(0) != '/') path = "/" + path;
@@ -172,9 +172,6 @@ public static String urlNormalform(URL url) {
             matcher.reset(path);
         }
 
-        String query = url.getQuery().replaceAll("[\"\\/:*?<>|]", "_");
-        if (query != null) { path = path.concat("_").concat(query); }
-
         if (defaultPort) return url.getProtocol() + "://" + url.getHost() + path;
         return url.getProtocol() + "://" + url.getHost() + ":" + url.getPort() + path;
     }