# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1370368153 -10800
# Node ID 4c51eeba993f36ccb8cb7638fb99f2946500a7d8
# Parent  c99df41a691a72bf4b832d1f34be2eae8dc07aa2
Rename table.

diff -r c99df41a691a -r 4c51eeba993f convert_feeds_db.tcl
--- 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
diff -r c99df41a691a -r 4c51eeba993f feeds.tcl
--- 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
diff -r c99df41a691a -r 4c51eeba993f hae_feedit.tcl
--- 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."
diff -r c99df41a691a -r 4c51eeba993f util_convert.tcl
--- 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)"
 }