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

- removed unused code from search widget

Browse Source 
- added more comments for documentation
- ALT key now submits global search
- various smaller bug fixes



git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@8029 6c8d7289-2bf4-0310-a012-ef5d649a1542
pull/1/head
apfelmaennchen 13 years ago
parent f0820a9d02
commit 1e55e50c49
2 changed files with 51 additions and 66 deletions
Show Stats Download Patch File Download Diff File

103
htroot/portalsearch/portalsearch-dev.js
Unescape View File

@ -90,15 +90,8 @@ $(document).ready(function() {
});
function yrun() {
$.extend($.ui.accordion.defaults, {
autoHeight: false,
clearStyle: true,
collapsible: true,
header: "h3"
});
maximumRecords = parseInt($("#ysearch input[name='maximumRecords']").getValue());
global = yconf.global;
$("#ypopup").dialog({
autoOpen: false,
@ -159,7 +152,7 @@ function yrun() {
p1 = $("#ypopup h3 :last").position().top;
if(p1-$("#ypopup").dialog( "option", "height" ) < 0) {
startRecord = startRecord + maximumRecords;
yacysearch(submit, false);
yacysearch(false);
}
});
@ -167,32 +160,36 @@ function yrun() {
}
});
$('#ysearch').keyup(function(e) {
$('#ysearch').keyup(function(e) { // React to keyboard input
if(e.which == 27) { // ESC
if(e.which == 27) { // Close popup on ESC
$("#ypopup").dialog('close');
$("#yquery").setValue("");
} else if(e.which == 39) { // Right
startRecord = startRecord + maximumRecords;
yacysearch(submit, false);
}
if(ycurr == $("#yquery").getValue()) {
if(e.which == 18) { // Global search on ALT
global = true;
ycurr = $("#yquery").getValue();
yacysearch(true);
}
if(ycurr == $("#yquery").getValue()) { // Do nothing if search term hasn't changed
return false;
}
if ($("#yquery").getValue() == '') {
global = yconf.global; // As this is a new search, revert to default resource
if ($("#yquery").getValue() == '') { // If search term is empty reset to default resource and close popup
if($("#ypopup").dialog('isOpen'))
$("#ypopup").dialog('close');
} else {
} else { // Else fire up a search request and remeber the current search term
ycurr = $("#yquery").getValue();
if(!submit) yacysearch(false, true);
else submit = false;
yacysearch(true);
}
return false;
});
$('#ysearch').submit(function() {
submit = true;
$('#ysearch').submit(function() { // Submit a search request
ycurr = $("#yquery").getValue();
if (!$("#ypopup").dialog('isOpen'))
@ -203,13 +200,13 @@ function yrun() {
$("#yquery").focus();
yacysearch(yconf.global, true);
yacysearch(true);
return false;
});
}
function yacysearch(global, clear) {
var url = yconf.url + '/yacysearch.json?callback=?'
function yacysearch(clear) {
var url = yconf.url + '/yacysearch.json?callback=?' // JSONP (cross domain) request URL
if(clear) {
$('#ypopup').empty();
@ -226,16 +223,19 @@ function yacysearch(global, clear) {
$("#yquery").focus();
}
var param = [];
var param = []; // Generate search request parameters from HTML form
$("#ysearch input").each(function(i){
var item = { name : $(this).attr('name'), value : $(this).attr('value') };
if(item.name == 'resource') {
if(item.value == 'global') global = true;
if(global) item.value = 'global';
if(item.name == 'resource') { // Set parameter for resource according to global
if(global)
item.value = 'global';
else {
item.value = 'local'
}
}
if(item.name == 'query' || item.name == 'search') {
item.value = $.trim(item.value);
if(item.value != ycurr)
item.value = $.trim(item.value); // remove heading and trailing white spaces from querey
if(item.value != ycurr) // in case of fast typing ycurr needs to be updated
ycurr = item.value;
}
param[i] = item;
@ -248,7 +248,7 @@ function yacysearch(global, clear) {
var err = 'Unknow Error: '+x.responseText;
if(x.status==0) {
err = 'Unknown Network Error! I try to reload...';
yacysearch(global, true);
yacysearch(true);
} else if(x.status==404) {
err = x.status + ' - Requested URL not found.';
} else if(x.status==500) {
@ -315,26 +315,9 @@ function yacysearch(global, clear) {
if(clear) {
$('#yside').empty();
var query = unescape($("#yquery").getValue());
var yglobal = "local";
var sel_date = "";
var sel_relev = "";
var sel_local = "";
var sel_global = "";
if(query.indexOf("/date") != -1)
sel_date = 'checked="checked"';
else
sel_relev = 'checked="checked"';
if(global) {
sel_global = 'checked="checked"';
yglobal = "global";
}
else
sel_local = 'checked="checked"';
var ylogo = "<a href='"+yconf.link+"' target='_blank'><img style='padding-left: 24px;' src='"+yconf.logo+"' alt='"+yconf.logo+"' title='"+yconf.logo+"' /></a>";
var ymsg= "Total "+yglobal+" results: "+total;
var ymsg= "Total "+result+" results: "+total;
$("<div class='ymsg'><table><tr><td width='55px'>"+ylogo+"</td><td id='yresult'>"+ymsg+"</td></tr></div").appendTo('#yside');
$('<hr />').appendTo("#yside");
@ -357,7 +340,7 @@ function yacysearch(global, clear) {
} else {
global = false;
}
yacysearch(global, true);
yacysearch(true);
}
});
@ -384,9 +367,6 @@ function yacysearch(global, clear) {
}
});
$('<hr />').appendTo("#yside");
$("<p class='ytxt'>You can narrow down your search by selecting one of the below navigators:</p>").appendTo('#yside');
@ -404,7 +384,7 @@ function yacysearch(global, clear) {
});
*/
$.each (
$.each ( // Loop through all available navigators and include comboboxes in sidebar
data.channels[0].navigation,
function(i,facet) {
if (facet) {
@ -444,16 +424,17 @@ function yacysearch(global, clear) {
var str = $(event.target).val();
var idx = ynavigators.indexOf($.trim(str));
if(idx!=-1) ynavigators.splice(idx, 1);
var regexp = new RegExp(' '+str.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&"));
var regexp = new RegExp(' '+str.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&")); // properly escape string for regexp
$("#yquery").setValue($.trim(query.replace(regexp,"")));
startRecord = 0;
$("#yquery").trigger('keyup');
});
autoOpenSidebar();
if ($("#ypopup").dialog('isOpen')) {
// If you got maximumRecords results, but still have display space, load more results
if($("#ypopup h3 :last").position().top < $("#ypopup").dialog( "option", "height" ) && count == maximumRecords) {
startRecord = startRecord + maximumRecords;
yacysearch(submit, false);
yacysearch(false);
}
}
}
@ -461,17 +442,21 @@ function yacysearch(global, clear) {
}
);
function autoOpenSidebar() {
window.setTimeout(function() {
if( $("#yquery").getValue() == ycurr) {
window.setTimeout(function() { // The delay prevents the sidebar to open on every intermediate search results
if( $("#yquery").getValue() == ycurr) { // Open side bar only if result matches current search term
$("#yside").dialog('open');
$("#yquery").focus();
}
} , 1000);
}
function cancelNavigators(ynavigators, appendTo) {
function cancelNavigators(ynavigators, appendTo) { // Include checkboxes to release navigators
var arLen=ynavigators.length;
var query = $("#yquery").getValue();
for ( var i=0, len=arLen; i<len; ++i ){
if(query.indexOf(ynavigators[i]) != -1) // Check wether search term still contains the navigator
$(' <input type="checkbox" checked="checked" class="ynav-cancel" name="ynav'+i+'" value="'+ynavigators[i]+'"> '+ynavigators[i]+'<br>').appendTo(appendTo);
else
ynavigators.splice(i, 1); // Remove navigator from array as it has been removed manually from search term
}
}
}

2
htroot/portalsearch/yacy-portalsearch.js
View File

File diff suppressed because one or more lines are too long
Write Preview
Loading…
Cancel
Save