Changeset 34933

Timestamp:

Jan 15, 2013, 5:12:54 PM (13 years ago)

Author:

bills

Message:

implement releasetool -definerelexp
start implementation of releasetool -listrelexp

Location:

trunk/ippTools

Files:

• share/Makefile.am (modified) (1 diff)
• share/releasetool_definerelexp.sql (added)
• share/releasetool_listrelexp.sql (modified) (1 diff)
• src/releasetool.c (modified) (4 diffs)
• src/releasetoolConfig.c (modified) (3 diffs)

trunk/ippTools/share/Makefile.am

@@ -464 +464 @@
         releasetool_listsurvey.sql \
         releasetool_listrelease.sql \
-        releasetool_listrelexp.sql
+        releasetool_listrelexp.sql \
+        releasetool_definerelexp.sql
 

trunk/ippTools/share/releasetool_listrelexp.sql

@@ -1 @@
-SELECT * 
+SELECT
+    relexp_id,
+    releaseName,
+    relExp.state,
+    rel_id,
+    survey.surveyName,
+    exp_name,
+    relExp.flags,
+    relExp.zpt_obs,
+    relExp.zpt_stdev,
+    relExp.path_base,
+    relExp.registered,
+    relExp.time_stamp,
+    exp_id,
+    chip_id,
+    chipRun.state as chip_state,
+    cam_id,
+    camRun.state as cam_state,
+    camProcessedExp.path_base as cam_path_base,
+    warp_id,
+    warpRun.state as warp_state,
+    rawExp.filter,
+    rawExp.dateobs,
+    TRUNCATE(DEGREES(rawExp.ra), 4) AS radeg,
+    TRUNCATE(DEGREES(rawExp.decl), 4) AS decdeg,
+    rawExp.object,
+    rawExp.comment
 FROM relExp 
-JOIN release USING(rel_id) 
-JOIN survey using(surveyID)
+JOIN ippRelease USING(rel_id) 
+JOIN survey USING(surveyID)
+JOIN rawExp using(exp_id)
+JOIN chipRun using(chip_id, exp_id)
+JOIN camRun using(cam_id, chip_id)
+JOIN camProcessedExp using(cam_id)
+JOIN fakeRun using(cam_id)
+JOIN warpRun using(fake_id)

trunk/ippTools/src/releasetool.c

@@ -239 +239 @@
     PXOPT_COPY_S32(config->args, where, "-rel_id",  "rel_id", "==");
 
