Changeset 24244 for branches/cnb_branches/cnb_branch_20090301/ippTools/src/pztool.c

Timestamp:

May 26, 2009, 1:59:32 PM (17 years ago)

Author:

beaumont

Message:

merged with trunk

Location:

branches/cnb_branches/cnb_branch_20090301

Files:

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

branches/cnb_branches/cnb_branch_20090301/ippTools/src

@@ -33 +33 @@
 pstamptool
 disttool
+receivetool

@@ -33 +33 @@
 pstamptool
 disttool
+receivetool

branches/cnb_branches/cnb_branch_20090301/ippTools/src/pztool.c

@@ -338 +338 @@
         // a lot simplier than a complicated scheme (tried that) to attempt to
         // request on the right number of rows for each camera
-        
+
         // treat limit == 0 as "no limit"
         if (limit) {
@@ -403 +403 @@
 
     // default values
-    PXOPT_LOOKUP_S16(code, config->args, "-code", false, false);
+    PXOPT_LOOKUP_S16(fault, config->args, "-fault", false, false);
 
     // start a transaction early so it will contain any row level locks
@@ -410 +410 @@
         return false;
     }
-    
+
     // query to get an excluse lock on this exposure in
     // pzDownloadExp
@@ -421 +421 @@
         PXOPT_COPY_STR(config->args, where,  "-inst", "camera", "==");
         PXOPT_COPY_STR(config->args, where,  "-telescope", "telescope", "==");
-        
+
         if (psListLength(where->list)) {
             psString whereClause = psDBGenerateWhereSQL(where, NULL);
@@ -455 +455 @@
             class_id,
             uri,
-            code,
+            fault,
             NULL,    // epoch
             hostname
@@ -605 +605 @@
             psError(PS_ERR_UNKNOWN, false, "database error");
             return false;
-        } 
+        }
 
         // sanity check: we should have inserted at least one row
@@ -675 +675 @@
             // init
             long counter = 0,   // the total number of elements zipped so far
-            i = 0,              // which array in the set 
+            i = 0,              // which array in the set
             index = 0;          // the depth into each array
             // test
@@ -782 +782 @@
     PXOPT_COPY_STR(config->args, where,  "-class_id", "class_id", "==");
 
-    PXOPT_LOOKUP_S16(code, config->args, "-code", true, false);
-
-    if (!pxSetFaultCode(config->dbh, "pzDownloadImfile", where, code)) {
+    PXOPT_LOOKUP_S16(fault, config->args, "-fault", true, false);
+
+    if (!pxSetFaultCode(config->dbh, "pzDownloadImfile", where, fault)) {
         psError(PS_ERR_UNKNOWN, false, "failed to set set fault flag");
-        psFree (where);
-        return false;
+        psFree (where);
+        return false;
     }
     psFree(where);

@@ -33 +33 @@
 pstamptool
 disttool
+receivetool