Changeset 29923

Timestamp:

Dec 5, 2010, 9:17:57 PM (15 years ago)

Author:

eugene

Message:

add state restriction on the detrend definebyquery; no longer need to copy psStrings from psSlurp to pass to psStringSubstitute

Location:

trunk/ippTools

Files:

• . (modified) (1 prop)
• share/camtool_find_pendingimfile.sql (modified) (1 prop)
• share/pxadmin_create_tables.sql (modified) (1 prop)
• src (modified) (1 prop)
• src/dettool.c (modified) (1 diff)
• src/dettoolConfig.c (modified) (1 diff)
• src/difftool.c (modified) (2 diffs)

trunk/ippTools/src/dettool.c

@@ -572 +572 @@
     PXOPT_COPY_F64(config->args, where, "-select_moon_phase_min", "moon_phase", ">=");
     PXOPT_COPY_F64(config->args, where, "-select_moon_phase_max", "moon_phase", "<=");
+
+    PXOPT_COPY_STR(config->args, where, "-select_state", "state", "=");
     PXOPT_COPY_STR(config->args, where, "-comment", "comment", "LIKE");
 

trunk/ippTools/src/dettoolConfig.c

@@ -138 +138 @@
     psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-select_moon_phase_min",  0,          "define min moon phase", NAN);
     psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-select_moon_phase_max",  0,          "define max moon phase", NAN);
+    psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-select_state",           0,          "select by state (default is 'full')", "full");
     psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-comment",                0,          "search by comment field (LIKE comparison)", NULL);
 

trunk/ippTools/src/difftool.c

@@ -2042 +2042 @@
     }
 
-    psString queryCopy = psStringCopy(query);
-    psFree(query);
-    query = queryCopy;
-    
     psStringSubstitute(&query, stack1Query, "@STACK1_QUERY@");
     psStringSubstitute(&query, stack2Query, "@STACK2_QUERY@");
@@ -2120 +2116 @@
         psStringAppend(&this_stack1Query,"AND %s", thisWhere);
         psFree(thisWhere);
-
-        psString queryCopy = psStringCopy(query);
-        psFree(query);
-        query = queryCopy;
-    
 
         psStringSubstitute(&query, this_stack1Query, "@STACK1_QUERY@");