From 75789eb600a51e7b4a7d4e32b7af636d69098cec Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Wed, 1 Dec 2010 15:54:31 -0800
Subject: [PATCH] events page - implement basic search.

---
 ui/scripts/cloud.core.event.js    | 35 +++++++++++++++++++++++++++++--
 ui/scripts/cloud.core.instance.js |  3 +--
 2 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/ui/scripts/cloud.core.event.js b/ui/scripts/cloud.core.event.js
index a13428a78ee..ce818666d35 100644
--- a/ui/scripts/cloud.core.event.js
+++ b/ui/scripts/cloud.core.event.js
@@ -16,8 +16,39 @@
  * 
  */
 
-function eventGetSearchParams() {
-    return "";
+function eventGetSearchParams() {
+    var moreCriteria = [];	
+    
+	var advanced;       
+	if (advanced != null && advanced) {		
+	    var type = $("#advanced_search #adv_search_type").val();	
+	    var level = $("#advanced_search #adv_search_level").val();
+	    var domainId = $("#advanced_search #adv_search_domain").val();	
+	    var account = $("#advanced_search #adv_search_account").val();
+	    var startdate = $("#advanced_search #adv_search_startdate").val();	
+	    var enddate = $("#advanced_search #adv_search_enddate").val();	
+	    var moreCriteria = [];								
+		if (type!=null && trim(type).length > 0) 
+			moreCriteria.push("&type="+type);		
+	    if (level!=null && level.length > 0) 
+			moreCriteria.push("&level="+level);	
+		if (domainId!=null && domainId.length > 0) 
+			moreCriteria.push("&domainid="+domainId);					
+		if (account!=null && account.length > 0) 
+			moreCriteria.push("&account="+todb(account));					
+		if (startdate!=null && startdate.length > 0) 
+			moreCriteria.push("&startdate="+todb(startdate));		
+		if (enddate!=null && enddate.length > 0) 
+			moreCriteria.push("&enddate="+todb(enddate));	
+	} 
+	else {     			    		
+	    var searchInput = $("#basic_search").find("#search_input").val();	 
+        if (searchInput != null && searchInput.length > 0) {	           
+            moreCriteria.push("&type="+searchInput);	       
+        }        
+	}
+	
+	return moreCriteria.join("");          
 }
 
 function afterLoadEventJSP() {
diff --git a/ui/scripts/cloud.core.instance.js b/ui/scripts/cloud.core.instance.js
index 23941167fd3..e740326a7bc 100644
--- a/ui/scripts/cloud.core.instance.js
+++ b/ui/scripts/cloud.core.instance.js
@@ -39,8 +39,7 @@ function vmGetSearchParams() {
 	    if (pod!=null && pod.length > 0) 
 			moreCriteria.push("&podId="+pod);		
 		if (account!=null && account.length > 0) 
-			moreCriteria.push("&account="+account);		       
-		commandString = "command=listVirtualMachines&page="+currentPage+moreCriteria.join("")+"&response=json";
+			moreCriteria.push("&account="+account);		
 	} 
 	else {     			    		
 	    var searchInput = $("#basic_search").find("#search_input").val();