Changeset 30227

Timestamp:

Jan 9, 2011, 11:13:17 AM (15 years ago)

Author:

eugene

Message:

added date-range options to pztool -pendingimfile

Location:

trunk/ippTools/src

Files:

• pztool.c (modified) (2 diffs)
• pztoolConfig.c (modified) (1 diff)

trunk/ippTools/src/pztool.c

@@ -297 +297 @@
 
     psMetadata *where = psMetadataAlloc();
-    PXOPT_COPY_STR(config->args, where,  "-exp_name",     "exp_name", "==");
-    PXOPT_COPY_STR(config->args, where,  "-inst",         "camera", "==");
-    PXOPT_COPY_STR(config->args, where,  "-telescope",    "telescope", "==");
-    PXOPT_COPY_STR(config->args, where,  "-exp_type",     "exp_type", "==");
+    PXOPT_COPY_STR(config->args, where,  "-exp_name",      "exp_name",  "==");
+    PXOPT_COPY_STR(config->args, where,  "-inst",          "camera",    "==");
+    PXOPT_COPY_STR(config->args, where,  "-telescope",     "telescope", "==");
+    PXOPT_COPY_STR(config->args, where,  "-exp_type",      "exp_type",  "==");
+    PXOPT_COPY_TIME(config->args, where, "-dateobs_begin", "dateobs",   ">=");
+    PXOPT_COPY_TIME(config->args, where, "-dateobs_end",   "dateobs",   "<=");
 
     PXOPT_LOOKUP_BOOL(desc, config->args, "-desc", false);
@@ -328 +330 @@
 
         if (psListLength(where->list)) {
-            psString whereClause = psDBGenerateWhereConditionSQL(where, "pzDownloadImfile");
+            psString whereClause = psDBGenerateWhereConditionSQL(where, NULL);
             psStringAppend(&query, " AND %s", whereClause);
             psFree(whereClause);

trunk/ippTools/src/pztoolConfig.c

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