sitescripts: Unmerged changes

sitescripts/crawler/web/crawler.py

 import MySQLdb, os, re, simplejson, sys
 from sitescripts.utils import cached, get_config
 from sitescripts.web import url_handler, basic_auth
 
 @cached(600)
 def _get_db():
   database = get_config().get("crawler", "database")
   dbuser = get_config().get("crawler", "dbuser")
   dbpasswd = get_config().get("crawler", "dbpassword")
   if os.name == "nt":
@@ skipping 65 matching lines @@
   return cursor.lastrowid
 
 def _insert_data(run_id, site, url, filtered):
   site_id = _find_site_id(site)
   if site_id is None:
     print >>sys.stderr, "Unable to find site '%s' in the database" % site
     return
 
   cursor = _get_cursor()
   cursor.execute("""
-INSERT INTO crawler_data (run, site, url, filtered)
+INSERT INTO crawler_requests (run, site, url, filtered)
 VALUES (%s, %s, %s, %s)""",
                  (run_id, site_id, url, filtered))
 
-@url_handler("/crawlerData")
+@url_handler("/crawlerRequests")
 @basic_auth("crawler")
-def crawler_data(environ, start_response):
+def crawler_requests(environ, start_response):
   def line_callback(line):
     try:
-      url, site, filtered = simplejson.loads(line)
+      data = simplejson.loads(line)
+      if len(data) < 3:
+        print >>sys.stderr, "Not enough elements in line '%s'" % line
+        return
+      url = data[0]
+      site = data[1]
+      filtered = data[2]
       _insert_data(run_id, site, url, filtered)
     except simplejson.JSONDecodeError:
       print >>sys.stderr, "Unable to parse JSON from '%s'" % line
 
   run_id = _create_run()
   try:
     _read_multipart_lines(environ, line_callback)
     start_response("200 OK", [("Content-Type", "text/plain")])
     return ""
   except ValueError as e:
     start_response("401 Bad Request", [("Content-Type", "text/plain")])
+    print >>sys.stderr, "Unable to read multipart data: %s" % e
     return e