Changeset 33744 for trunk

Timestamp:

Apr 10, 2012, 10:13:17 AM (14 years ago)

Author:

bills

Message:

add sctool -list to list out skycells matching selection criteria

Location:

trunk/ippTools

Files:

• share/Makefile.am (modified) (1 diff)
• share/sctool_list.sql (added)
• src/sctool.c (modified) (3 diffs)
• src/sctool.h (modified) (1 diff)
• src/sctoolConfig.c (modified) (1 diff)

trunk/ippTools/share/Makefile.am

@@ -450 +450 @@
         vptool_pendingrun.sql \
         vptool_processedcell.sql \
-        vptool_revertrun.sql
+        vptool_revertrun.sql \
+        sctool_list.sql
 

trunk/ippTools/src/sctool.c

@@ -35 +35 @@
 
 static bool defineskycellsMode(pxConfig *config);
+static bool listMode(pxConfig *config);
 
 # define MODECASE(caseName, func) \
@@ -53 +54 @@
 
     switch (config->mode) {
-        MODECASE(SCTOOL_MODE_DEFINESKYCELLS,         defineskycellsMode);
+        MODECASE(SCTOOL_MODE_DEFINESKYCELLS,    defineskycellsMode);
+        MODECASE(SCTOOL_MODE_LIST,              listMode);
         default:
             psAbort("invalid option (this should not happen)");
@@ -131 +133 @@
     return true;
 }
+static bool listMode(pxConfig *config)
+{
+    PS_ASSERT_PTR_NON_NULL(config, NULL);
+
+    PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);
+    PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
+    psMetadata *where = psMetadataAlloc();
+
+    PXOPT_COPY_STR(config->args, where, "-skycell_id", "skycell.skycell_id", "LIKE");
+    PXOPT_COPY_STR(config->args, where, "-tess_id", "skycell.tess_id", "LIKE");
+    PXOPT_COPY_F32(config->args, where, "-ra_min", "skycell.radeg", ">=");
+    PXOPT_COPY_F32(config->args, where, "-dec_min", "skycell.decdeg", ">=");
+    PXOPT_COPY_F32(config->args, where, "-ra_max", "skycell.radeg", "<");
+    PXOPT_COPY_F32(config->args, where, "-dec_max", "skycell.decdeg", "<");
+    PXOPT_COPY_F32(config->args, where, "-glong_min", "skycell.glong", ">=");
+    PXOPT_COPY_F32(config->args, where, "-glat_min", "skycell.glat", ">=");
+    PXOPT_COPY_F32(config->args, where, "-glong_max", "skycell.glong", "<");
+    PXOPT_COPY_F32(config->args, where, "-glat_max", "skycell.glat", "<");
+
+    psString query = pxDataGet("sctool_list.sql");
+    if (!query) {
+        psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement");
+        return false;
+    }
+
+    if (!psListLength(where->list)) {
+        psError(PXTOOLS_ERR_CONFIG, false, "search paramters are required\n");
+        psFree(where);
+        return false;
+    }
+    psString whereClause = psDBGenerateWhereConditionSQL(where, NULL);
+    psStringAppend(&query, " WHERE %s", whereClause);
+    psFree(whereClause);
+
+    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) {
+        psError(PS_ERR_UNKNOWN, false, "database error");
+        return false;
+    }
+
+    if (!psArrayLength(output)) {
+        psTrace("sctool", PS_LOG_INFO, "no rows found");
+        psFree(output);
+        return true;
+    }
+
+    if (!ippdbPrintMetadatas(stdout, output, "skycell", !simple)) {
+        psError(PS_ERR_UNKNOWN, false, "failed to print array");
+        psFree(output);
+        return false;
+    }
+
+    psFree(output);
+
+
+    return true;
+}

trunk/ippTools/src/sctool.h

@@ -26 +26 @@
     SCTOOL_MODE_NONE      = 0x0,
     SCTOOL_MODE_DEFINESKYCELLS,
+    SCTOOL_MODE_LIST,
 } sctoolMode;
 

trunk/ippTools/src/sctoolConfig.c

@@ -48 +48 @@
     psMetadataAddStr(defineskycellsArgs, PS_LIST_TAIL, "-input", 0, "file containing skycell data (required)", NULL);
 
+    // -list
+    psMetadata *listArgs = psMetadataAlloc();
+    psMetadataAddStr(listArgs,  PS_LIST_TAIL, "-skycell_id",        0, "search by skycell_id (LIKE comparision)", NULL);
+    psMetadataAddStr(listArgs,  PS_LIST_TAIL, "-tess_id",           0, "search by tess_id (LIKE comparision)", NULL);
+    psMetadataAddF32(listArgs,  PS_LIST_TAIL, "-ra_min",            0, "search by right ascension (degrees)", NAN);
+    psMetadataAddF32(listArgs,  PS_LIST_TAIL, "-dec_min",           0, "search by declination (degrees)", NAN);
+    psMetadataAddF32(listArgs,  PS_LIST_TAIL, "-ra_max",            0, "search by right ascension (degrees)", NAN);
+    psMetadataAddF32(listArgs,  PS_LIST_TAIL, "-dec_max",           0, "search by declination (degrees)", NAN);
+    psMetadataAddF32(listArgs,  PS_LIST_TAIL, "-glong_min",         0, "search by galactic longitude (degrees)", NAN);
+    psMetadataAddF32(listArgs,  PS_LIST_TAIL, "-glat_min",          0, "search by galactic latitude (degrees)", NAN);
+    psMetadataAddF32(listArgs,  PS_LIST_TAIL, "-glong_max",         0, "search by galactic longitude (degrees)", NAN);
+    psMetadataAddF32(listArgs,  PS_LIST_TAIL, "-glat_max",          0, "search by galactic latitude (degrees)", NAN);
+    psMetadataAddU64(listArgs,  PS_LIST_TAIL, "-limit",             0, "limit result set to N items", 0);
+    psMetadataAddBool(listArgs, PS_LIST_TAIL, "-simple",            0, "use the simple output format", false);
+
     psMetadata *argSets = psMetadataAlloc();
     psMetadata *modes = psMetadataAlloc();
 
-    PXOPT_ADD_MODE("-defineskycells",        "insert skycells from mdc file",       SCTOOL_MODE_DEFINESKYCELLS,        defineskycellsArgs);
+    PXOPT_ADD_MODE("-defineskycells",        "insert skycells from mdc file",  SCTOOL_MODE_DEFINESKYCELLS,        defineskycellsArgs);
+    PXOPT_ADD_MODE("-list",                   "list skycell parameters",       SCTOOL_MODE_LIST,        listArgs);
 
     if (!pxGetOptions(stderr, argc, argv, config, modes, argSets)) {