Marown/yacy_search_server
1
0
Fork 0
mirror of https://github.com/yacy/yacy_search_server.git synced 2024-09-19 00:01:41 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

- hopefully a fix for the 'koblenz'-bug

Browse Source 
- http://forum.yacy-websuche.de/viewtopic.php?f=6&t=2209#p16005

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@6110 6c8d7289-2bf4-0310-a012-ef5d649a1542
This commit is contained in:
apfelmaennchen 2009-06-21 20:24:39 +00:00
parent 91785d895c
commit f091ad3e23
1 changed files with 32 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
htroot/yacy/ui/js/yacyui-portalsearch.js
View File

@ -1,3 +1,11 @@
function status() {
if(load_status < 6) {
return;
} else {
window.clearInterval(loading);
yrun();
}
}
$(document).ready(function() {
$.ajaxSetup({
timeout: 5000,
@ -78,16 +86,6 @@ $(document).ready(function() {
yrun();
}
});
function status() {
if(load_status < 6) {
return;
} else {
window.clearInterval(loading);
yrun();
}
}
function yrun() {
$.extend($.ui.accordion.defaults, {
@ -177,6 +175,9 @@ function yrun() {
});
$('#ysearch').keyup(function(e) {
if(ycurr == $("#yquery").getValue()) {
return false;
}
if(e.which == 27) { // ESC
$("#ypopup").dialog('close');
} else if(e.which == 34) { // PageDown
@ -190,6 +191,7 @@ function yrun() {
if ($("#yquery").getValue() == '') {
$("#ypopup").dialog('close');
} else {
ycurr = $("#yquery").getValue();
if(!submit) yacysearch(false);
else submit = false;
}
@ -198,6 +200,7 @@ function yrun() {
$('#ysearch').submit(function() {
submit = true;
ycurr = $("#yquery").getValue();
yacysearch(yconf.global);
return false;
});
@ -205,6 +208,7 @@ function yrun() {
function yacysearch(global) {
var url = yconf.url + '/yacysearch.json?callback=?'
$('#ypopup').empty();
$('#ypopup').append("<div class='yloading'><h3 class='linktitle'><em>Loading: "+yconf.url+"</em><br/><img src='"+yconf.url+"/yacy/ui/img/loading2.gif' align='absmiddle'/></h3></div>");
if (!$("#ypopup").dialog('isOpen'))
@ -219,14 +223,21 @@ function yacysearch(global) {
if(item.value == 'global') global = true;
if(global) item.value = 'global';
}
if(item.name == 'query' || item.name == 'search') {
if(item.value != ycurr)
ycurr = item.value;
}
param[i] = item;
});
param[param.length] = { name : 'startRecord', value : startRecord };
$.getJSON(url, param,
function(json, status){
ycurr = $("#yquery").getValue();
function(json, status) {
if (json[0]) data = json[0];
else data = json;
if(ycurr != data.channels[0].searchTerms)
return false;
if(data.channels[0].searchTerms != ycurr)
return false;
$('#ypopup').empty();
var total = data.channels[0].totalResults.replace(/[,.]/,"");
var page = (data.channels[0].startIndex / data.channels[0].itemsPerPage) + 1;
@ -303,3 +314,4 @@ function yacysearch(global) {
} , 3000);
}
}