fixed media search snippet flow

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

htroot/env/base.css

@@ -454,3 +454,11 @@ div.CacheAdminInfo {
 .help {
   font-size:90%;
 }
+
+.imgtable {
+  margin: 1px;
+  padding: 1px;
+  width: 100px;
+  border: 0px solid #aaaaaa;
+  float: left;
+}

htroot/js/yacysearch.js

@@ -188,7 +188,7 @@ function handleImageState(req) {
 			col1.appendChild(imganchor);
 			
 			var row1 = document.createElement("tr");
-			row1.setAttribute("class", "TableCellLight");
+			//row1.setAttribute("class", "TableCellLight");
 			row1.appendChild(col1);
 			
 			var col2 = document.createElement("td");
@@ -200,9 +200,11 @@ function handleImageState(req) {
 			row2.appendChild(col2);
 
 			var table = document.createElement("table");
+			table.setAttribute("class", "imgtable");
 			table.appendChild(row1);
 			table.appendChild(row2);
 			span.appendChild(table);
+			//span.appendChild(imganchor);
 		}
 	} else {
 		span.className = "snippetError";

htroot/yacysearch.html

@@ -165,6 +165,7 @@ document.searchform.Enter.value = "search again - catch up more links";
 	
 	<!-- linklist end -->
 	::<!-- type 2: image serch: presents image thumbnails -->
+	<table border="0"><tr><td><!-- table to prevent flow behind last snippet image -->
 	<!-- linklist begin -->
 	#{results}#
 	<!-- link begin -->
@@ -175,8 +176,8 @@ document.searchform.Enter.value = "search again - catch up more links";
 	AllImageSnippets();
 	addHover();
 	</script> 
-	
 	<!-- linklist end -->
+	</td></tr></table>
 	::<!-- type 3: image thumbnail list for one single url -->
 	<table border="0" cellspacing="16" cellpadding="0">
 	#{results}#

source/de/anomic/yacy/yacyClient.java

@@ -571,7 +571,7 @@ public final class yacyClient {
             } catch (NumberFormatException e) {
                 searchtime = totalrequesttime;
             }
-            yacyCore.log.logFine("SEARCH " + results + " URLS FROM " + targetPeer.hash + ":" + targetPeer.getName() + ", score=" + targetPeer.selectscore + ", DHTdist=" + yacyDHTAction.dhtDistance(targetPeer.hash, wordhashes) + ", duetime=" + duetime + ", searchtime=" + searchtime + ", netdelay=" + (totalrequesttime - searchtime) + ", references=" + result.get("references"));
+            yacyCore.log.logFine("SEARCH " + results + " URLS FROM " + targetPeer.hash + ":" + targetPeer.getName() + ", score=" + targetPeer.selectscore + ", DHTdist=" + yacyDHTAction.dhtDistance(targetPeer.hash, wordhashes.substring(0, 12)) + ", duetime=" + duetime + ", searchtime=" + searchtime + ", netdelay=" + (totalrequesttime - searchtime) + ", references=" + result.get("references"));
             return urls;
         } catch (Exception e) {
             yacyCore.log.logSevere("yacyClient.search error: '" + targetPeer.get(yacySeed.NAME, "anonymous") + "' failed - " + e);

source/de/anomic/yacy/yacyDHTAction.java

@@ -262,8 +262,8 @@ public class yacyDHTAction implements yacyPeerAction {
         // the result is positive if from > to
         assert (from != null);
         assert (to != null);
-        assert (from.length() == 12);
-        assert (to.length() == 12);
+        assert (from.length() == 12) : "from.length = " + from.length() + ", from = " + from;
+        assert (to.length() == 12) : "to.length = " + to.length() + ", to = " + to;
         return ((double) (kelondroBase64Order.enhancedCoder.cardinal(from.getBytes()) - kelondroBase64Order.enhancedCoder.cardinal(to.getBytes()))) / ((double) Long.MAX_VALUE);
     }
     

yacy.stopwords

@@ -239,7 +239,6 @@ former
 formerly
 forty
 found
-free
 from
 fuehren
 fuehrt