Merge branch 'master' of git://gitorious.org/~reger/yacy/bbyacy-rc1

pull/1/head
Michael Peter Christen 13 years ago
commit b76836db7b

@ -949,7 +949,7 @@ public class yacysearch {
% theSearch.getQuery().itemsPerPage : startRecord + theSearch.getQuery().itemsPerPage, % theSearch.getQuery().itemsPerPage : startRecord + theSearch.getQuery().itemsPerPage,
true)); true));
prop.put("num-results_itemsPerPage", itemsPerPage); prop.put("num-results_itemsPerPage", itemsPerPage);
prop.put("num-results_totalcount", Formatter.number(indexcount, true)); prop.put("num-results_totalcount", indexcount);
prop.put("num-results_globalresults", global && (indexReceiveGranted || clustersearch) prop.put("num-results_globalresults", global && (indexReceiveGranted || clustersearch)
? "1" ? "1"
: "0"); : "0");

@ -359,7 +359,7 @@ public class yacysearchtrailer {
} }
final int indexcount = theSearch.getRankingResult().getLocalIndexCount() - theSearch.getRankingResult().getMissCount() - theSearch.getRankingResult().getSortOutCount() + theSearch.getRankingResult().getRemoteIndexCount(); final int indexcount = theSearch.getRankingResult().getLocalIndexCount() - theSearch.getRankingResult().getMissCount() - theSearch.getRankingResult().getSortOutCount() + theSearch.getRankingResult().getRemoteIndexCount();
prop.put("num-results_totalcount", Formatter.number(indexcount, true)); prop.put("num-results_totalcount", indexcount);
EventTracker.update(EventTracker.EClass.SEARCH, new ProfilingGraph.EventSearch(theQuery.id(true), SearchEvent.Type.FINALIZATION, "bottomline", 0, 0), false); EventTracker.update(EventTracker.EClass.SEARCH, new ProfilingGraph.EventSearch(theQuery.id(true), SearchEvent.Type.FINALIZATION, "bottomline", 0, 0), false);

Loading…
Cancel
Save