Changeset 29923
- Timestamp:
- Dec 5, 2010, 9:17:57 PM (15 years ago)
- Location:
- trunk/ippTools
- Files:
-
- 7 edited
-
. (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)
Legend:
- Unmodified
- Added
- Removed
-
trunk/ippTools
- Property svn:mergeinfo deleted
-
trunk/ippTools/share/camtool_find_pendingimfile.sql
- Property svn:mergeinfo changed
/branches/eam_branches/ipp-20101103/ippTools/share/camtool_find_pendingimfile.sql (added) merged: 29906,29918,29920
- Property svn:mergeinfo changed
-
trunk/ippTools/share/pxadmin_create_tables.sql
- Property svn:mergeinfo changed
/branches/eam_branches/ipp-20101103/ippTools/share/pxadmin_create_tables.sql (added) merged: 29906,29918,29920
- Property svn:mergeinfo changed
-
trunk/ippTools/src
- Property svn:mergeinfo changed
/branches/eam_branches/ipp-20101103/ippTools/src (added) merged: 29664,29835,29872,29906,29918,29920
- Property svn:mergeinfo changed
-
trunk/ippTools/src/dettool.c
r28689 r29923 572 572 PXOPT_COPY_F64(config->args, where, "-select_moon_phase_min", "moon_phase", ">="); 573 573 PXOPT_COPY_F64(config->args, where, "-select_moon_phase_max", "moon_phase", "<="); 574 575 PXOPT_COPY_STR(config->args, where, "-select_state", "state", "="); 574 576 PXOPT_COPY_STR(config->args, where, "-comment", "comment", "LIKE"); 575 577 -
trunk/ippTools/src/dettoolConfig.c
r28578 r29923 138 138 psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-select_moon_phase_min", 0, "define min moon phase", NAN); 139 139 psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-select_moon_phase_max", 0, "define max moon phase", NAN); 140 psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-select_state", 0, "select by state (default is 'full')", "full"); 140 141 psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-comment", 0, "search by comment field (LIKE comparison)", NULL); 141 142 -
trunk/ippTools/src/difftool.c
r29696 r29923 2042 2042 } 2043 2043 2044 psString queryCopy = psStringCopy(query);2045 psFree(query);2046 query = queryCopy;2047 2048 2044 psStringSubstitute(&query, stack1Query, "@STACK1_QUERY@"); 2049 2045 psStringSubstitute(&query, stack2Query, "@STACK2_QUERY@"); … … 2120 2116 psStringAppend(&this_stack1Query,"AND %s", thisWhere); 2121 2117 psFree(thisWhere); 2122 2123 psString queryCopy = psStringCopy(query);2124 psFree(query);2125 query = queryCopy;2126 2127 2118 2128 2119 psStringSubstitute(&query, this_stack1Query, "@STACK1_QUERY@");
Note:
See TracChangeset
for help on using the changeset viewer.
