Mercurial > hg > egg-tcls

changeset 262:416642f28d1e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename util_convert.tcl to utillib.tcl
author Matti Hamalainen <ccr@tnsp.org>
date Fri, 23 Jan 2015 10:02:11 +0200
parents e82ae84408ca
children f01d60175c44
files create_feeds_db.tcl create_quotedb.tcl create_urllog_db.tcl util_convert.tcl utillib.tcl
diffstat 5 files changed, 82 insertions(+), 82 deletions(-) [+]
line wrap: on
line diff
--- a/create_feeds_db.tcl	Fri Jan 23 09:47:35 2015 +0200
+++ b/create_feeds_db.tcl	Fri Jan 23 10:02:11 2015 +0200
@@ -5,7 +5,7 @@
 # (C) Copyright 2013 Tecnic Software productions (TNSP)
 #
 package require sqlite3
-source [file dirname [info script]]/util_convert.tcl
+source [file dirname [info script]]/utillib.tcl
 
 ### Check commandline arguments
 if {$argc < 1} {
--- a/create_quotedb.tcl	Fri Jan 23 09:47:35 2015 +0200
+++ b/create_quotedb.tcl	Fri Jan 23 10:02:11 2015 +0200
@@ -5,7 +5,7 @@
 # (C) Copyright 2011 Tecnic Software productions (TNSP)
 #
 package require sqlite3
-source [file dirname [info script]]/util_convert.tcl
+source [file dirname [info script]]/utillib.tcl
 
 set db_list {quotedb}
 
--- a/create_urllog_db.tcl	Fri Jan 23 09:47:35 2015 +0200
+++ b/create_urllog_db.tcl	Fri Jan 23 10:02:11 2015 +0200
@@ -5,7 +5,7 @@
 # (C) Copyright 2011 Tecnic Software productions (TNSP)
 #
 package require sqlite3
-source [file dirname [info script]]/util_convert.tcl
+source [file dirname [info script]]/utillib.tcl
 
 ### Check commandline arguments
 if {$argc < 1} {
--- a/util_convert.tcl	Fri Jan 23 09:47:35 2015 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,79 +0,0 @@
-### Helper functions
-proc escape { str } {
-  return [string map {' ''} $str]
-}
-
-proc lescape { lst pos } {
-  return [escape [lindex $lst $pos]]
-}
-
-
-proc confirm_yesno { uprompt } {
-  puts -nonewline "$uprompt \[y/N\]? "
-  flush stdout
-  set response [gets stdin]
-  if {[string tolower $response] == "y"} {
-    return 1
-  } else {
-    return 0
-  }
-}
-
-proc open_db { dbfile } {
-  global dbh
-  if {[catch {sqlite3 dbh $dbfile} uerrmsg]} {
-    puts "Could not open SQLite3 database '$dbfile': $uerrmsg."
-    exit 2
-  }
-}
-
-proc drop_table { utable } {
-  global dbh
-  puts "Dropping current table '$utable'."
-  if {[catch {dbh eval "DROP TABLE $utable"} uerrmsg]} {
-    puts "Dropping table resulted in error (ignored): $uerrmsg."
-  }
-}
-
-proc create_table { utable usql } {
-  global dbh
-  puts "Creating new table '$utable'."
-  if {[catch {dbh eval "CREATE TABLE $utable ($usql)"} uerrmsg]} {
-    puts "Error creating table: $uerrmsg."
-    return 0
-  }
-  return 1
-}
-
-proc create_table_or_fail { utable usql } {
-  if {![create_table $utable $usql]} {
-    exit 3
-  }
-}
-
-proc create_table_urls { } {
-  create_table_or_fail "urls" "id INTEGER PRIMARY KEY AUTOINCREMENT, utime INT, url VARCHAR(2048), user VARCHAR(32), host VARCHAR(256), chan VARCHAR(32), title VARCHAR(256)"
-}
-
-proc create_table_quotes_votes { utable ufail } {
-  
-  set sql1 "id INTEGER PRIMARY KEY AUTOINCREMENT, utime INT, utext VARCHAR(2048), user VARCHAR(32), host VARCHAR(256), chan VARCHAR(32)"
-  set sql2 "id INTEGER PRIMARY KEY AUTOINCREMENT, user VARCHAR(32), urlid INTEGER, vote INTEGER"
-
-  if {$ufail} {
-    create_table_or_fail "$utable" "$sql1"
-    create_table_or_fail "${utable}_votes" "$sql2"
-  } else {
-    create_table "$utable" "$sql1"
-    create_table "${utable}_votes" "$sql2"
-  }
-}
-
-
-proc drop_table_feeds { } {
-  drop_table "feeds"
-}
-
-proc create_table_feeds { } {
-  create_table_or_fail "feeds" "feed VARCHAR(64), utime INT, url VARCHAR(512), title VARCHAR(256)"
-}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/utillib.tcl	Fri Jan 23 10:02:11 2015 +0200
@@ -0,0 +1,79 @@
+### Helper functions
+proc escape { str } {
+  return [string map {' ''} $str]
+}
+
+proc lescape { lst pos } {
+  return [escape [lindex $lst $pos]]
+}
+
+
+proc confirm_yesno { uprompt } {
+  puts -nonewline "$uprompt \[y/N\]? "
+  flush stdout
+  set response [gets stdin]
+  if {[string tolower $response] == "y"} {
+    return 1
+  } else {
+    return 0
+  }
+}
+
+proc open_db { dbfile } {
+  global dbh
+  if {[catch {sqlite3 dbh $dbfile} uerrmsg]} {
+    puts "Could not open SQLite3 database '$dbfile': $uerrmsg."
+    exit 2
+  }
+}
+
+proc drop_table { utable } {
+  global dbh
+  puts "Dropping current table '$utable'."
+  if {[catch {dbh eval "DROP TABLE $utable"} uerrmsg]} {
+    puts "Dropping table resulted in error (ignored): $uerrmsg."
+  }
+}
+
+proc create_table { utable usql } {
+  global dbh
+  puts "Creating new table '$utable'."
+  if {[catch {dbh eval "CREATE TABLE $utable ($usql)"} uerrmsg]} {
+    puts "Error creating table: $uerrmsg."
+    return 0
+  }
+  return 1
+}
+
+proc create_table_or_fail { utable usql } {
+  if {![create_table $utable $usql]} {
+    exit 3
+  }
+}
+
+proc create_table_urls { } {
+  create_table_or_fail "urls" "id INTEGER PRIMARY KEY AUTOINCREMENT, utime INT, url VARCHAR(2048), user VARCHAR(32), host VARCHAR(256), chan VARCHAR(32), title VARCHAR(256)"
+}
+
+proc create_table_quotes_votes { utable ufail } {
+  
+  set sql1 "id INTEGER PRIMARY KEY AUTOINCREMENT, utime INT, utext VARCHAR(2048), user VARCHAR(32), host VARCHAR(256), chan VARCHAR(32)"
+  set sql2 "id INTEGER PRIMARY KEY AUTOINCREMENT, user VARCHAR(32), urlid INTEGER, vote INTEGER"
+
+  if {$ufail} {
+    create_table_or_fail "$utable" "$sql1"
+    create_table_or_fail "${utable}_votes" "$sql2"
+  } else {
+    create_table "$utable" "$sql1"
+    create_table "${utable}_votes" "$sql2"
+  }
+}
+
+
+proc drop_table_feeds { } {
+  drop_table "feeds"
+}
+
+proc create_table_feeds { } {
+  create_table_or_fail "feeds" "feed VARCHAR(64), utime INT, url VARCHAR(512), title VARCHAR(256)"
+}