Improvements of query history:

a) User shall be able to delete query from the history
b) Link "Back to Autotest" on query history page
c) Display history starting with the most recent queries

Signed-off-by: Vladimir Samarskiy <vsamarsk@google.com>



git-svn-id: svn://test.kernel.org/autotest/trunk@1650 592f7852-d20e-0410-864c-8624ca9c26a4

1 files changed, 27 insertions, 10 deletions

diff --git a/tko/save_query.cgi b/tko/save_query.cgi
index c3485da6..80c91fc2 100644
--- a/tko/save_query.cgi
+++ b/tko/save_query.cgi
@@ -36,18 +36,35 @@ def log_query():
 		raise QueryHistoryError("Could not save query")
 
 
+def delete_query(time_stamp):
+	## query is marked for delete by time stamp
+	db_obj = db.db()
+	data_to_delete = {'time_created':time_stamp}
+	try:
+		db_obj.delete('query_history', data_to_delete)
+	except Exception:
+		raise QueryHistoryError("Could not delete query")
+	
+
 def body():
-	log_query()
-	print '<b>%s</b><br><br>' % "Your query has been saved"
-	print 'time: %s<br>' % tm
-	print 'comments: %s<br><br>' % comment
-	print '<table><tr align="center">'
-	print '<td align="center">'
+	if not 'delete' in dict_url.keys():
+		log_query()
+		print '<b>%s</b><br><br>' % "Your query has been saved"
+		print 'time: %s<br>' % tm
+		print 'comments: %s<br><br>' % comment
+	else:
+		## key 'delete' has arg value of time_stamp
+		## which identifies the query to be deleted
+		time_stamp = dict_url['delete']
+		delete_query(time_stamp)
+		print '<b>%s</b><br><br>' % "Your query has been deleted"
+
 	print '<a href="query_history.cgi">View saved queries</a>&nbsp;&nbsp;'
-	print '</td>'
-	print '<td align="center">'
-	print '<a href="%s">Back to Autotest</a><br>' % HTTP_REFERER
-	print '</td>'
+	print '<br><br>'
+	if not 'delete' in dict_url.keys():
+		print '<a href="%s">Back to Autotest</a><br>' % HTTP_REFERER
+	else:
+		print '<a href="compose_query.cgi">Autotest Results</a><br>'
 
 
 def main():