Mercurial > hg > egg-tcls

changeset 18:1e2232135354

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
More changes for SQLite support.
author Matti Hamalainen <ccr@tnsp.org>
date Mon, 05 Sep 2011 16:32:04 +0300
parents b9c27bad2d9a
children 9cf22053e5da
files urllog.tcl
diffstat 1 files changed, 5 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/urllog.tcl	Mon Sep 05 16:21:09 2011 +0300
+++ b/urllog.tcl	Mon Sep 05 16:32:04 2011 +0300
@@ -123,7 +123,7 @@
 ##########################################################################
 #-------------------------------------------------------------------------
 set urllog_name "URLLog"
-set urllog_version "1.99.13"
+set urllog_version "2.00.0"
 
 set urllog_tlds [split $urllog_tlds ","]
 set urllog_httprep [split "\@|%40|{|%7B|}|%7D|\[|%5B|\]|%5D" "|"] 
@@ -282,7 +282,7 @@
 
  	### Let's check if we already know the URL
  	set tmpURL [urllog_escape $urlStr]
-	urldb eval {SELECT id AS uid, utime AS utime, url AS uurl, user AS uuser, host AS uhost FROM urls WHERE url='$tmpURL'} {
+	urldb eval "SELECT id AS urlID, utime AS utime, url AS uurl, user AS uuser, host AS uhost FROM urls WHERE url='$tmpURL'" {
 		urllog_log "URL said by $urlNick ($urlStr) already known"
 		if {$urllog_shorturl != 0} {
 			set qstr "[urllog_get_short $urlID] "
@@ -299,12 +299,14 @@
 		return 0
 	}
 
+
 	### OK, the URL was not already known - thus we add it
 	set sql "INSERT INTO urls (utime,url,user,host) VALUES ([unixtime], '[urllog_escape $urlStr]', '[urllog_escape $urlNick]', '[urllog_escape $urlHost]')"
 	if {[catch {urldb eval $sql} uerrmsg]} {
 		urllog_log "$uerrmsg on SQL:\n$sql"
 		return 0
 	}
+	set urlID [urldb last_insert_rowid]
 	urllog_log "Added URL ($urlNick@$urlChan): $urlStr"
 
 
@@ -544,12 +546,7 @@
 	}
 	
 	### Get the matches from database
-
-	if {$upublic == 0} {
-		set iresults [urllog_urlfind $ipatlist $urllog_showmax_priv]
-	} else {
-		set iresults [urllog_urlfind $ipatlist $urllog_showmax_pub]
-	}
+	set iresults ""
 
 	### Show the results
 	if {$iresults != ""} {