-    psString query = pxDataGet("releasetool_listrelease.sql");
+        psString query = pxDataGet("releasetool_listrelease.sql");
+        if (!query) {
+            psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement");
+            return false;
+        }
+
+        if (psListLength(where->list)) {
+            psString whereClause = psDBGenerateWhereConditionSQL(where, NULL);
+            psStringAppend(&query, " WHERE %s", whereClause);
+            psFree(whereClause);
+        } else {
+            // The list of releases is short there is no need to require parameters
+    #ifdef notyet
+            psError(PXTOOLS_ERR_CONFIG, false, "search parameters are required\n");
+            psFree(where);
+            return false;
+    #endif
+        }
+
+        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("releasetool", PS_LOG_INFO, "no rows found");
+            psFree(output);
+            return true;
+        }
+
+        if (!ippdbPrintMetadatas(stdout, output, "ippRelease", !simple)) {
+            psError(PS_ERR_UNKNOWN, false, "failed to print array");
+            psFree(output);
+            return false;
+        }
+
+        psFree(output);
+
+        return true;
+    }
+
+    static bool definerelexpMode(pxConfig *config)
+    {
+        PS_ASSERT_PTR_NON_NULL(config, NULL);
+
+        psMetadata *where = psMetadataAlloc();
+
+        PXOPT_COPY_STR(config->args, where, "-label",      "camRun.label", "==");
+        PXOPT_COPY_STR(config->args, where, "-data_group", "camRun.data_group", "==");
+        PXOPT_COPY_S64(config->args, where, "-cam_id",     "camRun.cam_id", "==");
+
+        // Insure that at least one of the camRun selectors is supplied
+        if (!psListLength(where->list)) {
+            psFree(where);
+            psError(PXTOOLS_ERR_CONFIG, false, "at least one of -label, -data_group, or -cam_id is required");
+            return false;
+        }
+
+        PXOPT_COPY_S64(config->args, where, "-exp_id",     "rawExp.exp_id", "==");
+        PXOPT_COPY_STR(config->args, where, "-exp_name",   "rawExp.exp_name", "==");
+
+        // insure that at least one of these is supplied to select the release
+        PXOPT_LOOKUP_S64(rel_id, config->args,      "-rel_id", false, false);
+        PXOPT_LOOKUP_STR(releaseName, config->args, "-releaseName", false, false);
+        if (!rel_id && !releaseName) {
+            psError(PXTOOLS_ERR_CONFIG, true, "either -rel_id or -releaseName is required");
+            return false;
+        }
+
+        // limit query to the target release. (Note: this will select nothing of releaseName and rel_id don't match)
+        // note: we add these after above to insure that search args are supplied
+        PXOPT_COPY_STR(config->args, where, "-releaseName", "ippRelease.releaseName", "==");
+        PXOPT_COPY_S32(config->args, where, "-rel_id", "ippRelease.rel_id", "==");
+
+
+        PXOPT_LOOKUP_STR(state, config->args,     "-set_state", true, false);
+        PXOPT_LOOKUP_U32(flags, config->args,     "-set_flags", false, false);
+        PXOPT_LOOKUP_STR(path_base, config->args, "-set_path_base", false, false);
+
+        PXOPT_LOOKUP_BOOL(pretend, config->args, "-pretend", false);
+        PXOPT_LOOKUP_BOOL(simple, config->args,  "-simple", false);
+
+        // find the parameters of all the exposures that we want to add to the release
+        psString query = pxDataGet("releasetool_definerelexp.sql");
+        if (!query) {
+            psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement");
+            psFree(where);
+            return false;
+        }
+
+        psString whereClause = psDBGenerateWhereConditionSQL(where, NULL);
+        psStringAppend(&query, " AND %s", whereClause);
+        psFree(whereClause);
+
+        psFree(where);
+
+        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("releasetool", PS_LOG_INFO, "no rows found");
+            psFree(output);
+            return true;
+        }
+
+        if (pretend) {
+            // negative simple so the default is true
+            if (!ippdbPrintMetadatas(stdout, output, "chipRun", !simple)) {
+                psError(PS_ERR_UNKNOWN, false, "failed to print array");
+                psFree(output);
+                return false;
+            }
+            psFree(output);
+            return true;
+        }
+
+        if (!psDBTransaction(config->dbh)) {
+            psError(PS_ERR_UNKNOWN, false, "database error");
+            psFree(output);
+            return false;
+        }
+
+        psTime *now = psTimeGetNow(PS_TIME_TAI);
+        // loop over our list of  exposures
+        for (long i = 0; i < psArrayLength(output); i++) {
+            psMetadata *md = output->data[i];
+
+            bool status = true;
+            psS32 rel_id = psMetadataLookupS32(&status, md, "rel_id");
+            psS64 exp_id = psMetadataLookupS64(&status, md, "exp_id");
+            psS64 chip_id = psMetadataLookupS64(&status, md, "chip_id");
+            psS64 cam_id = psMetadataLookupS64(&status, md, "cam_id");
+            psF32 zpt_obs = psMetadataLookupF32(&status, md, "zpt_obs");
+            psF32 zpt_stdev = psMetadataLookupF32(&status, md, "zpt_stdev");
+
+            if (!relExpInsert(config->dbh,
+                0,          // relexp_id (auto increment)
+                rel_id,
+                exp_id,
+                chip_id,
+                cam_id,
+                state,
+                flags,
+                zpt_obs,
+                zpt_stdev,
+                path_base,
+                now,       // registered
+                now        // time_stamp
+            )) {
+                if (!psDBRollback(config->dbh)) {
+                    psError(PS_ERR_UNKNOWN, false, "database error");
+                }
+                psError(PS_ERR_UNKNOWN, false,
+                        "failed to trying to insert relExp for cam_id %" PRId64, cam_id);
+                psFree(output);
+                psFree(now);
+                return false;
+            }
+        }
+        psFree(output);
+
+        if (!psDBCommit(config->dbh)) {
+            psError(PS_ERR_UNKNOWN, false, "database error");
+            return false;
+        }
+
+        return true;
+    }
+
+    static bool updaterelexpMode(pxConfig *config)
+    {
+        psError(PS_ERR_UNKNOWN, true, "not yet implemented");
+        return false;
+    }
+
+static bool listrelexpMode(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, "-surveyName",  "surveyName", "LIKE");
+    PXOPT_COPY_STR(config->args, where, "-releaseName", "releaseName", "LIKE");
+//    PXOPT_COPY_STR(config->args, where, "-state", "state", "==");
+//    PXOPT_COPY_S32(config->args, where, "-rel_id",  "rel_id", "==");
+//    PXOPT_COPY_S64(config->args, where, "-exp_id",  "exp_id", "==");
+
+    psString query = pxDataGet("releasetool_listrelexp.sql");
     if (!query) {
         psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement");
+        return false;
+    }
+
+    psString where2 = NULL;
+    if (!pxspaceAddWhere(config, &where2, "rawExp")) {
+        psError(psErrorCodeLast(), false, "pxspaceAddWhere failed");
         return false;
     }
