Changeset 39527

Timestamp:

Apr 11, 2016, 3:01:13 PM (10 years ago)

Author:

watersc1

Message:

Merge of change to trunk for pztool to allow dateobs_begin/end limitations on the pendingexp call.

Location:

tags/ipp-20141024/ippTools/src

Files:

• pztool.c (modified) (3 diffs, 1 prop)
• pztoolConfig.c (modified) (1 diff, 1 prop)

tags/ipp-20141024/ippTools/src/pztool.c

@@ -222 +222 @@
 
     psMetadata *where = psMetadataAlloc();
+    psMetadata *where2 = psMetadataAlloc();
     PXOPT_COPY_S64(config->args, where,  "-summit_id",    "summit_id", "==");
     PXOPT_COPY_STR(config->args, where,  "-exp_name",     "exp_name", "==");
@@ -228 +229 @@
     PXOPT_COPY_STR(config->args, where,  "-exp_type",     "exp_type", "==");
 
+    PXOPT_COPY_TIME(config->args, where2, "-dateobs_begin", "dateobs",   ">=");
+    PXOPT_COPY_TIME(config->args, where2, "-dateobs_end",   "dateobs",   "<=");
+    
     PXOPT_LOOKUP_BOOL(desc, config->args, "-desc", false);
     PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);
@@ -251 +255 @@
     psFree(where);
 
+    if (psListLength(where2->list)) {
+      psString where2Clause = psDBGenerateWhereConditionSQL(where2, "summitExp");
+      psStringAppend(&query, " AND %s", where2Clause);
+      psFree(where2Clause);
+    }
+    psFree(where2);
+    
     psStringAppend(&query, " ORDER BY summitExp.dateobs");
     if (desc) {

tags/ipp-20141024/ippTools/src/pztoolConfig.c

@@ -67 +67 @@
     psMetadataAddStr(pendingexpArgs, PS_LIST_TAIL, "-inst", 0,            "define camera ID", NULL);
     psMetadataAddStr(pendingexpArgs, PS_LIST_TAIL, "-telescope", 0,            "define telescope ID", NULL);
+    psMetadataAddTime(pendingexpArgs, PS_LIST_TAIL, "-dateobs_begin", 0,  "search for exposures by time (>=)", NULL);
+    psMetadataAddTime(pendingexpArgs, PS_LIST_TAIL, "-dateobs_end", 0,  "search for exposures by time (<=)", NULL);
     psMetadataAddStr(pendingexpArgs, PS_LIST_TAIL, "-exp_type", 0,            "define exposure type", NULL);
     psMetadataAddBool(pendingexpArgs, PS_LIST_TAIL, "-desc", 0,            "sort ouput in descending format", false);