Mercurial > hg > egg-tcls
comparison hae_feedit.tcl @ 140:b0648e05c855
Change some variable names, etc.
author | Matti Hamalainen <ccr@tnsp.org> |
---|---|
date | Tue, 04 Jun 2013 13:45:16 +0300 |
parents | 3305e142eecc |
children | 4c51eeba993f |
comparison
equal
deleted
inserted
replaced
139:3305e142eecc | 140:b0648e05c855 |
---|---|
12 ########################################################################## | 12 ########################################################################## |
13 package require sqlite3 | 13 package require sqlite3 |
14 source [file dirname [info script]]/util_convert.tcl | 14 source [file dirname [info script]]/util_convert.tcl |
15 | 15 |
16 # SQLite3 database, MUST be set to same as in feeds.tcl | 16 # SQLite3 database, MUST be set to same as in feeds.tcl |
17 set feeds_db "/home/niinuska/bot/feeds.sqlite" | 17 set feeds_dbfile "/home/niinuska/bot/feeds.sqlite" |
18 | 18 |
19 # Use a HTTP proxy? 1 = yes, 0 = no | 19 # Use a HTTP proxy? 1 = yes, 0 = no |
20 set http_proxy 0 | 20 set http_proxy 0 |
21 | 21 |
22 # HTTP proxy address and port | 22 # HTTP proxy address and port |
40 return [string map $html_ent $udata] | 40 return [string map $html_ent $udata] |
41 } | 41 } |
42 | 42 |
43 | 43 |
44 proc add_entry {uname uprefix uurl utitle} { | 44 proc add_entry {uname uprefix uurl utitle} { |
45 global currclock dbh | 45 global currclock feeds_db |
46 set utest "$uprefix[convert_ent $uurl]" | 46 set utest "$uprefix[convert_ent $uurl]" |
47 | 47 |
48 set usql "SELECT title FROM feed_data WHERE url='[escape $utest]' AND feed='[escape $uname]'" | 48 set usql "SELECT title FROM feed_data WHERE url='[escape $utest]' AND feed='[escape $uname]'" |
49 if {![dbh exists $usql]} { | 49 if {![feeds_db exists $usql]} { |
50 set usql "INSERT INTO feed_data (feed,utime,url,title) VALUES ('[escape $uname]', $currclock, '[escape $utest]', '[escape $utitle]')" | 50 set usql "INSERT INTO feed_data (feed,utime,url,title) VALUES ('[escape $uname]', $currclock, '[escape $utest]', '[escape $utitle]')" |
51 if {[catch {dbh eval $usql} uerrmsg]} { | 51 if {[catch {feeds_db eval $usql} uerrmsg]} { |
52 puts "\nError: $uerrmsg on:\n$usql" | 52 puts "\nError: $uerrmsg on:\n$usql" |
53 exit 15 | 53 exit 15 |
54 } | 54 } |
55 } | 55 } |
56 } | 56 } |
89 } | 89 } |
90 | 90 |
91 | 91 |
92 ### Open database, etc | 92 ### Open database, etc |
93 set currclock [clock seconds] | 93 set currclock [clock seconds] |
94 global dbh | 94 global feeds_db |
95 if {[catch {sqlite3 dbh $feeds_db} uerrmsg]} { | 95 if {[catch {sqlite3 feeds_db $feeds_dbfile} uerrmsg]} { |
96 puts "Could not open SQLite3 database '$feeds_db': $uerrmsg." | 96 puts "Could not open SQLite3 database '$feeds_dbfile': $uerrmsg." |
97 exit 2 | 97 exit 2 |
98 } | 98 } |
99 | 99 |
100 | 100 |
101 ############################################################################## | 101 ############################################################################## |
170 #add_rss_feed "http://lehti.samizdat.info/feed/" "Lehti" "" | 170 #add_rss_feed "http://lehti.samizdat.info/feed/" "Lehti" "" |
171 | 171 |
172 | 172 |
173 | 173 |
174 ### Close database | 174 ### Close database |
175 dbh close | 175 feeds_db close |