Changeset 63 for trunk

Timestamp:

04/20/08 20:55:37 (9 months ago)

Author:

scott

Message:

Fixes for tabs.

Tab escapes now come out of mysql.awk as normal tabs.

closes #55

Location:

trunk/awkbot/src

Files:

• awkbot_db_mysql.awk (modified) (1 diff)
• awkpaste.awk (modified) (1 diff)
• mysql.awk (modified) (2 diffs)

trunk/awkbot/src/awkbot_db_mysql.awk

@@ -127 +127 @@
 }
 
-function awkbot_db_paste_get (id,row    ,rv) {
-    rv = mysql_query("SELECT nick, subject, content FROM paste " \
+function awkbot_db_paste_get (id,row    ,rv,result) {
+    rv = mysql_query("SELECT paste_id, nick, subject, content FROM paste " \
             "WHERE paste_id = " mysql_quote(id))
 
-    mysql_fetch_assoc(rv, row)
+    result = mysql_fetch_assoc(rv, row)
     mysql_finish(rv)
+    return result
 }
 

trunk/awkbot/src/awkpaste.awk

@@ -13 +13 @@
 
     if (query["id"]) {
-        awkbot_db_paste_get(query["id"], paste)
+        if (awkbot_db_paste_get(query["id"], paste)) {
+            id      = query["id"]
+            nick    = paste["nick"]
+            subject = paste["subject"]
+            content = paste["content"]
+            link    = sprintf("%s?id=%d", config("paste.cgi"), id)
 
-        id      = query["id"]
-        nick    = paste["nick"]
-        subject = paste["subject"]
-        content = paste["content"]
-        link    = sprintf("%s?id=%d", config("paste.cgi"), id)
-
-        gsub(/\r\\n/, "\n", content)
-        gsub(/\\\\/,  "\\", content) # Outcoming escapes
+            gsub(/\r\\n/, "\n", content) # CRLF to LF
+# This should be dealt with in mysql.awk
+#           gsub(/\\t/,   "\t", context) # Outcoming tabs.
+            gsub(/\\\\/,  "\\", content) # Outcoming escapes
+        }
+        else {
+            print "Location: /404.html" 
+            print ORS
+            exit
+        }
     }
     else {

trunk/awkbot/src/mysql.awk

@@ -58 +58 @@
 
 function mysql_fetch_assoc (resource,row  ,input,i,fields) {
+    fields = 0
+
     if (getline input < mysql[resource]) {
-        fields = split(input, row, "\t")
+        fields = mysql_split(row, input)
+
         for (i = 1; i <= fields; i++)
             row[mysql[resource, i]] = row[i]
@@ -67 +70 @@
 }
 
+function mysql_split (row, input,   r,i) {
+     r = split(input, row, "\t")
+
+     for (i = 0; i <= r; i++) {
+         gsub(/\\t/, "\t", row[i])
+     }
+
+     return r
+}
+
 function mysql_fetch_row (resource,row  ,input,r,i) {
     if (getline input < mysql[resource]) {
-        r = split(input, row, "\t")
-
-        for (i = 0; i <= r; i++) {
-            row[i] = gensub(/\\t/, "\t", "g", row[i]) # Unescape tabs
-        }
-
-        return r
+        return mysql_split(row, input)
     }