YaCy-UI: basic support for searching bookmark tags...

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

htroot/yacy/ui/index.html

@@ -60,32 +60,36 @@
 			.bind('select.ui-tabs', function(e, ui) {
 				/* set global variable tabid */
 				tabid = '#' + ui.panel.id;				
+				if (tabid == "#Bookmarks") {
+					$("select[@name='resource']").setValue('ymarks');
+					$("input[@name='search']").setValue(qtag);									
+				} else {				
+					/* set query string */				
+					var search = $(tabid).attr('search');
+					var contentdom = $(tabid).attr('contentdom');
+					var count = $(tabid).attr('count');
+					var offset = $(tabid).attr('offset');
+					var resource = $(tabid).attr('resource');
+					var constraint= $(tabid).attr('constraint');
+					var prefermaskfilter = $(tabid).attr('prefermaskfilter');
+					var urlmaskfilter = $(tabid).attr('urlmaskfilter');
 
-				/* set query string */				
-				var search = $(tabid).attr('search');
-				var contentdom = $(tabid).attr('contentdom');
-				var count = $(tabid).attr('count');
-				var offset = $(tabid).attr('offset');
-				var resource = $(tabid).attr('resource');
-				var constraint= $(tabid).attr('constraint');
-				var prefermaskfilter = $(tabid).attr('prefermaskfilter');
-				var urlmaskfilter = $(tabid).attr('urlmaskfilter');
-
-				query = $(tabid).attr('resource')
-					+"&search="+search
-					+"&contentdom="+contentdom
-					+"&count="+count
-					+"&offset="+offset
-					+"&constraint="+constraint
-					+"&prefermaskfilter="+prefermaskfilter
-					+"&urlmaskfilter="+urlmaskfilter;
-				$("input[@name='search']").setValue(search);
-				$("select[@name='itemsPerPage']").setValue(count);
-				$("select[@name='contentdom']").setValue(contentdom);
-				$("select[@name='constraint']").setValue(constraint);
-				$("input[@name='prefermaskfilter']").setValue(prefermaskfilter);
-				$("input[@name='urlmaskfilter']").setValue(urlmaskfilter);
-				$('#yoptions').trigger('update');
+					query = $(tabid).attr('resource')
+						+"&search="+search
+						+"&contentdom="+contentdom
+						+"&count="+count
+						+"&offset="+offset
+						+"&constraint="+constraint
+						+"&prefermaskfilter="+prefermaskfilter
+						+"&urlmaskfilter="+urlmaskfilter;
+					$("input[@name='search']").setValue(search);
+					$("select[@name='itemsPerPage']").setValue(count);
+					$("select[@name='contentdom']").setValue(contentdom);
+					$("select[@name='constraint']").setValue(constraint);
+					$("input[@name='prefermaskfilter']").setValue(prefermaskfilter);
+					$("input[@name='urlmaskfilter']").setValue(urlmaskfilter);
+					$('#yoptions').trigger('update');
+				}
 		});
 			 
 		/* Load Sidebar */
@@ -95,10 +99,19 @@
 		
 		/* Load Search Result into new Tab */
 		$('#searchbox').submit(function() {			
-			var tabnr = $('#container > ul').tabs('length');			
-			var tabname = $("input[@name='search']").getValue();			
-			$tabs.tabs('add', "ysearch.html", '*' + tabname);
-			$tabs.tabs('select',tabnr);
+			if ($("select[@name='resource']").getValue() == "ymarks") {								
+				qtag = $("input[@name='search']").getValue();
+				if (tabid == "#Bookmarks") {
+					$tabs.tabs("load", 2);
+				} else {
+					$tabs.tabs('select',2);
+				}						
+			} else {			
+				var tabnr = $('#container > ul').tabs('length');			
+				var tabname = $("input[@name='search']").getValue();			
+				$tabs.tabs('add', "ysearch.html", '*' + tabname);
+				$tabs.tabs('select',tabnr);
+			}
 			return false;
 		});
 		

htroot/yacy/ui/sidebar/sidebar.html

@@ -20,7 +20,13 @@
 						.appendTo('#tagcloud')
 						.bind('click', function() {
 							qtag = $(this).text();
-							$('#container ul').tabs("load", 2);							
+							$("select[@name='resource']").setValue('ymarks');
+							$("input[@name='search']").setValue(qtag);
+							if (tabid == "#Bookmarks") {
+								$('#container ul').tabs("load", 2);
+							} else {
+								$('#container ul').tabs('select',2);
+							}							
 						});																										
 				}); //close each(
 			}

htroot/yacy/ui/welcome.html

@@ -10,6 +10,8 @@
 apfelmaennchen
 <h3>Change Log</h3>
 	<ul>
+		<li>18-05-2008: YaCy-UI has basic support for searching Bookmark tags !!</li>
+		<li>17-05-2008: YaCy-Widget: e.g. /yacy/ui/ywidget.html?search=yacy&count=50&offset=0</li>
 		<li>14-05-2008: YaCy-UI now support searching Sciencenet !!</li>
 		<li>12-05-2008: added tagcloud for bookmarks</li>
 		<li>12-05-2008: bookmarks support date and public fields as they have been added to XBEL output.</li>