Fix new queries to find config doc (OCECDR-4441)

Author: bkline

tasks/file_sweeper_task.py

@@ -968,28 +968,31 @@ def loadConfigFile(fileName):
           JOIN doc_type t
             ON t.id = v.doc_type
          WHERE t.name = 'SweepSpecifications'
-           AND v.val_status = 'V'""")
+           AND v.val_status = 'V'
+      GROUP BY v.id""")
     rows = cursor.fetchall()
     if len(rows) > 1:
         fatalError("More than on SweepSpecifications document found")
     elif len(rows) == 1:
-        cursor.execute("""\
-            SELECT xml
-              FROM doc_version
-             WHERE id = ?
-               AND num = ?""", tuple(row))
-        xml = cursor.fetchone()[0]
+        doc_id, version = rows[0]
+        query = cdrdb.Query("doc_version", "xml")
+        query.where(query.Condition("id", doc_id))
+        query.where(query.Condition("num", version))
+        row = query.execute(cursor).fetchone()
         try:
-            dom = xml.dom.minidom.parseString(xml.encode("utf-8"))
+            dom = xml.dom.minidom.parseString(row[0].encode("utf-8"))
+            args = doc_id, version
+            log("loaded config from CDR{:d} version {:d}".format(*args))
         except Exception as e:
             msg = "Failure parsing config document CDR{:d} version {:d}: {}"
-            args = row[0], row[1], e
+            args = doc_id, version, e
             fatalError(msg.format(*args))
 
     # Otherwise, parse file from disk (temporary fallback)
     else:
         try:
             dom = xml.dom.minidom.parse(fileName)
+            log("loaded config from {}".format(fileName))
         except Exception, info:
             fatalError("Error loading config file %s: %s" % (fileName, info))