Changeset 3624 for trunk/gui/apps/rptimes

Timestamp:

Apr 3, 2013, 5:01:25 PM (11 years ago)

Author:

mmc

Message:

Fixed a problem with single quotes in text strings. The quotes need to
be escaped by doubling them before inserting into SQLite. Also fixed a
problem with empty string values for integers/reals. They need to be
represented as in SQLite.

Fixed the error message that you get when calling rptimes with no files.

File:

• trunk/gui/apps/rptimes (modified) (4 diffs)

trunk/gui/apps/rptimes

@@ -39 +39 @@
 
 if {[llength $argv] < 1} {
-    puts stderr "bad option \"$arg\""
     puts stderr "USAGE: rptimes run.xml ?run.xml...?"
     exit 1
@@ -147 +146 @@
     }
     return $rlist
+}
+
+# ----------------------------------------------------------------------
+# USAGE: escapeQuotes <string>
+#
+# Escapes single quotes in the given <string> by escaping the quote.
+# In SQLite, this is done by doubling the quote.  This makes it
+# possible to embed the string in another quoted string like
+# 'hello ''world'''.  Returns a string with escaped quotes.
+# ----------------------------------------------------------------------
+proc escapeQuotes {str} {
+    regsub -all {([^\'])\'} $str {\1''} str
+    return $str
 }
 
@@ -215 +227 @@
                     set id [format "x%03d" [incr num]]
 
-                    db eval "INSERT INTO parameters values('$id','$rp','$def','$type')"
+                    db eval "INSERT INTO parameters values('$id','$rp','[escapeQuotes $def]','$type')"
                     db eval "ALTER TABLE jobs ADD COLUMN $id $type;"
                 }
@@ -232 +244 @@
                 lappend cols $id
                 if {$type eq "TEXT"} {
-                    lappend vals '$val'
+                    lappend vals '[escapeQuotes $val]'
+                } elseif {$val ne ""} {
+                    lappend vals $val
                 } else {
-                    lappend vals $val
+                    lappend vals ''
                 }
             }