# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1370342716 -10800
# Node ID b0648e05c855234458ed19fb6e4af960cdcbeca3
# Parent  3305e142eeccb0938557fc6879d2c2b8f6815076
Change some variable names, etc.

diff -r 3305e142eecc -r b0648e05c855 hae_feedit.tcl
--- a/hae_feedit.tcl	Tue Jun 04 13:35:46 2013 +0300
+++ b/hae_feedit.tcl	Tue Jun 04 13:45:16 2013 +0300
@@ -14,7 +14,7 @@
 source [file dirname [info script]]/util_convert.tcl
 
 # SQLite3 database, MUST be set to same as in feeds.tcl
-set feeds_db "/home/niinuska/bot/feeds.sqlite"
+set feeds_dbfile "/home/niinuska/bot/feeds.sqlite"
 
 # Use a HTTP proxy? 1 = yes, 0 = no
 set http_proxy 0
@@ -42,13 +42,13 @@
 
 
 proc add_entry {uname uprefix uurl utitle} {
-  global currclock dbh
+  global currclock feeds_db
   set utest "$uprefix[convert_ent $uurl]"
 
   set usql "SELECT title FROM feed_data WHERE url='[escape $utest]' AND feed='[escape $uname]'"
-  if {![dbh exists $usql]} {
+  if {![feeds_db exists $usql]} {
     set usql "INSERT INTO feed_data (feed,utime,url,title) VALUES ('[escape $uname]', $currclock, '[escape $utest]', '[escape $utitle]')"
-    if {[catch {dbh eval $usql} uerrmsg]} {
+    if {[catch {feeds_db eval $usql} uerrmsg]} {
       puts "\nError: $uerrmsg on:\n$usql"
       exit 15
     }
@@ -91,9 +91,9 @@
 
 ### Open database, etc
 set currclock [clock seconds]
-global dbh
-if {[catch {sqlite3 dbh $feeds_db} uerrmsg]} {
-  puts "Could not open SQLite3 database '$feeds_db': $uerrmsg."
+global feeds_db
+if {[catch {sqlite3 feeds_db $feeds_dbfile} uerrmsg]} {
+  puts "Could not open SQLite3 database '$feeds_dbfile': $uerrmsg."
   exit 2
 }
 
@@ -172,4 +172,4 @@
 
 
 ### Close database
-dbh close
+feeds_db close