Changeset 38478 for trunk/ippTools/src

Timestamp:

Jun 16, 2015, 4:37:38 PM (11 years ago)

Author:

heather

Message:

addtool multi pending

Location:

trunk/ippTools/src

Files:

• addtool.c (modified) (5 diffs)
• addtoolConfig.c (modified) (2 diffs)

trunk/ippTools/src/addtool.c

@@ -992 +992 @@
     PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);
     PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
+    PXOPT_LOOKUP_BOOL(multi, config->args, "-multiadd", false);
     
     psString query = NULL;
@@ -1041 +1042 @@
     if (strcmp(stage, "diff") == 0) {
       //this group by is needed to join against all the warps (to get camera)
+      if (multi) {
+        psStringAppend(&query, " GROUP BY %s", "diff_id");
+      } else {
       psStringAppend(&query, " GROUP BY %s", "diff_id, stage_extra1");
+      }
     }
     if (strcmp(stage, "fullforce") == 0) {
       //this group by is needed to join against all the warps (to get camera)
-      psStringAppend(&query, " GROUP BY %s", "ff_id, stage_extra1");
-    }
-
+      if (multi) {
+        psStringAppend(&query, "GROUP BY %s", "ff_id");
+      } else {
+        psStringAppend(&query, " GROUP BY %s", "ff_id, stage_extra1");
+      }
+    }
+
+    //    if (multi) {
+    //  psStringAppend(&query, " , %s", "stage_id");
+    //}
 
 
@@ -1061 +1073 @@
         return false;
     }
+    printf ("%s\n", query);
     psTrace("addtool.c", PS_LOG_INFO, "used this query:\n %s\n",query); 
     psFree(query);
@@ -1101 +1114 @@
     PXOPT_LOOKUP_S16(fault,         config->args, "-fault", false, false);
     PXOPT_LOOKUP_S64(stage_extra1, config->args, "-stage_extra1", false, false);
-
+    PXOPT_LOOKUP_BOOL(multi, config->args, "-multi", false);
     // generate restrictions
     psMetadata *where = psMetadataAlloc();
@@ -1119 +1132 @@
     }
     psFree(where);
+
+    if (multi) {
+      psStringAppend(&query, "group by  %s", "stage_extra1");
+    }
 
     if (!p_psDBRunQuery(config->dbh, query)) {

trunk/ippTools/src/addtoolConfig.c

@@ -121 +121 @@
     psMetadataAddU64(pendingexpArgs, PS_LIST_TAIL, "-limit",             0, "limit result set to N items", 0);
     psMetadataAddBool(pendingexpArgs, PS_LIST_TAIL, "-simple",           0, "use the simple output format", false);
+    psMetadataAddBool(pendingexpArgs, PS_LIST_TAIL, "-multiadd",           0, "for addstar multi mode, group by stage_id ", false);
 
     // -addprocessedexp
@@ -130 +131 @@
     psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-dtime_addstar", 0, "define elapsed time for DVO insertion (seconds)", NAN);
     psMetadataAddS16(addprocessedexpArgs, PS_LIST_TAIL, "-fault",  0,            "set fault code", 0);
-psMetadataAddS64(addprocessedexpArgs, PS_LIST_TAIL, "-stage_extra1",  0,            "set stage_extra1", 0);
-
+    psMetadataAddS64(addprocessedexpArgs, PS_LIST_TAIL, "-stage_extra1",  0,            "set stage_extra1", 0);
+    psMetadataAddBool(pendingexpArgs, PS_LIST_TAIL, "-multi",           0, "for addstar multi mode, group by stage_id ", false);
 
     // -processedexp