Mercurial > hg > egg-tcls
changeset 142:4c51eeba993f
Rename table.
author | Matti Hamalainen <ccr@tnsp.org> |
---|---|
date | Tue, 04 Jun 2013 20:49:13 +0300 |
parents | c99df41a691a |
children | 96b42289f1e7 |
files | convert_feeds_db.tcl feeds.tcl hae_feedit.tcl util_convert.tcl |
diffstat | 4 files changed, 14 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/convert_feeds_db.tcl Tue Jun 04 15:52:32 2013 +0300 +++ b/convert_feeds_db.tcl Tue Jun 04 20:49:13 2013 +0300 @@ -48,7 +48,7 @@ gets $fd uline set items [split $uline "½"] if {[llength $items] == 4} { - set sql "INSERT INTO feed_data (feed,utime,url,title) VALUES ('[lescape $items 1]', [lindex $items 0], '[lescape $items 2]', '[lescape $items 3]')" + set sql "INSERT INTO feeds (feed,utime,url,title) VALUES ('[lescape $items 1]', [lindex $items 0], '[lescape $items 2]', '[lescape $items 3]')" if {[catch {dbh eval $sql} uerrmsg]} { puts "\nError ($nline): $uerrmsg on:\n$sql" exit 15
--- a/feeds.tcl Tue Jun 04 15:52:32 2013 +0300 +++ b/feeds.tcl Tue Jun 04 20:49:13 2013 +0300 @@ -114,7 +114,7 @@ set oldtime [feeds_check_start] set found 0 - set usql "SELECT feed AS ufeed, title AS utitle, url AS uurl, utime AS utime FROM feed_data WHERE utime > $oldtime ORDER BY utime ASC" + set usql "SELECT feed AS ufeed, title AS utitle, url AS uurl, utime AS utime FROM feeds WHERE utime > $oldtime ORDER BY utime ASC" feeds_dbh eval $usql { feeds_msg $utime $ufeed $uurl $utitle set found 1 @@ -141,14 +141,14 @@ # feeds_log "Manual check invoked on $uchan." set oldtime [feeds_check_start] - set nresult [feeds_dbh onecolumn "SELECT COUNT(*) FROM feed_data WHERE utime > $oldtime"] + set nresult [feeds_dbh onecolumn "SELECT COUNT(*) FROM feeds WHERE utime > $oldtime"] if {$nresult > 0} { feeds_check_end if {$nresult >= 20} { feeds_smsg $uchan "$nresult uutta, tod. näk. epäsynkissä. Ignoorataan." } else { - set usql "SELECT feed AS ufeed, title AS utitle, url AS uurl, utime AS utime FROM feed_data WHERE utime > $oldtime ORDER BY utime ASC" + set usql "SELECT feed AS ufeed, title AS utitle, url AS uurl, utime AS utime FROM feeds WHERE utime > $oldtime ORDER BY utime ASC" feeds_dbh eval $usql { feeds_msg $utime $ufeed $uurl $utitle set found 1 @@ -166,7 +166,7 @@ global feeds_dbh set ufound 0 - set usql "SELECT url AS uurl, feed AS ufeed, title AS utitle, utime AS utime FROM feed_data WHERE feed LIKE '%[string tolower [feeds_escape $utext]]%' ORDER BY utime DESC LIMIT 1" + set usql "SELECT url AS uurl, feed AS ufeed, title AS utitle, utime AS utime FROM feeds WHERE feed LIKE '%[string tolower [feeds_escape $utext]]%' ORDER BY utime DESC LIMIT 1" feeds_dbh eval $usql { feeds_smsg $uchan "Uusin '$ufeed' / [feeds_ctime $utime]: $utitle -- $uurl" set ufound 1
--- a/hae_feedit.tcl Tue Jun 04 15:52:32 2013 +0300 +++ b/hae_feedit.tcl Tue Jun 04 20:49:13 2013 +0300 @@ -42,12 +42,13 @@ proc add_entry {uname uprefix uurl utitle} { - global currclock feeds_db + global currclock feeds_db nitems set utest "$uprefix[convert_ent $uurl]" - set usql "SELECT title FROM feed_data WHERE url='[escape $utest]' AND feed='[escape $uname]'" + set usql "SELECT title FROM feeds WHERE url='[escape $utest]' AND feed='[escape $uname]'" if {![feeds_db exists $usql]} { - set usql "INSERT INTO feed_data (feed,utime,url,title) VALUES ('[escape $uname]', $currclock, '[escape $utest]', '[escape $utitle]')" + set usql "INSERT INTO feeds (feed,utime,url,title) VALUES ('[escape $uname]', $currclock, '[escape $utest]', '[escape $utitle]')" + incr nitems if {[catch {feeds_db eval $usql} uerrmsg]} { puts "\nError: $uerrmsg on:\n$usql" exit 15 @@ -90,6 +91,7 @@ ### Open database, etc +set nitems 0 set currclock [clock seconds] global feeds_db if {[catch {sqlite3 feeds_db $feeds_dbfile} uerrmsg]} { @@ -173,3 +175,5 @@ ### Close database feeds_db close + +puts "$nitems new items."
--- a/util_convert.tcl Tue Jun 04 15:52:32 2013 +0300 +++ b/util_convert.tcl Tue Jun 04 20:49:13 2013 +0300 @@ -71,9 +71,9 @@ proc drop_table_feeds { } { - drop_table "feed_data" + drop_table "feeds" } proc create_table_feeds { } { - create_table_or_fail "feed_data" "feed VARCHAR(64), utime INT, url VARCHAR(512), title VARCHAR(256)" + create_table_or_fail "feeds" "feed VARCHAR(64), utime INT, url VARCHAR(512), title VARCHAR(256)" }