Changeset 30314

Timestamp:

Jan 20, 2011, 10:24:30 AM (15 years ago)

Author:

bills

Message:

add a column pstampDataStore.need_magic that indicates whether requests from that source
are allowed to extract uncensored postage stamps.

Location:

trunk

Files:

• dbconfig/changes.txt (modified) (1 diff)
• dbconfig/pstamp.md (modified) (1 diff)
• ippTools/share/pstamptool_pendingreq.sql (modified) (1 diff)
• ippTools/share/pxadmin_create_tables.sql (modified) (1 diff)
• ippTools/src/pstamptool.c (modified) (2 diffs)
• ippTools/src/pstamptoolConfig.c (modified) (1 diff)

trunk/dbconfig/changes.txt

@@ -1996 +1996 @@
 
 ALTER TABLE rawImfile ADD column video_cells TINYINT AFTER burntool_state;
+
+ALTER TABLE pstampDataStore ADD COLUMN need_magic INT;

trunk/dbconfig/pstamp.md

@@ -8 +8 @@
     uri         STR         255
     pollInterval S32        0
+    need_magic  S32         0
 END
 

trunk/ippTools/share/pstamptool_pendingreq.sql

@@ -3 +3 @@
     pstampRequest.*,
     pstampDataStore.outProduct AS ds_outProduct,
+    IFNULL(pstampDataStore.need_magic, 1) AS need_magic,
     IFNULL(Label.priority, 10000) AS priority
 FROM pstampRequest

trunk/ippTools/share/pxadmin_create_tables.sql

@@ -1391 +1391 @@
         uri VARCHAR(255),
         pollInterval INTEGER DEFAULT 60,
+        need_magic TINYINT,
         PRIMARY KEY(ds_id),
         KEY(ds_id)

trunk/ippTools/src/pstamptool.c

@@ -134 +134 @@
     PXOPT_LOOKUP_STR(label,       config->args, "-set_label",         false, false);
     PXOPT_LOOKUP_S32(pollInterval, config->args, "-set_poll_interval",false, false);
+    PXOPT_LOOKUP_BOOL(no_magic, config->args, "-set_no_magic", false);
+
+    bool need_magic = ! no_magic;
 
     if (!pstampDataStoreInsert(config->dbh,
@@ -143 +146 @@
             outProduct,
             uri,
-            pollInterval
+            pollInterval,
+            need_magic
         )) {
         psError(PS_ERR_UNKNOWN, false, "database error");

trunk/ippTools/src/pstamptoolConfig.c

@@ -51 +51 @@
     psMetadataAddStr(adddatastoreArgs, PS_LIST_TAIL, "-set_label",        0, "define datastore label", NULL);
     psMetadataAddS32(adddatastoreArgs, PS_LIST_TAIL, "-set_poll_interval", 0, "define datastore poll interval (seconds)", 60);
+    psMetadataAddBool(adddatastoreArgs,PS_LIST_TAIL, "-set_no_magic",   0, "set magic not required", true);
 
     // -datastore