Changeset 33415 for branches/meh_branches/ppstack_test/ippTools/src/warptool.c

Timestamp:

Mar 5, 2012, 5:19:48 PM (14 years ago)

Author:

mhuber

Message:

merging latest r33407 trunk changes to meh_branches/ppstack_test

Location:

branches/meh_branches/ppstack_test

Files:

• . (modified) (1 prop)
• ippTools/src (modified) (2 props)
• ippTools/src/warptool.c (modified) (8 diffs)

branches/meh_branches/ppstack_test/ippTools/src

@@ -7 +7 @@
 Makefile.in
 addtool
+mergetool
 caltool
 camtool
@@ -43 +44 @@
 minidvodbtool
 laptool
+vptool

@@ -7 +7 @@
 Makefile.in
 addtool
+mergetool
 caltool
 camtool
@@ -43 +44 @@
 minidvodbtool
 laptool
+vptool

branches/meh_branches/ppstack_test/ippTools/src/warptool.c

@@ -975 +975 @@
     psFree(where);
 
+    psArray *allOutput = psArrayAllocEmpty(0);
     // Now loop over the labels and query each individually
     for (long i = 0; i < psArrayLength(labelOutput); i++) {
@@ -983 +984 @@
 
         psString query = psStringCopy(originalQuery);
-
+        psStringAppend(&query,"\nORDER BY warp_id");
         // treat limit == 0 as "no limit"
         psString limitString = psStringCopy("");
@@ -992 +993 @@
             psStringAppend(&query, "%s", limitString);
         }
+
         psString thisWhere = NULL;
         if (whereStr) {
@@ -1023 +1025 @@
         long outputLength = psArrayLength(output);
         if (outputLength) {
-            // negative simple so the default is true
-            if (!ippdbPrintMetadatas(stdout, output, "warpPendingSkyCell", !simple)) {
-                psError(PS_ERR_UNKNOWN, false, "failed to print array");
-                psFree(output);
-                return false;
+            for (int i = 0; i< outputLength; i++) {
+                psPtr ptr = output->data[i];
+                allOutput = psArrayAdd(allOutput, outputLength - i + 10, ptr);
+                if (!allOutput) {
+                    psError(PS_ERR_UNKNOWN, false, "failed to add element to array");
+                    return false;
+                }
             }
         } else {
@@ -1044 +1048 @@
         }
     }
+    long allLabelsLength = psArrayLength(allOutput);
+    if (allLabelsLength) {
+        if (!ippdbPrintMetadatas(stdout, allOutput, "warpPendingSkyCell", !simple)) {
+            psError(PS_ERR_UNKNOWN, false, "failed to print array");
+            psFree(allOutput);
+            return false;
+        }
+    }
+    psFree(allOutput);
     psFree(labelOutput);
     psFree(whereStr);
@@ -2039 +2052 @@
         // magicked is only an argument for for -tofullskyfile
         PXOPT_LOOKUP_S64(magicked, config->args, "-set_magicked", false, false);
+        PXOPT_LOOKUP_S16(quality, config->args, "-set_quality", false, false);
         if (magicked) {
             psStringAppend(&set_magicked_skyfile, "\n , warpSkyfile.magicked = %" PRId64, magicked);
             psStringAppend(&set_magicked_run, "\n,  warpRun.magicked = %" PRId64, magicked);
         }
+        if (quality) {
+          psStringAppend(&set_magicked_skyfile, "\n , warpSkyfile.quality = %"PRId16, quality);
+        }
     } else if (!strcmp(data_state, "cleaned") || !strcmp(data_state, "purged")) {
         // if magicked is currently nonzero set it to -1
@@ -2421 +2438 @@
     PXOPT_COPY_S64(config->args, where, "-exp_id",     "rawExp.exp_id", "==");
     PXOPT_COPY_STR(config->args, where, "-exp_name",   "rawExp.exp_name", "==");
+    PXOPT_COPY_S64(config->args, where, "-chip_id",    "chipRun.chip_id", "==");
+    PXOPT_COPY_S64(config->args, where, "-cam_id",     "camRun.cam_id", "==");
     PXOPT_COPY_S64(config->args, where, "-fake_id",    "fakeRun.fake_id", "==");
     PXOPT_COPY_TIME(config->args, where, "-dateobs_begin", "rawExp.dateobs",  ">=");
@@ -2562 +2581 @@
     psFree(query);
 
-    return true;
-}
+    if (!skycell_id) {
+        // If we are updateing a whole warpRun set skycells with bad quality to 'full'
+        query = "UPDATE warpSkyfile SET data_state ='full', fault = 0 WHERE warp_id = %" PRId64 " AND quality != 0 AND (data_state != 'full')";
+        if (!p_psDBRunQueryF(config->dbh, query, warp_id)) {
+            psError(PS_ERR_UNKNOWN, false, "database error");
+            return false;
+        }
+    }
+
+    return true;
+}

@@ -7 +7 @@
 Makefile.in
 addtool
+mergetool
 caltool
 camtool
@@ -43 +44 @@
 minidvodbtool
 laptool
+vptool