Index: trunk/ippTools/src/addtool.c
===================================================================
--- trunk/ippTools/src/addtool.c	(revision 31596)
+++ trunk/ippTools/src/addtool.c	(revision 31680)
@@ -161,4 +161,5 @@
     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,4 +169,25 @@
     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,4 +262,5 @@
 
     if (destreaked) {
+      //This picks the magicked/censored ones
       if (strcmp(stage,"cam") == 0) {
         psStringAppend(&query, " AND (camRun.magicked > 0)");
@@ -247,4 +270,13 @@
       }
       // 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)");
+      }
+
     }