Merge branch 'master' of https://github.com/yacy/yacy_search_server

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>

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;

source/net/yacy/search/schema/CollectionConfiguration.java

@@ -917,15 +917,23 @@ public class CollectionConfiguration extends SchemaConfiguration implements Seri
         if (document.getContentDomain() == ContentDomain.IMAGE) {
             // add image pixel size if known
             Iterator<ImageEntry> imgit = document.getImages().values().iterator();
-            if (imgit.hasNext()) {
+            List<Integer> heights = new ArrayList<>();
+            List<Integer> widths = new ArrayList<>();
+            List<Integer> pixels = new ArrayList<>();
+            while (imgit.hasNext()) {
                 ImageEntry img = imgit.next();
                 int imgpixels = (img.height() < 0 || img.width() < 0) ? -1 : img.height() * img.width();
-                if (imgpixels > 0) {
-                    if (allAttr || contains(CollectionSchema.images_height_val)) add(doc, CollectionSchema.images_height_val, img.height());
-                    if (allAttr || contains(CollectionSchema.images_width_val)) add(doc, CollectionSchema.images_width_val, img.width());
-                    if (allAttr || contains(CollectionSchema.images_pixel_val)) add(doc, CollectionSchema.images_pixel_val, imgpixels);
+                if (imgpixels > 0 && (allAttr || (contains(CollectionSchema.images_height_val) && contains(CollectionSchema.images_width_val) && contains(CollectionSchema.images_pixel_val)))) {
+                    heights.add(img.height());
+                    widths.add(img.width());
+                    pixels.add(imgpixels);
                 }
             }
+            if (heights.size() > 0) {
+                add(doc, CollectionSchema.images_height_val, heights);
+                add(doc, CollectionSchema.images_width_val, widths);
+                add(doc, CollectionSchema.images_pixel_val, pixels);
+            }
 
             if (allAttr || contains(CollectionSchema.images_text_t))  {
                 add(doc, CollectionSchema.images_text_t, content); // the content may contain the exif data from the image parser