diff urllog.tcl @ 27:6e381916b016

Some fixes in the query mechanisms of QuoteDB and URLLog.
author Matti Hamalainen <ccr@tnsp.org>
date Mon, 05 Sep 2011 19:51:46 +0300
parents 45b76d81e256
children a59e312b1513
line wrap: on
line diff
--- a/urllog.tcl	Mon Sep 05 19:20:43 2011 +0300
+++ b/urllog.tcl	Mon Sep 05 19:51:46 2011 +0300
@@ -540,6 +540,7 @@
 	urllog_log "$unick/$uhand searched URL: $utext"
 
 	set ftokens [split $utext " "]
+	set fpatlist ""
 	foreach ftoken $ftokens {
 		set fprefix [string range $ftoken 0 0]
 		set fpattern [string range $ftoken 1 end]
@@ -555,8 +556,13 @@
 		}
 	}
 
+  if {[llength $fpatlist] > 0} {
+    set fquery "WHERE [join $fpatlist " AND "]"
+  } else {
+    set fquery ""
+  }
 	set iresults 0
-	set query "SELECT id AS urlID, utime AS utime, url AS uurl, user AS uuser, host AS uhost FROM urls WHERE [join $fpatlist " AND "] ORDER BY utime DESC LIMIT $ulimit"
+	set query "SELECT id AS urlID, utime AS utime, url AS uurl, user AS uuser, host AS uhost FROM urls $fquery ORDER BY utime DESC LIMIT $ulimit"
 	urldb eval $query {
 		incr iresults
 		set shortURL $uurl