Changeset 10741

Timestamp:

Dec 14, 2006, 9:19:25 PM (19 years ago)

Author:

eugene

Message:

added limits, fixed date bugs

Location:

trunk/ippTools/src

Files:

• dettool.c (modified) (6 diffs)
• dettoolConfig.c (modified) (1 diff)

trunk/ippTools/src/dettool.c

@@ -3444 +3444 @@
 detResidImfileAnalysis;
 */
+
+    bool status = false;
+    psU64 limit = psMetadataLookupU64(&status, config->args, "-limit");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -limit");
+        return false;
+    }
 
     psString query = psStringCopy(
@@ -3521 +3528 @@
 #endif
 
+    // treat limit == 0 as "no limit"
+    if (limit) {
+        psString limitString = psDBGenerateLimitSQL(limit);
+        psStringAppend(&query, " %s", limitString);
+        psFree(limitString);
+    }
+
     if (!p_psDBRunQuery(config->dbh, query)) {
         psError(PS_ERR_UNKNOWN, false, "database error");
@@ -3997 +4011 @@
 
 
+    bool status = false;
+    psU64 limit = psMetadataLookupU64(&status, config->args, "-limit");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -limit");
+        return false;
+    }
+
     // select detRun.det_id
     // select detRun.iteration
@@ -4065 +4086 @@
 #endif
 
+    // treat limit == 0 as "no limit"
+    if (limit) {
+        psString limitString = psDBGenerateLimitSQL(limit);
+        psStringAppend(&query, " %s", limitString);
+        psFree(limitString);
+    }
+
     if (!p_psDBRunQuery(config->dbh, query)) {
         psError(PS_ERR_UNKNOWN, false, "database error");
@@ -4466 +4494 @@
     PS_ASSERT_PTR_NON_NULL(config, false);
 
+    bool status = false;
+    psU64 limit = psMetadataLookupU64(&status, config->args, "-limit");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -limit");
+        return false;
+    }
+
     /* which returns a list of detrend runs (with detrend id, iteration and
      * detrend type) which have completed all residexps.
@@ -4522 +4557 @@
 #endif
 
+    // treat limit == 0 as "no limit"
+    if (limit) {
+        psString limitString = psDBGenerateLimitSQL(limit);
+        psStringAppend(&query, " %s", limitString);
+        psFree(limitString);
+    }
+
     if (!p_psDBRunQuery(config->dbh, query)) {
         psError(PS_ERR_UNKNOWN, false, "database error");

trunk/ippTools/src/dettoolConfig.c

@@ -525 +525 @@
     psMetadataAddBool(residdetrunArgs, PS_LIST_TAIL, "-simple",  0,
             "use the simple output format", false);
+    psMetadataAddU64(residdetrunArgs, PS_LIST_TAIL, "-limit",  0,
+            "limit result set to N items", 0);
 
     // -updateresidexp