Changeset 10697 for trunk/ippTools/src

Timestamp:

Dec 13, 2006, 1:36:27 PM (20 years ago)

Author:

jhoblitt

Message:

add -definebyquery -dateobs_begin & -dateobs_end

Location:

trunk/ippTools/src

Files:

• dettool.c (modified) (2 diffs)
• dettoolConfig.c (modified) (1 diff)

trunk/ippTools/src/dettool.c

@@ -604 +604 @@
             }
         }
-    }
+
+        psString dateobs_begin = psMetadataLookupStr(&status, config->args, "-dateobs_begin");
+        if (!status) {
+            psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -set_use_end");
+            psFree(where);
+            return false;
+        }
+        if (dateobs_begin) {
+            psTime *time = psTimeFromISO(dateobs_begin, PS_TIME_UTC);
+            if (!psMetadataAddTime(where, PS_LIST_TAIL, "dateobs", 0, ">=", time)) {
+                psError(PS_ERR_UNKNOWN, false, "failed to add item uri");
+                psFree(time);
+                psFree(where);
+                return false;
+            }
+            psFree(time);
+        }
+
+        psString dateobs_end = psMetadataLookupStr(&status, config->args, "-dateobs_end");
+        if (!status) {
+            psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -set_use_end");
+            psFree(where);
+            return false;
+        }
+        if (dateobs_end) {
+            psTime *time = psTimeFromISO(dateobs_end, PS_TIME_UTC);
+            if (!psMetadataAddTime(where, PS_LIST_TAIL, "dateobs", 0, "<", time)) {
+                psError(PS_ERR_UNKNOWN, false, "failed to add item uri");
+                psFree(time);
+                psFree(where);
+                return false;
+            }
+            psFree(time);
+        }
+    }
+
     if (!psListLength(where->list)) {
         psFree(where);
@@ -736 +771 @@
     // make sure that we found at least one rawDetrendExp
     if (!detrendExps) {
-        psError(PS_ERR_UNKNOWN, false, "no rawDetrendExp rows found");
+        psError(PS_ERR_UNKNOWN, false, "database error");
         psFree(registered);
         psFree(use_begin);
         psFree(use_end);
         return false;
+    }
+    if (!psArrayLength(detrendExps)) {
+        psError(PS_ERR_UNKNOWN, true, "no rawDetrendExp rows found");
+        psFree(detrendExps);
+        psFree(registered);
+        psFree(use_begin);
+        psFree(use_end);
+        return true;
     }
 

trunk/ippTools/src/dettoolConfig.c

@@ -109 +109 @@
     psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-uri",  0,
             "search for uri", NULL);
+    psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-dateobs_begin", 0,
+            "define start (>=) of included exposure peroid", NULL);
+    psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-dateobs_end", 0,
+            "define end (<) of included exposure peroid", NULL);
     psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-set_exp_type",  0,
             "define exposure type", NULL);