- fixed YaCy-UI sciencenet search

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@5535 6c8d7289-2bf4-0310-a012-ef5d649a1542

htroot/api/util/ynetSearch.java

@@ -3,6 +3,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
+import java.util.Iterator;
 import java.util.Scanner;
 
 import de.anomic.http.httpRequestHeader;
@@ -32,11 +33,20 @@ public class ynetSearch {
     			        // a relative path .. this addresses the local peer
     			        searchaddress = "http://" + switchboard.webIndex.seedDB.mySeed().getPublicAddress() + (searchaddress.startsWith("/") ? "" : "/") + searchaddress;
     			    }
-    				final String s = searchaddress+"&search="+post.get("search")+"&count="+post.get("count")+"&offset="+post.get("offset");    				   				
+    			    post.remove("url");
+    			    post.remove("login");
+    			    final Iterator <String> it = post.keySet().iterator();
+    			    String s = searchaddress;
+    			    String k = "";
+    			    while(it.hasNext()) {
+    			    	k = it.next();
+    			    	s = s + "&"+k+"="+post.get(k);    			    	
+    			    }
+    				// final String s = searchaddress+"&search="+post.get("search")+"&maximumRecords="+post.get("maximumRecords")+"&startRecord="+post.get("startRecord");    				   				
     				final URL url = new URL(s);     				
     				is = url.openStream(); 
-    				final String httpout = new Scanner(is).useDelimiter( "\\Z" ).next();
+    				final String httpout = new Scanner(is).useDelimiter( "\\Z" ).next();    				
-    				prop.put("http", httpout);    		    	
+    				prop.put("http", httpout);
     			} 
     			catch ( final Exception e ) { 
     				prop.put("url", "error!");

htroot/api/util/ynetSearch.json

@@ -0,0 +1 @@
+#[http]#

htroot/yacy/ui/sidebar/sidebar_1.html

@@ -72,10 +72,10 @@
 			<label for="resource">Resource/Network:</label>
 			<br />		
 			<select name="resource" class="selector">		
-				<option value="/yacysearch.rss?resource=global&verify=true" selected="selected">freeworld</option>
+				<option value="/yacysearch.json?resource=global&verify=true" selected="selected">freeworld</option>
-				<option value="/yacysearch.rss?resource=local&verify=true" >local peer</option>
+				<option value="/yacysearch.json?resource=local&verify=true" >local peer</option>
 				<option value="ymarks" >bookmarks</option>
-				<option value="/api/util/ynetSearch.xml?login=&url=http://sciencenet.fzk.de:8080/yacysearch.rss?resource=global&verify=true" >sciencenet</option>
+				<option value="/api/util/ynetSearch.json?login=&url=http://sciencenet.fzk.de:8080/yacysearch.json?resource=global&verify=true" >sciencenet</option>
 			</select>
 			<br />								
 			<label for="resource">Language:</label>	

htroot/yacy/ui/yacyui-search.html

@@ -4,10 +4,11 @@
 		$("#side1").accordion("activate", 0);
 		$("#side2").accordion("activate", 0);
 		
-		var height=document.documentElement.clientHeight - 240;
+		var height = document.documentElement.clientHeight - 240;
+		var url = $(tabid).attr('resource');		
 				    			
  		$(tabid+" .yresult").flexigrid({
-	 		url: '/yacysearch.json',
+	 		url: url,
 			dataType: 'json',
 	 		method: 'GET',
 	 		query: $(tabid).attr('search'),
@@ -79,16 +80,14 @@
 				
 				var param = [
 					 { name : 'startRecord', value : offset }
-					,{ name : 'maximumRecords', value : p.rp }
+					,{ name : 'maximumRecords', value : p.rp }		
-					,{ name : 'resource', value : $(tabid).attr('resource')}
-					,{ name : 'verify', value : "true" }
 					,{ name : 'search', value : p.query}
 					,{ name : 'urlmaskfilter', value : $(tabid).attr('urlmaskfilter')}
 					,{ name : 'prefermaskfilter', value : $(tabid).attr('prefermaskfilter')}
 					,{ name : 'contentdom', value : $(tabid).attr('contentdom')}
 					,{ name : 'constraint', value : $(tabid).attr('constraint')}
 					,{ name : 'language', value : $(tabid).attr('language')}
-				];
+				];		
 						 
 				if (p.params) {
 					for (var pi = 0; pi < p.params.length; pi++) param[param.length] = p.params[pi];

htroot/yacy/ui/yacyuisearch.html

@@ -15,12 +15,11 @@
 			$(document).ready(function() {
 				
 				var height = document.documentElement.clientHeight - 240;
-				var query = $.query.get('query');				
+				var query = $.query.get('search');				
-				$.query.REMOVE('query');
+				$.query.REMOVE('search');				
-				var url = '/yacysearch.json' + $.query.toString();
 										    			
 		 		$(".yresult").flexigrid({
-			 		url: url,
+			 		url: '/yacysearch.json',
 					dataType: 'json',
 			 		method: 'GET',
 			 		query: query,
@@ -55,7 +54,7 @@
 			 		},
 			 		preProcess: function(data) {
 				   		var total = data.channels[0].totalResults.replace(/[,.]/,"");  		
-				   		var page = (data.channels[0].startIndex / data.channels[0].itemsPerPage) + 1;				   		   	
+				   		var page = (data.channels[0].startIndex / data.channels[0].itemsPerPage) + 1;
 					   	var rows = {};
 					   	$.each (
 							data.channels[0].items,
@@ -86,11 +85,29 @@
 						if (!p.newp) p.newp = 1;				
 						if (p.page>p.pages) p.page = p.pages;
 		
-						var offset = p.newp * p.rp -p.rp; 		
+						var offset = p.newp * p.rp -p.rp;												
+						
+						var prefermaskfilter = $.query.get('prefermaskfilter');
+						if(!prefermaskfilter) prefermaskfilter = '';						
+						var constraint = $.query.get('constraint');
+						if(!constraint) constraint = '';						
+						var language = $.query.get('language');
+						if (!language) language = '';						
+						var verify = $.query.get('verify');
+						if (!verify) verify = 'true';						
+						var urlmaskfilter = $.query.get('urlmaskfilter');
+						if (!urlmaskfilter) urlmaskfilter = '.*';						
+						
 						var param = [
-							 { name : 'startRecord', value : offset }							 
+							 { name : 'startRecord', value : offset }
-							,{ name : 'maximumRecords', value : p.rp }
+							,{ name : 'maximumRecords', value : p.rp }		
 							,{ name : 'search', value : p.query}
+							,{ name : 'urlmaskfilter', value : urlmaskfilter}
+							,{ name : 'prefermaskfilter', value: prefermaskfilter}
+							,{ name : 'verify', value : verify}
+							,{ name : 'contentdom', value : 'text'}
+							,{ name : 'constraint', value : constraint}
+							,{ name : 'language', value : language}
 						];											
 										 
 						if (p.params) {