Changeset 15570

Timestamp:

Nov 9, 2007, 4:03:20 PM (19 years ago)

Author:

jhoblitt

Message:

add -addruns & -runs

Location:

trunk/ippTools/src

Files:

• caltool.c (modified) (2 diffs)
• caltoolConfig.c (modified) (2 diffs)

trunk/ippTools/src/caltool.c

@@ -197 +197 @@
 static bool addrunMode(pxConfig *config)
 {
-    PS_ASSERT_PTR_NON_NULL(config, NULL);
+    PS_ASSERT_PTR_NON_NULL(config, false);
+
+    // required options
+    bool status = false;
+    psString cal_id = psMetadataLookupStr(&status, config->args, "-cal_id");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -cal_id");
+        return false;
+    }
+    if (!cal_id) {
+        psError(PS_ERR_UNKNOWN, true, "-cal_id is required");
+        return false;
+    }
+
+    psString region = psMetadataLookupStr(&status, config->args, "-region");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -region");
+        return false;
+    }
+    if (!region) {
+        psError(PS_ERR_UNKNOWN, true, "-region is required");
+        return false;
+    }
+
+    psString last_step = psMetadataLookupStr(&status, config->args, "-last_step");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -last_step");
+        return false;
+    }
+    if (!last_step) {
+        psError(PS_ERR_UNKNOWN, true, "-last_step is required");
+        return false;
+    }
+
+    psString state = psMetadataLookupStr(&status, config->args, "-state");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -state");
+        return false;
+    }
+    if (!state) {
+        psError(PS_ERR_UNKNOWN, true, "-state is required");
+        return false;
+    }
+
+    if (!calRunInsert(config->dbh,
+            (psS64)atoll(cal_id),
+            region,
+            last_step,
+            state
+        )) {
+        psError(PS_ERR_UNKNOWN, false, "database error");
+        return false;
+
+    }
 
     return false;
@@ -205 +258 @@
 static bool runsMode(pxConfig *config)
 {
-    PS_ASSERT_PTR_NON_NULL(config, NULL);
-
-    return false;
-}
+    PS_ASSERT_PTR_NON_NULL(config, false);
+
+    bool status = false;
+    psU64 limit = psMetadataLookupU64(&status, config->args, "-limit");
+    if (!status) {
+        psError(PXTOOLS_ERR_PROG, false, "failed to lookup value for -limit");
+        return false;
+    }
+
+    psString query = psStringCopy("SELECT * FROM calRun");
+
+    if (config->where) {
+        psString whereClause = psDBGenerateWhereSQL(config->where, NULL);
+        psStringAppend(&query, " %s", whereClause);
+        psFree(whereClause);
+    }
+
+    // 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");
+        psFree(query);
+        return false;
+    }
+    psFree(query);
+
+    psArray *output = p_psDBFetchResult(config->dbh);
+    if (!output) {
+        psErrorCode err = psErrorCodeLast();
+        switch (err) {
+            case PS_ERR_DB_CLIENT:
+                psError(PXTOOLS_ERR_SYS, false, "database error");
+            case PS_ERR_DB_SERVER:
+                psError(PXTOOLS_ERR_PROG, false, "database error");
+            default:
+                psError(PXTOOLS_ERR_PROG, false, "unknown error");
+        }
+
+        return false;
+    }
+    if (!psArrayLength(output)) {
+        psTrace("caltool", PS_LOG_INFO, "no rows found");
+        psFree(output);
+        return true;
+    }
+
+    bool simple = false;
+    {
+        bool status = false;
+        simple = psMetadataLookupBool(&status, config->args, "-simple");
+        if (!status) {
+            psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -simple");
+            return false;
+        }
+    }
+
+    if (psArrayLength(output)) {
+        if (!convertIdToStr(output)) {
+            psError(PS_ERR_UNKNOWN, false, "failed to convert id fields into a strings");
+            psFree(output);
+            return false;
+        }
+
+        // negative simple so the default is true
+        if (!ippdbPrintMetadatas(stdout, output, "calRun", !simple)) {
+            psError(PS_ERR_UNKNOWN, false, "failed to print array");
+            psFree(output);
+            return false;
+        }
+    }
+
+    psFree(output);
+
+    return true;
+}

trunk/ippTools/src/caltoolConfig.c

@@ -50 +50 @@
     psMetadata *adddbArgs = psMetadataAlloc();
     psMetadataAddStr(adddbArgs, PS_LIST_TAIL, "-dvodb",  0,
-            "define DVO db", NULL);
+            "define DVO db (required)", NULL);
 
     // -dbs
@@ -62 +62 @@
     psMetadata *addrunArgs = psMetadataAlloc();
     psMetadataAddStr(addrunArgs, PS_LIST_TAIL, "-cal_id",  0,
-            "define calibration DB ID", NULL);
-    psMetadataAddF64(addrunArgs, PS_LIST_TAIL, "-user_1",  0,
-            "define user statistic (1)", NAN);
-    psMetadataAddF64(addrunArgs, PS_LIST_TAIL, "-user_2",  0,
-            "define user statistic (2)", NAN);
-    psMetadataAddF64(addrunArgs, PS_LIST_TAIL, "-user_3",  0,
-            "define user statistic (3)", NAN);
-    psMetadataAddF64(addrunArgs, PS_LIST_TAIL, "-user_4",  0,
-            "define user statistic (4)", NAN);
-    psMetadataAddF64(addrunArgs, PS_LIST_TAIL, "-user_5",  0,
-            "define user statistic (5)", NAN);
-    psMetadataAddS16(addrunArgs, PS_LIST_TAIL, "-code",  0,
-            "set fault code", 0);
+            "define calibration DB ID (required)", NULL);
+    psMetadataAddStr(addrunArgs, PS_LIST_TAIL, "-region",  0,
+            "define region (required)", NULL);
+    psMetadataAddStr(addrunArgs, PS_LIST_TAIL, "-last_step",  0,
+            "define last step (required)", NULL);
+    psMetadataAddStr(addrunArgs, PS_LIST_TAIL, "-state",  0,
+            "define state (required)", NULL);
 
     // -runs