Changeset 36623 for trunk/ippTools
- Timestamp:
- Mar 31, 2014, 2:36:01 PM (12 years ago)
- Location:
- trunk
- Files:
-
- 3 edited
-
. (modified) (1 prop)
-
ippTools/src/fftool.c (modified) (1 diff)
-
ippTools/src/remotetool.c (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk
- Property svn:mergeinfo changed
/branches/eam_branches/ipp-20140226 (added) merged: 36561,36563,36619-36622
- Property svn:mergeinfo changed
-
trunk/ippTools/src/fftool.c
r36555 r36623 180 180 psString whereClause = psDBGenerateWhereConditionSQL(skycalWhereMD, NULL); 181 181 psStringAppend(&where, "\nAND %s", whereClause); 182 psStringAppend(&select, where);182 psStringAppend(&select, " %s", where); 183 183 psFree(whereClause); 184 184 psFree(skycalWhereMD); -
trunk/ippTools/src/remotetool.c
r36515 r36623 149 149 psFree(limitString); 150 150 } 151 if (!p_psDBRunQuery F(config->dbh, query)) {151 if (!p_psDBRunQuery(config->dbh, query)) { 152 152 psError(PS_ERR_UNKNOWN, false, "database error"); 153 153 psFree(query); … … 313 313 { 314 314 PS_ASSERT_PTR_NON_NULL(config, false); 315 PXOPT_LOOKUP_S64(remote_id, config->args, "-remote_id", true, false);315 // PXOPT_LOOKUP_S64(remote_id, config->args, "-remote_id", true, false); 316 316 317 317 psMetadata *where = psMetadataAlloc(); … … 341 341 { 342 342 PS_ASSERT_PTR_NON_NULL(config, false); 343 PXOPT_LOOKUP_S64(remote_id, config->args, "-remote_id", true, false);343 // PXOPT_LOOKUP_S64(remote_id, config->args, "-remote_id", true, false); 344 344 345 345 psMetadata *where = psMetadataAlloc();
Note:
See TracChangeset
for help on using the changeset viewer.
