Changeset 15153

Timestamp:

Oct 1, 2007, 11:42:12 AM (19 years ago)

Author:

jhoblitt

Message:

change pztool -pendingimfile to "zip" together the imfiles from different cameras instead of merely appending the result sets from different cameras together

File:

• trunk/ippTools/src/pztool.c (modified) (8 diffs)

trunk/ippTools/src/pztool.c

@@ -38 +38 @@
 static bool copydoneCompleteExp(pxConfig *config);
 static psArray *pzGetKnownCameras(pxConfig *config);
-static psArray *pzArrayAddArray(psArray *array, psArray *input);
+static psArray *pzArrayZip(psArray *arraySet);
 
 # define MODECASE(caseName, func) \
@@ -227 +227 @@
 
     // array to hold the aggregate results
-    psArray *output = psArrayAlloc(0);
+    psArray *cameraImfiles = psArrayAlloc(0);
 
     for (long i = 0; i < psArrayLength(cameras); i++) {
@@ -233 +233 @@
         if (!query) {
             psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
-            psFree(output);
+            psFree(cameraImfiles);
             return false;
         }
@@ -273 +273 @@
             psError(PS_ERR_UNKNOWN, false, "database error");
             psFree(query);
-            psFree(output);
+            psFree(cameraImfiles);
             return false;
         }
@@ -281 +281 @@
         if (!result) {
             psError(PS_ERR_UNKNOWN, false, "database error");
-            psFree(output);
+            psFree(cameraImfiles);
             return false;
         }
@@ -287 +287 @@
             psTrace("pztool", PS_LOG_INFO, "no rows found");
             psFree(result);
-            psFree(output);
+            psFree(cameraImfiles);
             return true;
         }
 
-        // merge this query into the result set
-        pzArrayAddArray(output, result);
+        // add this query into the array of result set
+        psArrayAdd(cameraImfiles, 0, result);
         psFree(result);
     }
+
+    // stitch the arrays of imfiles together
+    psArray *output = pzArrayZip(cameraImfiles);
+    psFree(cameraImfiles);
 
     bool simple = false;
@@ -620 +624 @@
 }
 
+static psArray *pzArrayZip(psArray *arraySet)
+{
+    long setSize = 0;
+
+    // figure out the size of the combined arrays
+    for (long i = 0; i < psArrayLength(arraySet); i++) {
+        setSize += psArrayLength(arraySet->data[i]);
+    }
+
+    psArray *output = psArrayAllocEmpty(setSize);
+    // loop over each array in the set forever
+    long index = 0; // the depth into each array
+    long counter; // counter - the total number of elements zipped so far
+    long i; // i - which array in the set 
+    for (counter = 0, i = 0;
+            (counter < setSize) && (i < psArrayLength(arraySet));
+            counter++, ++i, i = i % psArrayLength(arraySet)) {
+
+        psArray *array = arraySet->data[i];
+        // make sure that this array has not run out of elements
+        if (index > (psArrayLength(arraySet) - 1)) {
+            continue;
+        }
+
+        psArrayAdd(output, 0, array->data[index]);
+    }
+
+    return output;
+}
+
+#if 0
 static psArray *pzArrayAddArray(psArray *array, psArray *input)
 {
@@ -628 +663 @@
     return array;
 }
+#endif