Changeset 44

Timestamp:

07/24/07 16:22:56 (18 months ago)

Author:

scott

Message:

Merged live copy of awkbot into repository

• Moved awkpaste.awk into lib/ where it belongs

Location:

trunk/awkbot

Files:

• bin/awkpp.awk (modified) (1 diff)
• etc/awkbot.conf (modified) (2 diffs)
• lib/awkbot.awk (modified) (3 diffs)
• lib/awkbot_db_mysql.awk (modified) (1 diff)
• lib/awkpaste.awk (moved) (moved from trunk/awkbot/awkpaste.awk) (1 diff)
• lib/cgi-lib.awk (modified) (2 diffs)

trunk/awkbot/bin/awkpp.awk

@@ -10 +10 @@
 #include <ord.awk>
 #include <assert.awk>
-#include <config.awk>
+# #include <config.awk>
 #include <getopt.awk>
 #define STRAPPED 1

trunk/awkbot/etc/awkbot.conf

@@ -2 +2 @@
 # IRC Stuff
 <irc>
-    nickname awkbot
-    altnick awkbot_
+    nickname awkbot-test
+    altnick awkbot_test
     username awkbot
     realname AWK IRC bot
@@ -14 +14 @@
 #    channel blacksun
     debug 1
-    startup PRIVMSG NickServ :identify darwin
+#    startup PRIVMSG NickServ :identify darwin
 </irc>
 

trunk/awkbot/lib/awkbot.awk

@@ -82 +82 @@
     else                  target = nick
 
-    # Unfortunately, the API doesn't tell me how many arguments are
-    # available...but I need the number of arguments to join.  I might want to
-    # fix this some day.
-    argc = 0
-    for (key in arg) argc++ 
-
-    if (substr(arg[1], 0, length(irc["nickname"])) == irc["nickname"]) {
+    # A special case...
+    if (substr(arg[1], 0, length(irc["nickname"])) == irc["nickname"] &&
+            arg[1] !~ irc["nickname"] "\\+\\+") {
         direct  = 1
         shift(arg)
-        c_msg   = join(arg, 0, argc, OFS)
+
+        # Unfortunately, the API doesn't tell me how many arguments are
+        # available...but I need the number of arguments to join.  I might want
+        # to fix # this some day.
+        argc = 0
+        for (key in arg) argc++ 
+
+        c_msg   = join(arg, 1, argc + 1, OFS)
     }
     else {
@@ -114 +117 @@
         }
         # It's only numbers and stuff
-        else if (c_msg ~ /^[0-9*+\/() -]*$/) {
+        else if (c_msg ~ /^[0-9^.*+\/() -]*$/) {
             action = "bc -q"
-            print c_msg |& action
+            print "scale=10" |& action
+            print c_msg      |& action
+            print "quit"     |& action
             action |& getline a
             close(action)
-            irc_privmsg(target, address a)
+            irc_privmsg(target, address (a + 0)) 
+                # Coerce the result into an array
         }
         else {
@@ -131 +137 @@
     if (match(arg[1], /^(.*)--$/, t)) awkbot_db_karma_dec(t[1])
 
-    if (arg[1] == "awkdoc")
-        irc_privmsg(target, address awkdoc(arg[2]))
+    if (arg[1] == "awkdoc") {
+        if (arg[2]) {
+            irc_privmsg(target, address awkdoc(arg[2]))
+        }
+        else {
+            irc_privmsg(target, address "Usage is awkdoc < identifier >")
+        }
+    }
+    else if (arg[1] == "awkinfo") {
+        if (arg[2]) {
+            a = awkbot_db_info(arg[2])
+
+            if (a) {
+                irc_privmsg(target, address a)
+            }
+            else {
+                irc_privmsg(target, address "I don't know anything about " \
+                        arg[2])
+            }
+        }
+        else {
+            irc_privmsg(target, address "Usage is awkinfo < keyword >")
+        }
+    }
 }
 

trunk/awkbot/lib/awkbot_db_mysql.awk

@@ -74 +74 @@
 function awkbot_db_forget (question) {
     mysql_finish(mysql_query("DELETE FROM qna WHERE question = " \
-        mysql_quote(question)))
+                mysql_quote(question)))
     return 1
 }
+
+function awkbot_db_info (keyword    ,result,rv,row) {
+    rv = mysql_query("select keyword, text from info where keyword like " \
+            mysql_quote(keyword "%"))
+
+    if (mysql_fetch_assoc(rv, row)) { 
+        result = row["keyword"] row["text"]
+    }
+    else {
+        result = 0
+    }
+
+    mysql_finish(rv)
+
+    return result
+}

trunk/awkbot/lib/awkpaste.awk

@@ -1 +1 @@
 #!/usr/bin/awk -f
 
+#include <cgi-lib.awk>
+
 BEGIN {
-    params(Query)
-    for (key in Query) {
-        print key, ":", Query[key]
+    cgi_params(query)
+    cgi_headers("text/plain")
+
+    for (key in query) {
+        print key, ":", query[key]
     }
 }

trunk/awkbot/lib/cgi-lib.awk

@@ -1 @@
-#!/usr/bin/awk -f
-
 BEGIN {
     if (ENVIRON["REQUEST_METHOD"] == "POST") 
@@ -6 +4 @@
     if (ENVIRON["REQUEST_METHOD"] == "GET")
         _cgilib_in = ENVIRON["QUERY_STRING"]
+
+# Set this globally so we don't have to ensure it happens anywhere else...
+    ORS = "\r\n"
 }
 
-function params (Query    ,Each,Pairs,i) {
-    split(_cgilib_in, Pairs, /\&/)
+function cgi_params (query    ,each,pairs,i) {
+    split(_cgilib_in, pairs, /\&/)
     i = 0    
-    while (Pairs[++i]) {
-        split(Pairs[i], Each, /=/)
-        Query[Each[1]] = Each[2]
+    while (pairs[++i]) {
+        split(pairs[i], each, /=/)
+        query[each[1]] = each[2]
     }
 }
+
+function cgi_headers (content_type, headers) {
+    print "Content-Type:", content_type
+    
+    for (key in headers) {
+        print key ":", headers[key]
+    }
+
+    printf ORS
+}