Index: trunk/ippTools/src/regtool.c =================================================================== --- trunk/ippTools/src/regtool.c (revision 27358) +++ trunk/ippTools/src/regtool.c (revision 27388) @@ -82,7 +82,7 @@ MODECASE(REGTOOL_MODE_REVERTPROCESSEDEXP, revertprocessedexpMode); MODECASE(REGTOOL_MODE_UPDATEPROCESSEDEXP, updateprocessedexpMode); - MODECASE(REGTOOL_MODE_UPDATEBYQUERY, updatebyqueryMode); - MODECASE(REGTOOL_MODE_PENDINGCOMPRESSIMFILE, pendingcompressimfileMode); - MODECASE(REGTOOL_MODE_FINISHCOMPRESSEXP, finishcompressexpMode); + MODECASE(REGTOOL_MODE_UPDATEBYQUERY, updatebyqueryMode); + MODECASE(REGTOOL_MODE_PENDINGCOMPRESSIMFILE, pendingcompressimfileMode); + MODECASE(REGTOOL_MODE_FINISHCOMPRESSEXP, finishcompressexpMode); MODECASE(REGTOOL_MODE_CLEARDUPEXP, cleardupexpMode); MODECASE(REGTOOL_MODE_EXPORTRUN, exportrunMode); @@ -264,5 +264,5 @@ class_id, uri, - data_state, + data_state, exp_type, filelevel, @@ -505,5 +505,5 @@ PXOPT_LOOKUP_STR(set_md5sum, config->args, "-set_md5sum", false, false); PXOPT_LOOKUP_STR(set_state, config->args, "-set_state", false, false); - + if ((fault == INT16_MAX) && !isfinite(burntool_state) && !(set_state)) { psError(PS_ERR_UNKNOWN, false, "one of -fault or -burntool_state or -set_state must be selected"); @@ -526,9 +526,9 @@ return false; } - psFree (where); - return(true); + psFree (where); + return(true); } psFree (where); - + psString setvalues = NULL; if (burntool_state != INT16_MAX) { @@ -537,5 +537,5 @@ if (set_bytes != INT32_MAX) { if (setvalues) { - psStringAppend(&setvalues,","); + psStringAppend(&setvalues,","); } psStringAppend(&setvalues,"rawImfile.bytes = %d",set_bytes); @@ -543,5 +543,5 @@ if (set_md5sum) { if (setvalues) { - psStringAppend(&setvalues,","); + psStringAppend(&setvalues,","); } psStringAppend(&setvalues,"rawImfile.md5sum = '%s'",set_md5sum); @@ -549,9 +549,9 @@ if (set_state) { if (setvalues) { - psStringAppend(&setvalues,","); + psStringAppend(&setvalues,","); } psStringAppend(&setvalues,"rawImfile.data_state = '%s'",set_state); } - + psString query = pxDataGet("regtool_updateprocessedimfile.sql"); if (!query) { @@ -587,6 +587,6 @@ PXOPT_LOOKUP_BOOL(clean, config->args, "-clean", false); - if ((compress && clean)||(!compress & !clean)) { - psStringAppend(&whereClause, "\n AND ((data_state = 'goto_compressed' AND state = 'goto_compressed')\n OR (data_state = 'goto_lossy' AND state = 'goto_lossy')) "); + if ((compress && clean) || (!compress && !clean)) { + psStringAppend(&whereClause, "\n AND ((data_state = 'goto_compressed' AND state = 'goto_compressed')\n OR (data_state = 'goto_lossy' AND state = 'goto_lossy')) "); } else if (compress) { @@ -598,14 +598,14 @@ else { psStringAppend(&whereClause, "\n AND ((data_state = 'goto_compressed' AND state = 'goto_compressed')\n OR (data_state = 'goto_lossy' AND state = 'goto_lossy')) "); - } - + } + PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false); PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false); - + psString query = pxDataGet("regtool_pendingcompressimfile.sql"); if (!query) { psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement"); return(false); - } + } psString limitString = NULL; if (limit) { @@ -626,5 +626,5 @@ psFree(whereClause); psFree(where); - + psArray *output = p_psDBFetchResult(config->dbh); if (!output) { @@ -638,5 +638,5 @@ psError(PXTOOLS_ERR_PROG, false, "unknown error"); } - + return false; } @@ -646,5 +646,5 @@ return true; } - + // negate simple so the default is true if (!ippdbPrintMetadatas(stdout, output, "regPendingCompressImfile", !simple)) { @@ -653,10 +653,10 @@ return false; } - + psFree(output); - + return true; } - + static bool pendingexpMode(pxConfig *config) @@ -1091,5 +1091,5 @@ PXOPT_COPY_F32(config->args, where, "-sun_angle_min", "sun_angle", ">="); PXOPT_COPY_F32(config->args, where, "-sun_angle_max", "sun_angle", "<"); - + psString where2 = NULL; if (!pxmagicAddWhere(config, &where2, "rawExp")) { @@ -1105,12 +1105,12 @@ PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false); PXOPT_LOOKUP_BOOL(faulted, config->args, "-faulted", false); - + if (psListLength(where->list)) { psString whereClause = psDBGenerateWhereConditionSQL(where, "rawExp"); psStringAppend(&query, " AND %s", whereClause); psFree(whereClause); - } + } psFree(where); - + if (where2) { psStringAppend(&query, " %s ", where2); @@ -1125,5 +1125,5 @@ psStringAppend(&query, " %s", "AND rawExp.fault = 0"); } - + // treat limit == 0 as "no limit" if (limit) { @@ -1132,5 +1132,5 @@ psFree(limitString); } - + if (!p_psDBRunQuery(config->dbh, query)) { psError(PS_ERR_UNKNOWN, false, "database error"); @@ -1138,5 +1138,5 @@ } psFree(query); - + psArray *output = p_psDBFetchResult(config->dbh); if (!output) { @@ -1144,11 +1144,11 @@ switch (err) { case PS_ERR_DB_CLIENT: - psError(PXTOOLS_ERR_SYS, false, "database error"); + psError(PXTOOLS_ERR_SYS, false, "database error"); case PS_ERR_DB_SERVER: - psError(PXTOOLS_ERR_PROG, false, "database error"); + psError(PXTOOLS_ERR_PROG, false, "database error"); default: - psError(PXTOOLS_ERR_PROG, false, "unknown error"); + psError(PXTOOLS_ERR_PROG, false, "unknown error"); } - + return false; } @@ -1158,16 +1158,16 @@ return true; } - + if (psArrayLength(output)) { // negative simple so the default is true if (!ippdbPrintMetadatas(stdout, output, "rawExp", !simple)) { - psError(PS_ERR_UNKNOWN, false, "failed to print array"); - psFree(output); - return false; + psError(PS_ERR_UNKNOWN, false, "failed to print array"); + psFree(output); + return false; } } - + psFree(output); - + return true; } @@ -1176,5 +1176,5 @@ { PS_ASSERT_PTR_NON_NULL(config, false); - + psMetadata *where = psMetadataAlloc(); PXOPT_COPY_S64(config->args, where, "-exp_id", "exp_id", "=="); @@ -1182,5 +1182,5 @@ PXOPT_COPY_S64(config->args, where, "-exp_id_begin", "exp_id", ">="); PXOPT_COPY_S64(config->args, where, "-exp_id_end", "exp_id", "<="); - + psString query = pxDataGet("regtool_revertprocessedexp.sql"); if (!query) { @@ -1189,5 +1189,5 @@ return false; } - + if (psListLength(where->list)) { psString whereClause = psDBGenerateWhereConditionSQL(where, "rawExp"); @@ -1200,5 +1200,5 @@ } psFree(where); - + if (!p_psDBRunQuery(config->dbh, query)) { psError(PS_ERR_UNKNOWN, false, "database error"); @@ -1207,9 +1207,9 @@ } psFree(query); - + int numUpdated = psDBAffectedRows(config->dbh); - + psLogMsg("regtool", PS_LOG_INFO, "Updated %d rawExp", numUpdated); - + return true; } @@ -1219,10 +1219,10 @@ { PS_ASSERT_PTR_NON_NULL(config, false); - + psMetadata *where = psMetadataAlloc(); PXOPT_COPY_S64(config->args, where, "-exp_id", "exp_id", "=="); - + PXOPT_LOOKUP_S16(fault, config->args, "-fault", true, false); - + if (!pxSetFaultCode(config->dbh, "rawExp", where, fault)) { psError(PS_ERR_UNKNOWN, false, "failed to set set fault flag"); @@ -1231,5 +1231,5 @@ } psFree(where); - + return true; } @@ -1237,14 +1237,14 @@ static bool finishcompressexpMode(pxConfig *config) { - + PS_ASSERT_PTR_NON_NULL(config, false); - + PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false); - + psMetadata *where = psMetadataAlloc(); PXOPT_COPY_S64(config->args, where, "-exp_id", "exp_id", "=="); - + PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false); - + psString query = pxDataGet("regtool_finishcompressexp.sql"); if (!query) { @@ -1258,5 +1258,5 @@ } psFree(where); - + if (limit) { psString limitString = psDBGenerateLimitSQL(limit); @@ -1272,5 +1272,5 @@ } psFree(query); - + psArray *output = p_psDBFetchResult(config->dbh); if (!output) { @@ -1283,8 +1283,8 @@ return(true); } - + for (long i = 0; i < psArrayLength(output); i++) { psMetadata *md = output->data[i]; - + rawExpRow *row = rawExpObjectFromMetadata(md); if (!psDBTransaction(config->dbh)) { @@ -1292,19 +1292,19 @@ return(false); } - + if (strcmp(row->state,"goto_compressed") == 0) { if (!pxrawExpSetState(config,row->exp_id, "compressed")) { - psError(PS_ERR_UNKNOWN, false, "failed to set rawExp.state for exp_id: %" PRId64, row->exp_id); - psFree(row); - psFree(output); - return(false); + psError(PS_ERR_UNKNOWN, false, "failed to set rawExp.state for exp_id: %" PRId64, row->exp_id); + psFree(row); + psFree(output); + return(false); } } else if (strcmp(row->state,"goto_lossy") == 0) { if (!pxrawExpSetState(config,row->exp_id, "lossy")) { - psError(PS_ERR_UNKNOWN, false, "failed to set rawExp.state for exp_id: %" PRId64, row->exp_id); - psFree(row); - psFree(output); - return(false); + psError(PS_ERR_UNKNOWN, false, "failed to set rawExp.state for exp_id: %" PRId64, row->exp_id); + psFree(row); + psFree(output); + return(false); } } @@ -1315,5 +1315,5 @@ psFree(row); } - + psFree(output); return(true); @@ -1324,5 +1324,5 @@ PXOPT_LOOKUP_STR(set_state, config->args, "-set_state", true, false); - + // XX test this out; need to make this consistent with the list in regtoolConfig.c psMetadata *where = psMetadataAlloc(); @@ -1399,5 +1399,5 @@ psFree(query); // Now up date the exposure. - query = pxDataGet("regtool_updatebyquery.sql"); + query = pxDataGet("regtool_updatebyquery.sql"); if (!query) { psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement"); @@ -1412,14 +1412,14 @@ return(false); } - + psFree(limitString); psFree(query); psFree(whereClause); psFree(where); - + return true; } - + static bool cleardupexpMode(pxConfig *config)