added a size field to the search results. The file size is now shown in the html search page and the yacyinteractive. The field is presen in the rss and json

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@5638 6c8d7289-2bf4-0310-a012-ef5d649a1542
This commit is contained in:
orbiter 2009-02-23 07:59:11 +00:00
parent 4693495bbe
commit 7cfab2ee9a
5 changed files with 18 additions and 1 deletions

View File

@ -54,11 +54,13 @@ function updatepage(str) {
html += "<table class=\"networkTable\" border=\"0\" cellpadding=\"2\" cellspacing=\"1\" width=\"99%\">";
html += "<tr class=\"TableHeader\" valign=\"bottom\">";
html += "<td width=\"30%\">Name</td>";
html += "<td width=\"60\">Size</td>";
//html += "<td>Description</td>";
html += "<td>Link</td></tr>";
for (var i = 0; i < firstChannel.items.length; i++) {
item = firstChannel.items[i];
html += "<tr class=\"TableCellLight\"><td>"+ item.title + "</td>";
html += "<td align=\"right\">" + item.sizename + "</td>";
//html += "<td>" + item.description + "</td>";
html += "<td><a href=\"" + item.link + "\">" + item.link + "</a></td></tr>";
}

View File

@ -17,7 +17,7 @@
#(/authorized)#
<p class="snippet"><span class="snippetLoaded" id="h#[urlhash]#">#[description]#</span></p>
<p class="url"><a href="#[link]#" id="url#[urlhash]#">#[urlname]#</a></p>
<p class="urlinfo">#[date]# | YBR-#[ybr]# | <a href="ViewFile.html?urlHash=#[urlhash]#&amp;words=#[words]#&amp;display=#[display]#">Info</a> | <a href="yacysearch.html?cat=image&amp;url=#[link]#&amp;search=#[former]#&amp;display=#[display]#">Pictures</a></p>
<p class="urlinfo">#[date]# | #[sizename]# | YBR-#[ybr]# | <a href="ViewFile.html?urlHash=#[urlhash]#&amp;words=#[words]#&amp;display=#[display]#">Info</a> | <a href="yacysearch.html?cat=image&amp;url=#[link]#&amp;search=#[former]#&amp;display=#[display]#">Pictures</a></p>
</div>
::
#{items}#

View File

@ -125,6 +125,7 @@ public class yacysearchitem {
prop.put("content_date822", plasmaSwitchboard.dateString822(result.modified()));
prop.put("content_ybr", plasmaSearchRankingProcess.ybr(result.hash()));
prop.putNum("content_size", result.filesize());
prop.putHTML("content_sizename", sizename(result.filesize()));
prop.put("content_nl", (item == 0) ? 0 : 1);
final TreeSet<String>[] query = theQuery.queryWords();
@ -205,4 +206,14 @@ public class yacysearchitem {
return s.substring(0, length - (s.length() - p) - 3) + "..." + s.substring(p);
}
private static String sizename(int size) {
if (size < 1024) return size + " bytes";
size = size / 1024;
if (size < 1024) return size + " kbyte";
size = size / 1024;
if (size < 1024) return size + " mbyte";
size = size / 1024;
return size + " gbyte";
}
}

View File

@ -4,5 +4,7 @@
"link": "#[link]#",
"description": "#[description]#",
"pubDate": "#[date822]#",
"size": "#[size]#",
"sizename": "#[sizename]#",
"guid": "#[urlhash]#"
}#(/content)#

View File

@ -3,5 +3,7 @@
<link>#[link]#</link>
<description>#[description-xml]#</description>
<pubDate>#[date822]#</pubDate>
<yacy:size>#[size]#</yacy:size>
<yacy:sizename>#[sizename]#</yacy:sizename>
<guid isPermaLink="false">#[urlhash]#</guid>
</item>#(/content)#