Changeset 31680

Timestamp:

Jun 22, 2011, 1:59:04 PM (15 years ago)

Author:

heather

Message:

addtool now requires either -destreaked or -uncensored. It won't work
otherwise. The ippTasks need to be updated for this.

Location:

trunk/ippTools/src

Files:

• addtool.c (modified) (4 diffs)
• addtoolConfig.c (modified) (1 diff)

trunk/ippTools/src/addtool.c

@@ -161 +161 @@
     PXOPT_LOOKUP_BOOL(minidvodb,  config->args, "-set_minidvodb", false);
     PXOPT_LOOKUP_BOOL(destreaked, config->args, "-destreaked", false);
+    PXOPT_LOOKUP_BOOL(uncensored, config->args, "-uncensored", false);
     PXOPT_LOOKUP_BOOL(pretend,    config->args, "-pretend", false);
     PXOPT_LOOKUP_BOOL(simple,     config->args, "-simple", false);
@@ -168 +169 @@
     psString dvodb_string = NULL;
     psString bare_query = NULL;
+
+    if (!(destreaked && uncensored) && (destreaked || uncensored)) {
+      //if one of destreaked and uncensored is true, but not both
+      if (destreaked) {
+      psTrace("addtool.c", PS_LOG_INFO, "using -destreaked\n");
+      } else {
+      psTrace("addtool.c", PS_LOG_INFO, "using -unscensored\n");
+      }
+    } else {
+      if (destreaked && uncensored) {
+        psError(PS_ERR_UNKNOWN, false, "Both -destreaked and -uncensored are selected. Please use one or the other, not both, \n");
+        return false;
+      }
+      if (!destreaked && !uncensored) {
+        psError(PS_ERR_UNKNOWN, false, "Neither -destreaked or -uncensored are selected. Please use one.\n");
+         return false;
+      }
+    }
+
+    
+
 
     if (strcmp(stage,"cam") == 0 ) {
@@ -240 +262 @@
 
     if (destreaked) {
+      //This picks the magicked/censored ones
       if (strcmp(stage,"cam") == 0) {
         psStringAppend(&query, " AND (camRun.magicked > 0)");
@@ -247 +270 @@
       }
       // staticSky has no magicked column.
+    } else {
+      //This picks only the unmagicked/uncensored ones
+      if (strcmp(stage,"cam") == 0) {
+        psStringAppend(&query, " AND (camRun.magicked = 0)");
+      }
+      if (strcmp(stage,"stack") == 0) {
+        psStringAppend(&query, " AND (stackRun.magicked = 0)");
+      }
+
     }
 

trunk/ippTools/src/addtoolConfig.c

@@ -58 +58 @@
     psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-filter", PS_META_DUPLICATE_OK, "search by filter", NULL);
     psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-reduction",          0, "search by camRun reduction class", NULL);
-    psMetadataAddBool(definebyqueryArgs, PS_LIST_TAIL, "-destreaked",           0, "only queue destreaked runs", false);
-
+    psMetadataAddBool(definebyqueryArgs, PS_LIST_TAIL, "-destreaked",           0, "queue destreaked runs", false);
+    psMetadataAddBool(definebyqueryArgs, PS_LIST_TAIL, "-uncensored",           0, "queue uncensored runs", false);
     psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-set_workdir",        0, "define workdir", NULL);
     psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-set_label",          0, "define label", NULL);