diff --git a/htroot/env/base.css b/htroot/env/base.css index 4615ea357..dbb2f99a8 100644 --- a/htroot/env/base.css +++ b/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; +} \ No newline at end of file diff --git a/htroot/js/yacysearch.js b/htroot/js/yacysearch.js index add25abb4..48d05c736 100644 --- a/htroot/js/yacysearch.js +++ b/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"; diff --git a/htroot/yacysearch.html b/htroot/yacysearch.html index 9d41f115c..61d8cd2ea 100644 --- a/htroot/yacysearch.html +++ b/htroot/yacysearch.html @@ -165,6 +165,7 @@ document.searchform.Enter.value = "search again - catch up more links"; :: +
#{results}# @@ -175,8 +176,8 @@ document.searchform.Enter.value = "search again - catch up more links"; AllImageSnippets(); addHover(); - +
:: #{results}# diff --git a/source/de/anomic/yacy/yacyClient.java b/source/de/anomic/yacy/yacyClient.java index 43e1ba895..1dcea1c73 100644 --- a/source/de/anomic/yacy/yacyClient.java +++ b/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); diff --git a/source/de/anomic/yacy/yacyDHTAction.java b/source/de/anomic/yacy/yacyDHTAction.java index 8fa41964b..3dcdfa74c 100644 --- a/source/de/anomic/yacy/yacyDHTAction.java +++ b/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); } diff --git a/yacy.stopwords b/yacy.stopwords index 63198693b..f92ecd6c3 100644 --- a/yacy.stopwords +++ b/yacy.stopwords @@ -239,7 +239,6 @@ former formerly forty found -free from fuehren fuehrt