From c9937973e33c0869667067fe8daea45ca22b810c Mon Sep 17 00:00:00 2001
From: reger <reger18@arcor.de>
Date: Tue, 13 Oct 2015 02:43:18 +0200
Subject: [PATCH] unescape MultiProtocolURL getAttributes() return values. use
 getAttributes() to get query parameters as clear text (w/o url encoding) use
 getSearchpartMap() to get in internal format (url encoded)

fix for http://mantis.tokeek.de/view.php?id=606
---
 htroot/Table_API_p.html                          |  4 +++-
 .../yacy/cora/document/id/MultiProtocolURL.java  | 16 ++++++++++++++--
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/htroot/Table_API_p.html b/htroot/Table_API_p.html
index 720a0f110..230d5b013 100644
--- a/htroot/Table_API_p.html
+++ b/htroot/Table_API_p.html
@@ -93,7 +93,9 @@ To see a list of all APIs, please visit the <a href="http://www.yacy-websuche.de
            f.setAttribute("enctype", "multipart/form-data");
            f.setAttribute("accept-charset", "UTF-8");
            f.setAttribute("action", "#[servlet]#");
+           f.setAttribute("target", "_parent");
            f.setAttribute("id", "#[pk]#");
+           f.setAttribute("name", "#[pk]#");
            #{attr}#
            var e = document.createElement("input");
            e.setAttribute("type", "hidden");
@@ -103,7 +105,7 @@ To see a list of all APIs, please visit the <a href="http://www.yacy-websuche.de
            #{/attr}#
            document.body.appendChild(f);
          </script>
-         <a href="#" title="clone" target="_parent" onclick="document.forms['#[pk]#'].submit(); return false;"><img src="env/grafics/doc.gif"><img src="env/grafics/right.gif"><img src="env/grafics/doc.gif"></a>
+         <a href="#" title="clone" onclick="document.forms['#[pk]#'].submit(); return false;"><img src="env/grafics/doc.gif"><img src="env/grafics/right.gif"><img src="env/grafics/doc.gif"></a>
 
           #(/isCrawlerStart)#</td>
           <td valign="top">#[comment]#</td>
diff --git a/source/net/yacy/cora/document/id/MultiProtocolURL.java b/source/net/yacy/cora/document/id/MultiProtocolURL.java
index 84298f3fd..e47b3093c 100644
--- a/source/net/yacy/cora/document/id/MultiProtocolURL.java
+++ b/source/net/yacy/cora/document/id/MultiProtocolURL.java
@@ -945,6 +945,14 @@ public class MultiProtocolURL implements Serializable, Comparable<MultiProtocolU
         return this.searchpart;
     }
 
+    /**
+     * Returns a search part parameter map  key=value
+     * in internal url encoded format
+     * for unescaped return values
+     * @see #getAttributes()
+     *
+     * @return key name  value
+     */
     public Map<String, String> getSearchpartMap() {
         if (this.searchpart == null) return null;
         this.searchpart = this.searchpart.replaceAll("&amp;", "&");
@@ -1027,6 +1035,10 @@ public class MultiProtocolURL implements Serializable, Comparable<MultiProtocolU
 
     /**
      * Evaluates url search part and returns attribute '=' value pairs
+     * the returned values are in clear text (without urlencoding).
+     * 
+     * To get the parameter map as (url-encoded key and values)
+     * @see getSearchpartMap()
      *
      * @return map key=attribue name, value=string after '='
      */
@@ -1037,9 +1049,9 @@ public class MultiProtocolURL implements Serializable, Comparable<MultiProtocolU
         for (final String element : questp) {
             int p = element.indexOf('=');
             if (p != -1) {
-                map.put(element.substring(0, p), element.substring(p + 1));
+                map.put(unescape(element.substring(0, p)), unescape(element.substring(p + 1)));
             } else {
-                if (!element.isEmpty()) map.put(element, "");
+                if (!element.isEmpty()) map.put(unescape(element), "");
             }
         }
         return map;