Changeset 29322

Timestamp:

Oct 5, 2010, 11:44:47 AM (16 years ago)

Author:

bills

Message:

from trunk fix bugs in pubtool (the change to pubtool_pending.sql only affects tags no text changes)

Location:

tags/ipp-20100823/ippTools

Files:

• share/pubtool_pending.sql (modified) (1 prop)
• share/pxadmin_create_tables.sql (modified) (1 diff, 1 prop)
• src/pubtool.c (modified) (1 diff, 1 prop)

tags/ipp-20100823/ippTools/share/pxadmin_create_tables.sql

@@ -1837 +1837 @@
     registered TIMESTAMP DEFAULT CURRENT_TIMESTAMP, -- time run was registered
     note VARCHAR(255),             -- note
+    magicked BIGINT NOT NULL DEFAULT 0, -- magic mask applied
     PRIMARY KEY(diff_phot_id),
     KEY(diff_id),

tags/ipp-20100823/ippTools/src/pubtool.c

@@ -340 +340 @@
     }
 
-    if (!p_psDBRunQueryF(config->dbh, query, whereClause, whereClause)) {
+    if (!p_psDBRunQueryF(config->dbh, query, whereClause, whereClause, whereClause)) {
         psError(PS_ERR_UNKNOWN, false, "Database error");
         psFree(whereClause);