boxtec
/
yacy_search_server
mirror of https://github.com/yacy/yacy_search_server
4
1
Fork 0
Code Issues Projects Releases Wiki Activity

fixed DetailedSearch

Browse Source 
git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@2514 6c8d7289-2bf4-0310-a012-ef5d649a1542
pull/1/head
orbiter 19 years ago
parent 9340dbb501
commit e33eb528ba
2 changed files with 28 additions and 27 deletions
Show Stats Download Patch File Download Diff File

2
htroot/DetailedSearch.html
Unescape View File

@ -163,6 +163,7 @@ function checkers(name, n) {
</table> </table>
</form> </form>
#(type)#
<p> <p>
#(excluded)# #(excluded)#
:: ::
@ -193,6 +194,7 @@ function checkers(name, n) {
</p> </p>
<!-- link end --> <!-- link end -->
#{/results}# #{/results}#
#(/type)#
<!-- linklist end --> <!-- linklist end -->
<p> <p>

53
htroot/DetailedSearch.java
Unescape View File

@ -143,7 +143,7 @@ public class DetailedSearch {
// remember the last search expression // remember the last search expression
env.setConfig("last-search", querystring); env.setConfig("last-search", querystring);
// process result of search // process result of search
prop.put("resultbottomline", 0); prop.put("type_resultbottomline", 0);
if (filtered.size() > 0){ if (filtered.size() > 0){
prop.put("excluded", 1); prop.put("excluded", 1);
prop.put("excluded_stopwords", filtered.toString()); prop.put("excluded_stopwords", filtered.toString());
@ -154,33 +154,32 @@ public class DetailedSearch {
if (prop == null || prop.size() == 0) { if (prop == null || prop.size() == 0) {
prop.put("num-results", 0); prop.put("num-results", 0);
} else { } else {
final int linkcount = Integer.parseInt(prop.get("linkcount", "0")); final int linkcount = Integer.parseInt(prop.get("type_linkcount", "0"));
final int orderedcount = Integer.parseInt(prop.get("orderedcount", "0")); final int orderedcount = Integer.parseInt(prop.get("type_orderedcount", "0"));
final int totalcount = Integer.parseInt(prop.get("totalcount", "0")); final int totalcount = Integer.parseInt(prop.get("type_totalcount", "0"));
final Object[] references = (Object[]) prop.get("type_references", new String[0]);
final Object[] references = (Object[]) prop.get("references", new String[0]); prop.put("type_num-results", 1);
prop.put("num-results", 1); prop.put("type_num-results_linkcount", linkcount);
prop.put("num-results_linkcount", linkcount); prop.put("type_num-results_orderedcount", orderedcount);
prop.put("num-results_orderedcount", orderedcount); prop.put("type_num-results_totalcount", totalcount);
prop.put("num-results_totalcount", totalcount); int hintcount = references.length;
int hintcount = references.length; if (hintcount > 0) {
if (hintcount > 0) { if (hintcount > 16) { hintcount = 16; }
if (hintcount > 16) { hintcount = 16; } prop.put("type_combine", 1);
prop.put("combine", 1); String word;
String word; for (int i = 0; i < hintcount; i++) {
for (int i = 0; i < hintcount; i++) { word = (String) references[i];
word = (String) references[i]; if (word != null) {
if (word != null) { prop.put("type_combine_words_" + i + "_word", word);
prop.put("combine_words_" + i + "_word", word); prop.put("type_combine_words_" + i + "_newsearch", post.get("search", "").replace(' ', '+') + "+" + word);
prop.put("combine_words_" + i + "_newsearch", post.get("search", "").replace(' ', '+') + "+" + word); prop.put("type_combine_words_" + i + "_count", count);
prop.put("combine_words_" + i + "_count", count); prop.put("type_combine_words_" + i + "_ranking", localRanking.toExternalURLGet("local").toString());
prop.put("combine_words_" + i + "_ranking", localRanking.toExternalURLGet("local").toString()); prop.put("type_combine_words_" + i + "_resource", ((global) ? "global" : "local"));
prop.put("combine_words_" + i + "_resource", ((global) ? "global" : "local")); prop.put("type_combine_words_" + i + "_time", (searchtime / 1000));
prop.put("combine_words_" + i + "_time", (searchtime / 1000));
}
prop.put("combine_words", i);
} }
prop.put("type_combine_words", i);
} }
}
} }
if (urlmask.equals(".*")) { if (urlmask.equals(".*")) {
@ -190,7 +189,7 @@ public class DetailedSearch {
} }
prop.put("urlmaskoptions_urlmaskfilter", urlmask); prop.put("urlmaskoptions_urlmaskfilter", urlmask);
prop.put("type", "0");
prop.put("localCount", count); prop.put("localCount", count);
prop.put("localWDist", wdist); prop.put("localWDist", wdist);
prop.put("globalChecked", (global) ? "checked" : ""); prop.put("globalChecked", (global) ? "checked" : "");

Write Preview
Loading…
Cancel
Save