Changeset 28412

Timestamp:

Jun 18, 2010, 4:29:36 PM (16 years ago)

Author:

Paul Price

Message:

Add 'data' mode to diffphottool to get output data details.

Location:

trunk/ippTools

Files:

• share/Makefile.am (modified) (1 diff)
• share/diffphottool_data.sql (added)
• src/diffphottool.c (modified) (3 diffs)
• src/diffphottool.h (modified) (1 diff)
• src/diffphottoolConfig.c (modified) (2 diffs)

trunk/ippTools/share/Makefile.am

@@ -338 +338 @@
         diffphottool_pending.sql \
         diffphottool_advance.sql \
-        diffphottool_revert.sql
+        diffphottool_revert.sql \
+        diffphottool_data.sql

trunk/ippTools/src/diffphottool.c

@@ -38 +38 @@
 static bool advanceMode(pxConfig *config);
 static bool revertMode(pxConfig *config);
+static bool dataMode(pxConfig *config);
 
 # define MODECASE(caseName, func) \
@@ -64 +65 @@
         MODECASE(DIFFPHOTTOOL_MODE_ADVANCE,   advanceMode);
         MODECASE(DIFFPHOTTOOL_MODE_REVERT,    revertMode);
+        MODECASE(DIFFPHOTTOOL_MODE_DATA,      dataMode);
 
         default:
@@ -490 +492 @@
 }
 
+static bool dataMode(pxConfig *config)
+{
+    PS_ASSERT_PTR_NON_NULL(config, false);
+
+    psMetadata *where = psMetadataAlloc();
+
+    PXOPT_COPY_S64(config->args, where,  "-diff_phot_id", "diff_phot_id", "==");
+    PXOPT_COPY_STR(config->args, where, "-skycell_id", "skycell_id", "==");
+
+    PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);
+    PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
+
+    psString query = pxDataGet("diffphottool_data.sql");
+    if (!query) {
+        psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement");
+        return false;
+    }
+
+    if (psListLength(where->list)) {
+        psString clause = psDBGenerateWhereConditionSQL(where, NULL);
+        psStringAppend(&query, "\nWHERE %s", clause);
+        psFree(clause);
+    }
+    psFree(where);
+
+    if (limit) {
+        psString limitString = psDBGenerateLimitSQL(limit);
+        psStringAppend(&query, "\n%s", limitString);
+        psFree(limitString);
+    }
+
+    if (!p_psDBRunQuery(config->dbh, query)) {
+        psError(psErrorCodeLast(), false, "database error");
+        psFree(query);
+        return false;
+    }
+    psFree(query);
+
+    psArray *output = p_psDBFetchResult(config->dbh);
+    if (!output) {
+        psError(psErrorCodeLast(), false, "database error");
+        return false;
+    }
+    if (!psArrayLength(output)) {
+        psTrace("diffphottool", PS_LOG_INFO, "no rows found");
+        psFree(output);
+        return true;
+    }
+
+    if (!ippdbPrintMetadatas(stdout, output, "diffPhotSkyfile", !simple)) {
+        psError(psErrorCodeLast(), false, "failed to print array");
+        psFree(output);
+        return false;
+    }
+    psFree(output);
+
+    return true;
+}
+

trunk/ippTools/src/diffphottool.h

@@ -32 +32 @@
     DIFFPHOTTOOL_MODE_ADVANCE,
     DIFFPHOTTOOL_MODE_REVERT,
+    DIFFPHOTTOOL_MODE_DATA,
 } diffphottoolMode;
 

trunk/ippTools/src/diffphottoolConfig.c

@@ -115 +115 @@
     psMetadataAddBool(revertArgs, PS_LIST_TAIL, "-all", 0, "allow no search terms", 0);
 
+    // -data
+    psMetadata *dataArgs = psMetadataAlloc();
+    psMetadataAddS64(dataArgs, PS_LIST_TAIL, "-diff_phot_id", 0, "search by diffphot ID", 0);
+    psMetadataAddStr(dataArgs, PS_LIST_TAIL, "-skycell_id", 0, "search by skycell ID", NULL);
+    psMetadataAddU64(dataArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0);
+    psMetadataAddBool(dataArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false);
+
     psFree(now);
 
@@ -127 +134 @@
     PXOPT_ADD_MODE("-advance",   "", DIFFPHOTTOOL_MODE_ADVANCE,   advanceArgs);
     PXOPT_ADD_MODE("-revert",    "", DIFFPHOTTOOL_MODE_REVERT,    revertArgs);
+    PXOPT_ADD_MODE("-data",      "", DIFFPHOTTOOL_MODE_DATA,      dataArgs);
 
     if (!pxGetOptions(stderr, argc, argv, config, modes, argSets)) {