@@ -250 +468 @@
         psFree(whereClause);
     } else {
-        // The list of releases is short there is no need to require parameters
-#ifdef notdef
         psError(PXTOOLS_ERR_CONFIG, false, "search parameters are required\n");
         psFree(where);
         return false;
-#endif
+    }
+
+    if (where2) {
+        psStringAppend(&query, "\n%s", where2);
+        psFree(where2);
     }
 
@@ -283 +503 @@
     }
 
-    if (!ippdbPrintMetadatas(stdout, output, "ippRelease", !simple)) {
+    if (!ippdbPrintMetadatas(stdout, output, "relExp", !simple)) {
         psError(PS_ERR_UNKNOWN, false, "failed to print array");
         psFree(output);
@@ -292 +512 @@
 
     return true;
-}
-
-static bool definerelexpMode(pxConfig *config)
-{
-    psError(PS_ERR_UNKNOWN, true, "not yet implemented");
-    return false;
-}
-
-static bool updaterelexpMode(pxConfig *config)
-{
-    psError(PS_ERR_UNKNOWN, true, "not yet implemented");
-    return false;
-}
-
-static bool listrelexpMode(pxConfig *config)
-{
-    psError(PS_ERR_UNKNOWN, true, "not yet implemented");
-    return false;
 }
 

trunk/ippTools/src/releasetoolConfig.c

@@ -2 +2 @@
  * releasetoolConfig.c
  *
- * Copyright (C) 2012 IfA University of Hawaii
+ * Copyright (C) 2013 IfA University of Hawaii
  *
  * This program is free software; you can redistribute it and/or modify it
@@ -89 +89 @@
     psMetadataAddBool(listreleaseArgs, PS_LIST_TAIL, "-simple",      0, "use the simple output format", false);
 
+    // -definerelexp
     psMetadata *definerelexpArgs = psMetadataAlloc();
-    psMetadataAddStr(definerelexpArgs,  PS_LIST_TAIL, "-releaseName", 0, "select by survey name (LIKE comparision)", NULL);
+
+        // to set the target release
+    psMetadataAddStr(definerelexpArgs,  PS_LIST_TAIL, "-releaseName", 0, "define release name", NULL);
+    psMetadataAddS32(definerelexpArgs, PS_LIST_TAIL,  "-rel_id", 0,      "define release ID", 0);
+
+        // to select the processing
+    psMetadataAddS64(definerelexpArgs, PS_LIST_TAIL,  "-cam_id", 0,      "select by cam ID", 0);
+    psMetadataAddStr(definerelexpArgs,  PS_LIST_TAIL, "-label",  0,      "select by camRun.label", NULL);
+    psMetadataAddStr(definerelexpArgs,  PS_LIST_TAIL, "-data_group", 0,  "select by camRun.data_group", NULL);
+
+        // to select a specific exposure from the "processing"
+    psMetadataAddS64(definerelexpArgs, PS_LIST_TAIL,  "-exp_id", 0,      "select by exposure ID", 0);
+    psMetadataAddStr(definerelexpArgs,  PS_LIST_TAIL, "-exp_name", 0,    "select by exposure name", NULL);
+
+        // parameters of the relExp
+    psMetadataAddStr(definerelexpArgs,  PS_LIST_TAIL, "-set_state", 0,      "define state (required)", NULL);
+    psMetadataAddStr(definerelexpArgs,  PS_LIST_TAIL, "-set_path_base", 0,  "define state", NULL);
+    psMetadataAddU32(definerelexpArgs,  PS_LIST_TAIL, "-set_flags", 0,      "define flags", 0);
+
+    psMetadataAddBool(definerelexpArgs, PS_LIST_TAIL, "-pretend",  0, "do not actual modify the database", false);
+    psMetadataAddBool(definerelexpArgs, PS_LIST_TAIL, "-simple",  0, "use the simpel output format", false);
+
+
 
     psMetadata *updaterelexpArgs = psMetadataAlloc();
@@ -97 +120 @@
     psMetadata *listrelexpArgs = psMetadataAlloc();
     psMetadataAddStr(listrelexpArgs,  PS_LIST_TAIL, "-releaseName", 0, "select by survey name (LIKE comparision)", NULL);
+    pxspaceAddArguments(listrelexpArgs);
 
+    psMetadataAddU64(listrelexpArgs,  PS_LIST_TAIL, "-limit",       0, "limit result set to N items", 0);
+    psMetadataAddBool(listrelexpArgs, PS_LIST_TAIL, "-simple",      0, "use the simple output format", false);
 
     psMetadata *argSets = psMetadataAlloc();