Index: branches/haf_branches/ipp.20100512/ippTools/src/addtool.c =================================================================== --- branches/haf_branches/ipp.20100512/ippTools/src/addtool.c (revision 28171) +++ branches/haf_branches/ipp.20100512/ippTools/src/addtool.c (revision 28177) @@ -776,66 +776,16 @@ PXOPT_LOOKUP_STR(mergedvodb_path, config->args, "-set_mergedvodb_path", true, false); - - PXOPT_LOOKUP_STR(minidvodb_name, config->args, "-set_minidvodb_name", false, false); - - PXOPT_LOOKUP_STR(minidvodb_path, config->args, "-set_minidvodb_path", false, false); - + //optional + PXOPT_LOOKUP_STR(minidvodb_name, config->args, "-set_minidvodb_name", false, false); + PXOPT_LOOKUP_STR(minidvodb_path, config->args, "-set_minidvodb_path", false, false); PXOPT_LOOKUP_STR(state, config->args, "-set_state", false, false); - - if (!psDBTransaction(config->dbh)) { - psError(PS_ERR_UNKNOWN, false, "database error"); - - return false; - } - //psMetadata *where = psMetadataAlloc(); - - //PXOPT_COPY_S64(config->args, where, "-set_minidvodb_name", "minidvodb_name", "=="); - // PXOPT_COPY_S64(config->args, where, "-set_minidvodb_path", "minidvodb_path", "=="); - //PXOPT_COPY_STR(config->args, where, "-set_mergedvodb_path", "mergedvodb_path", "=="); - - - // psString query = NULL; - // psStringAppend(&query, "INSERT INTO minidvodbRun SET minidvodb_path = '%s' ,",minidvodb_path); - // if (minidvodb_name) {psStringAppend(&query, "minidvodb_name = '%s' ,",minidvodb_name);} - // psStringAppend(&query, "mergedvodb_path = '%s',",mergedvodb_path); - // if (minidvodb_path) {psStringAppend(&query, "minidvodb_group = '%s'",minidvodb_group);} - // if (state) { - // psStringAppend(&query, ",state = '%s';", state); - // } else { - // psStringAppend(&query, ",state = 'new';"); - // // } - - - //if (!query) { - // psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement"); - // return false; - // } - - //if (!p_psDBRunQuery(config->dbh, query)) { - // psError(PS_ERR_UNKNOWN, false, "database error %s", query); - // psFree(query); - // return false; - // } -// psFree(query); - -//psArray *output = p_psDBFetchResult(config->dbh); - // if (!output) { - // psError(PS_ERR_UNKNOWN, false, "database error"); - // return false; - // } -// if (!psArrayLength(output)) { - // psTrace("addtool", PS_LOG_INFO, "no rows found"); - // psFree(output); - // return true; - // } - //if (!psDBTransaction(config->dbh)) { - // psError(PS_ERR_UNKNOWN, false, "database error"); - // psFree(output); - // return false; - // // } + if (!psDBTransaction(config->dbh)) { + psError(PS_ERR_UNKNOWN, false, "database error"); + return false; + } + psString minidvodbpath = "NULL"; - - + // I don't know how to get around the complaints of minidvodb_path can't be null. this 'fixes' it, but someone smarter can fix it properly. if (minidvodb_path) { @@ -843,6 +793,6 @@ } -if (!minidvodbRunInsert(config->dbh, - 0, // job_id + if (!minidvodbRunInsert(config->dbh, + 0, // job_id minidvodb_name, minidvodb_group, @@ -852,51 +802,44 @@ 0 )) { - psError(PS_ERR_UNKNOWN, false, "database error"); - return false; - } + psError(PS_ERR_UNKNOWN, false, "database error"); + return false; + } - psU64 affected = psDBAffectedRows(config->dbh); - if (affected != 1) { - psError(PS_ERR_UNKNOWN, false, + psU64 affected = psDBAffectedRows(config->dbh); + if (affected != 1) { + psError(PS_ERR_UNKNOWN, false, "should have affected one row but %" PRIu64 " rows were modified", affected); - return false; - } - - psS64 minidvodb_id = psDBLastInsertID(config->dbh); - printf("%" PRId64 "\n", minidvodb_id); - - - if (!minidvodb_name) { - psStringAppend(&minidvodb_name, "%s.%" PRIu64,minidvodb_group,minidvodb_id); - } - - - - if (!minidvodb_path) { - psStringAppend(&minidvodb_path,"%s/%s",mergedvodb_path,minidvodb_name); - - } - - - psString query = NULL; - - psStringAppend(&query, "UPDATE minidvodbRun SET minidvodb_path = '%s', minidvodb_name = '%s' where minidvodb_id = %" PRIu64";", minidvodb_path, minidvodb_name, minidvodb_id); - - if (!p_psDBRunQuery(config->dbh, query)) { - psError(PS_ERR_UNKNOWN, false, "database error"); - psFree(query); - return false; - } - - - - if (!psDBCommit(config->dbh)) { - psError(PS_ERR_UNKNOWN, false, "database error"); - return false; - } - - - return true; + return false; + } + + psS64 minidvodb_id = psDBLastInsertID(config->dbh); + printf("%" PRId64 "\n", minidvodb_id); + + + if (!minidvodb_name) { + psStringAppend(&minidvodb_name, "%s.%" PRIu64,minidvodb_group,minidvodb_id); + } + + if (!minidvodb_path) { + psStringAppend(&minidvodb_path,"%s/%s",mergedvodb_path,minidvodb_name); + } + + psString query = NULL; + + psStringAppend(&query, "UPDATE minidvodbRun SET minidvodb_path = '%s', minidvodb_name = '%s' where minidvodb_id = %" PRIu64";", minidvodb_path, minidvodb_name, minidvodb_id); + + if (!p_psDBRunQuery(config->dbh, query)) { + psError(PS_ERR_UNKNOWN, false, "database error"); + psFree(query); + return false; + } + + if (!psDBCommit(config->dbh)) { + psError(PS_ERR_UNKNOWN, false, "database error"); + return false; + } + + return true; } @@ -920,7 +863,7 @@ if (!psListLength(where->list)) { - psFree(where); - psError(PXTOOLS_ERR_CONFIG, false, "search parameters are required"); - return false; + psFree(where); + psError(PXTOOLS_ERR_CONFIG, false, "search parameters are required"); + return false; } @@ -929,58 +872,50 @@ psString comma = ","; if (minidvodb_name) { - psStringAppend(&query, " minidvodb_name = '%s'", minidvodb_name); - cnt++; - } - -if (minidvodb_path) { - if (cnt) { - psStringAppend(&query,comma); - } - - psStringAppend(&query, " minidvodb_path = '%s'", minidvodb_path); - cnt++; -} - -if (state) { -if (cnt) { - psStringAppend(&query,comma); - } - psStringAppend(&query, " state = '%s'", state); - cnt++; - } - -if (mergedvodb_path) { -if (cnt) { - psStringAppend(&query,comma); - } - psStringAppend(&query, " mergedvodb_path = '%s'", mergedvodb_path); -cnt++; - } - -if (minidvodb_group) { -if (cnt) { - psStringAppend(&query,comma); - } - psStringAppend(&query, " minidvodb_group = '%s'", minidvodb_group); -cnt++; - } - - - - - // pxUpdateRun gets parameters from config->args and runs the update query + psStringAppend(&query, " minidvodb_name = '%s'", minidvodb_name); + cnt++; + } + + if (minidvodb_path) { + if (cnt) { + psStringAppend(&query,comma); + } + + psStringAppend(&query, " minidvodb_path = '%s'", minidvodb_path); + cnt++; + } + + if (state) { + if (cnt) { + psStringAppend(&query,comma); + } + psStringAppend(&query, " state = '%s'", state); + cnt++; + } + + if (mergedvodb_path) { + if (cnt) { + psStringAppend(&query,comma); + } + psStringAppend(&query, " mergedvodb_path = '%s'", mergedvodb_path); + cnt++; + } + + if (minidvodb_group) { + if (cnt) { + psStringAppend(&query,comma); + } + psStringAppend(&query, " minidvodb_group = '%s'", minidvodb_group); + cnt++; + } psString whereClause = psDBGenerateWhereConditionSQL(where, NULL); psStringAppend(&query, " WHERE %s", whereClause); - if (!p_psDBRunQuery(config->dbh, query)) { - psError(PS_ERR_UNKNOWN, false, "database error"); - psFree(query); - return false; - } - - - - + if (!p_psDBRunQuery(config->dbh, query)) { + psError(PS_ERR_UNKNOWN, false, "database error"); + psFree(query); + return false; + } + psFree(query); psFree(where); @@ -988,14 +923,12 @@ return true; - } static bool flipminidvodbrunMode(pxConfig *config) { PS_ASSERT_PTR_NON_NULL(config, false); - -psMetadata *where = psMetadataAlloc(); -PXOPT_LOOKUP_STR(minidvodb_group, config->args, "-minidvodb_group",true, false); - -PXOPT_COPY_STR(config->args, where, "-minidvodb_group", "minidvodb_group", "=="); + + psMetadata *where = psMetadataAlloc(); + PXOPT_LOOKUP_STR(minidvodb_group, config->args, "-minidvodb_group",true, false); + PXOPT_COPY_STR(config->args, where, "-minidvodb_group", "minidvodb_group", "=="); //this flips the new - > active @@ -1006,113 +939,82 @@ // start a transaction eraly so it will contain any row level locks - if (!psDBTransaction(config->dbh)) { - psError(PS_ERR_UNKNOWN, false, "database error"); - return false; - } - - - - - - psString firstquery = psStringCopy("SELECT * from minidvodbRun where state = 'new' and minidvodb_name is NOT NULL and minidvodb_group IS NOT NULL and minidvodb_path IS NOT NULL and mergedvodb_path IS NOT NULL"); - - psString firstwhereClause = psDBGenerateWhereConditionSQL(where, NULL); - psStringAppend(&firstquery, " AND %s", firstwhereClause); - - - - if (!p_psDBRunQuery(config->dbh, firstquery)) { - psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement"); - if (!psDBRollback(config->dbh)) { - psError(PS_ERR_UNKNOWN, false, "database error"); - } - return false; - - } - psFree(firstquery); + if (!psDBTransaction(config->dbh)) { + psError(PS_ERR_UNKNOWN, false, "database error"); + return false; + } + + psString firstquery = psStringCopy("SELECT * from minidvodbRun where state = 'new' and minidvodb_name is NOT NULL and minidvodb_group IS NOT NULL and minidvodb_path IS NOT NULL and mergedvodb_path IS NOT NULL"); + + psString firstwhereClause = psDBGenerateWhereConditionSQL(where, NULL); + psStringAppend(&firstquery, " AND %s", firstwhereClause); + + + + if (!p_psDBRunQuery(config->dbh, firstquery)) { + psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement"); + if (!psDBRollback(config->dbh)) { + psError(PS_ERR_UNKNOWN, false, "database error"); + } + return false; + } + psFree(firstquery); //we don't care what the stuff is that is found, just that there is stuff. This is a check to see that there is something in the 'new' state, before flipping (so that if there is nothing in new, it won't flip the active to waiting. the flipminidvo is just to make it easy to flip from new -> active. - psArray *output = p_psDBFetchResult(config->dbh); - if (!output) { - psError(PS_ERR_UNKNOWN, false, "database error"); - return false; - } - if (!psArrayLength(output)) { - psTrace("addtool", PS_LOG_INFO, "no rows found"); - psFree(output); - return true; - } - - - - - - - // psString query = psStringCopy("UPDATE minidvodbRun SET state = case when state = 'new' then 'active' else 'waiting' end WHERE state in ('new', 'active')"); -psString query = psStringCopy("UPDATE minidvodbRun SET state = 'waiting' WHERE state = 'active' "); - // pxUpdateRun gets parameters from config->args and runs the update query - psString whereClause = psDBGenerateWhereConditionSQL(where, NULL); - psStringAppend(&query, " AND %s", whereClause); - - - - - - - if (!p_psDBRunQuery(config->dbh, query)) { - psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement"); - if (!psDBRollback(config->dbh)) { - psError(PS_ERR_UNKNOWN, false, "database error"); - } - return false; - - - } - - //if (!psDBTransaction(config->dbh)) { - // psError(PS_ERR_UNKNOWN, false, "database error"); - // psFree(output); - // return false; - // } - - - - - -psString query2 = psStringCopy("UPDATE minidvodbRun SET state = 'active' WHERE state = 'new' AND minidvodb_name is NOT NULL and minidvodb_group IS NOT NULL and minidvodb_path IS NOT NULL and mergedvodb_path IS NOT NULL "); - - - psStringAppend(&query2, " AND minidvodb_group = '%s' limit 1;", minidvodb_group); - - - - if (!p_psDBRunQuery(config->dbh, query2)) { - psError(PS_ERR_UNKNOWN, false, "database error"); - if (!psDBRollback(config->dbh)) { - psError(PS_ERR_UNKNOWN, false, "database error"); - } - psFree(query); - return false; - - } - - - - - -if (!psDBCommit(config->dbh)) { - psError(PS_ERR_UNKNOWN, false, "database error"); - if (!psDBRollback(config->dbh)) { - psError(PS_ERR_UNKNOWN, false, "database error"); - } - psFree(query); + psArray *output = p_psDBFetchResult(config->dbh); + if (!output) { + psError(PS_ERR_UNKNOWN, false, "database error"); + return false; + } + if (!psArrayLength(output)) { + psTrace("addtool", PS_LOG_INFO, "no rows found"); + psFree(output); + return true; + } + + + //ok, there's something, so flip active -> waiting + + psString query = psStringCopy("UPDATE minidvodbRun SET state = 'waiting' WHERE state = 'active' "); + + psString whereClause = psDBGenerateWhereConditionSQL(where, NULL); + psStringAppend(&query, " AND %s", whereClause); + + + if (!p_psDBRunQuery(config->dbh, query)) { + psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement"); + if (!psDBRollback(config->dbh)) { + psError(PS_ERR_UNKNOWN, false, "database error"); + } + return false; + } + + + //now flip new -> active + psString query2 = psStringCopy("UPDATE minidvodbRun SET state = 'active' WHERE state = 'new' AND minidvodb_name is NOT NULL and minidvodb_group IS NOT NULL and minidvodb_path IS NOT NULL and mergedvodb_path IS NOT NULL "); + psStringAppend(&query2, " AND minidvodb_group = '%s' limit 1;", minidvodb_group); + if (!p_psDBRunQuery(config->dbh, query2)) { + psError(PS_ERR_UNKNOWN, false, "database error"); + if (!psDBRollback(config->dbh)) { + psError(PS_ERR_UNKNOWN, false, "database error"); + } + psFree(query); + return false; + } + + + if (!psDBCommit(config->dbh)) { + psError(PS_ERR_UNKNOWN, false, "database error"); + if (!psDBRollback(config->dbh)) { + psError(PS_ERR_UNKNOWN, false, "database error"); + } + psFree(query); return false; - } + } psFree(query2); - psFree(where); - - return true; - + psFree(where); + + return true; + } @@ -1121,4 +1023,6 @@ PS_ASSERT_PTR_NON_NULL(config, false); psMetadata *where = psMetadataAlloc(); + + //this checks to see if a minidvod_group/name is has completed addRun processing PXOPT_COPY_STR(config->args, where, "-minidvodb_group", "minidvodbRun.minidvodb_group", "=="); PXOPT_COPY_STR(config->args, where, "-minidvodb_name", "minidvodbRun.minidvodb_name", "=="); @@ -1128,4 +1032,5 @@ PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false); PXOPT_LOOKUP_BOOL(all_addrun_states, config->args, "-all_addrun_states", false); + //this doesn't care what state the addRun is in (useful for counting addRuns) PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false); @@ -1145,5 +1050,5 @@ if (psListLength(where->list)) { - psString whereClause = psDBGenerateWhereConditionSQL(where, NULL); + psString whereClause = psDBGenerateWhereConditionSQL(where, NULL); psStringAppend(&query, " WHERE %s", whereClause); psFree(whereClause); @@ -1160,33 +1065,29 @@ } - - - - -if (!p_psDBRunQuery(config->dbh, query)) { - psError(PS_ERR_UNKNOWN, false, "database error"); + + if (!p_psDBRunQuery(config->dbh, query)) { + psError(PS_ERR_UNKNOWN, false, "database error"); + psFree(query); + return false; + } psFree(query); - return false; - } -psFree(query); -psArray *output = p_psDBFetchResult(config->dbh); -if (!output) { - psError(PS_ERR_UNKNOWN, false, "database error"); - return false; - } -if (!psArrayLength(output)) { - psTrace("addtool", PS_LOG_INFO, "no rows found"); + psArray *output = p_psDBFetchResult(config->dbh); + if (!output) { + psError(PS_ERR_UNKNOWN, false, "database error"); + return false; + } + if (!psArrayLength(output)) { + psTrace("addtool", PS_LOG_INFO, "no rows found"); + psFree(output); + return true; + } + + if (!ippdbPrintMetadatas(stdout, output, "minidvodbRun", !simple)) { + psError(PS_ERR_UNKNOWN, false, "failed to print array"); + psFree(output); + return false; + } + psFree(output); - return true; - } - - if (!ippdbPrintMetadatas(stdout, output, "addProcessedExp", !simple)) { - psError(PS_ERR_UNKNOWN, false, "failed to print array"); - psFree(output); - return false; - } - - psFree(output); - return true; @@ -1199,143 +1100,38 @@ psMetadata *where = psMetadataAlloc(); - //PXOPT_LOOKUP_BOOL(finished_addrun, config->args, "-finished_addrun", false); - //if (finished_addrun) { //too many selects, and I couldn't figure out how to rename it - // PXOPT_COPY_STR(config->args, where, "-minidvodb_name", "minidbn", "=="); - // PXOPT_COPY_STR(config->args, where, "-minidvodb_group", "minidbg", "=="); - //} else { - PXOPT_COPY_STR(config->args, where, "-minidvodb_name", "minidvodbRun.minidvodb_name", "LIKE"); - PXOPT_COPY_STR(config->args, where, "-minidvodb_group", "minidvodbRun.minidvodb_group", "=="); - PXOPT_COPY_S64(config->args, where, "-minidvodb_id", "minidvodbRun.minidvodb_id", "=="); - //pxAddLabelSearchArgs (config, where, "-minidvodb_group", "addRun.minidvodb_group", "=="); - // } + PXOPT_COPY_STR(config->args, where, "-minidvodb_name", "minidvodbRun.minidvodb_name", "LIKE"); + PXOPT_COPY_STR(config->args, where, "-minidvodb_group", "minidvodbRun.minidvodb_group", "=="); + PXOPT_COPY_S64(config->args, where, "-minidvodb_id", "minidvodbRun.minidvodb_id", "=="); + PXOPT_COPY_STR(config->args, where, "-state", "minidvodbRun.state", "=="); PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false); - - PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false); - - - if (!psListLength(where->list)) { - psFree(where); - psError(PXTOOLS_ERR_CONFIG, false, "search parameters are required"); - return false; - } - - //there is a different starting query, depending on if it is limited to list minidvodbs with finished addRun processing or not. - psString query = NULL; -psString query1 = pxDataGet("addtool_find_minidvodbrun.sql"); -//psString query2 = pxDataGet("addtool_find_minidvodbrun2.sql"); -//if (finished_addrun) { -// psStringAppend(&query, "%s",query2); -//} else { - psStringAppend(&query, "%s",query1); - //} - //psString query = pxDataGet("addtool_find_minidvodbrun.sql"); - if (!query) { - psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement"); - return false; - } - - - - //if (finished_addrun) { //finished addrun does not need the WHERE - // if (psListLength(where->list)) { - // psString whereClause = psDBGenerateWhereConditionSQL(where, NULL); - // psStringAppend(&query, " AND %s", whereClause); - // psFree(whereClause); - // } } else { - if (psListLength(where->list)) { - psString whereClause = psDBGenerateWhereConditionSQL(where, NULL); - psStringAppend(&query, " WHERE %s", whereClause); - psFree(whereClause); - } - //} - - //if (!finished_addrun) { - //finished_addrun does not need this - // psStringAppend(&query, " %s", " GROUP BY minidvodbRun.minidvodb_name ORDER BY minidvodbRun.minidvodb_name "); - //} - - -if (limit) { - psString limitString = psDBGenerateLimitSQL(limit); - psStringAppend(&query, " %s", limitString); - psFree(limitString); - } - -// psError(PS_ERR_UNKNOWN, false, "%s", query); -//return false; + PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false); + + + if (!psListLength(where->list)) { + psFree(where); + psError(PXTOOLS_ERR_CONFIG, false, "search parameters are required"); + return false; + } - if (!p_psDBRunQuery(config->dbh, query)) { - psError(PS_ERR_UNKNOWN, false, "database error"); - psFree(query); - return false; - } - psFree(query); -psArray *output = p_psDBFetchResult(config->dbh); - if (!output) { - psError(PS_ERR_UNKNOWN, false, "database error"); - return false; - } - if (!psArrayLength(output)) { - psTrace("addtool", PS_LOG_INFO, "no rows found"); - psFree(output); - return true; - } - - if (!ippdbPrintMetadatas(stdout, output, "minidvodbRun", !simple)) { - psError(PS_ERR_UNKNOWN, false, "failed to print array"); - psFree(output); - return false; - } - - psFree(output); - - - -return true; -} - -static bool addminidvodbprocessedMode(pxConfig *config) { - -PS_ASSERT_PTR_NON_NULL(config, false); - - // required - PXOPT_LOOKUP_U64(minidvodb_id, config->args, "-minidvodb_id", true, false); - - // optional - PXOPT_LOOKUP_U64(merge_order, config->args, "-merge_order", false, false); - PXOPT_LOOKUP_F32(dtime_relphot, config->args, "-dtime_relphot", false, false); -PXOPT_LOOKUP_F32(dtime_resort, config->args, "-dtime_resort", false, false); -PXOPT_LOOKUP_F32(dtime_merge, config->args, "-dtime_merge", false, false); - PXOPT_LOOKUP_TIME(epoch, config->args, "-epoch", false, false); -PXOPT_LOOKUP_STR(mergedvodb_path, config->args, "-mergedvodb_path", true, false); -PXOPT_LOOKUP_STR(minidvodb_group, config->args, "-minidvodb_group", true, false); - - PXOPT_LOOKUP_S16(fault, config->args, "-fault", false, false); - //generate restrictions -psMetadata *where = psMetadataAlloc(); -PXOPT_COPY_S64(config->args, where, "-minidvodb_id", "minidvodbRun.minidvodb_id", "=="); - - - if (!psDBTransaction(config->dbh)) { - psError(PS_ERR_UNKNOWN, false, "database error"); - - return false; - } - - - psString query = pxDataGet("addtool_find_pendingmergeprocess.sql"); + psString query = pxDataGet("addtool_find_minidvodbrun.sql"); + if (!query) { psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement"); return false; } - // use psDBGenerateWhereSQL because the SQL yields an intermediate table + if (psListLength(where->list)) { - psString whereClaus = psDBGenerateWhereConditionSQL(where, NULL); - psStringAppend(&query, " AND %s", whereClaus); - psFree(whereClaus); - } - psFree(where); - + psString whereClause = psDBGenerateWhereConditionSQL(where, NULL); + psStringAppend(&query, " WHERE %s", whereClause); + psFree(whereClause); + } + + if (limit) { + psString limitString = psDBGenerateLimitSQL(limit); + psStringAppend(&query, " %s", limitString); + psFree(limitString); + } + if (!p_psDBRunQuery(config->dbh, query)) { psError(PS_ERR_UNKNOWN, false, "database error"); @@ -1343,6 +1139,6 @@ return false; } + psFree(query); - psArray *output = p_psDBFetchResult(config->dbh); if (!output) { @@ -1355,13 +1151,77 @@ return true; } - - //if (!psDBTransaction(config->dbh)) { - // psError(PS_ERR_UNKNOWN, false, "database error"); - // psFree(output); - // return false; - // } - minidvodbRunRow *pendingRow = minidvodbRunObjectFromMetadata(output->data[0]); - psFree(output); - minidvodbProcessedRow *row = minidvodbProcessedRowAlloc( + + if (!ippdbPrintMetadatas(stdout, output, "minidvodbRun", !simple)) { + psError(PS_ERR_UNKNOWN, false, "failed to print array"); + psFree(output); + return false; + } + + psFree(output); + +return true; +} + +static bool addminidvodbprocessedMode(pxConfig *config) { + + PS_ASSERT_PTR_NON_NULL(config, false); + + // required + PXOPT_LOOKUP_U64(minidvodb_id, config->args, "-minidvodb_id", true, false); + PXOPT_LOOKUP_STR(mergedvodb_path, config->args, "-mergedvodb_path", true, false); + PXOPT_LOOKUP_STR(minidvodb_group, config->args, "-minidvodb_group", true, false); + + // optional + PXOPT_LOOKUP_U64(merge_order, config->args, "-merge_order", false, false); + PXOPT_LOOKUP_F32(dtime_relphot, config->args, "-dtime_relphot", false, false); + PXOPT_LOOKUP_F32(dtime_resort, config->args, "-dtime_resort", false, false); + PXOPT_LOOKUP_F32(dtime_merge, config->args, "-dtime_merge", false, false); + PXOPT_LOOKUP_TIME(epoch, config->args, "-epoch", false, false); + PXOPT_LOOKUP_S16(fault, config->args, "-fault", false, false); + //generate restrictions + psMetadata *where = psMetadataAlloc(); + PXOPT_COPY_S64(config->args, where, "-minidvodb_id", "minidvodbRun.minidvodb_id", "=="); + + + if (!psDBTransaction(config->dbh)) { + psError(PS_ERR_UNKNOWN, false, "database error"); + return false; + } + + + psString query = pxDataGet("addtool_find_pendingmergeprocess.sql"); + if (!query) { + psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement"); + return false; + } + // use psDBGenerateWhereSQL because the SQL yields an intermediate table + if (psListLength(where->list)) { + psString whereClaus = psDBGenerateWhereConditionSQL(where, NULL); + psStringAppend(&query, " AND %s", whereClaus); + psFree(whereClaus); + } + psFree(where); + + if (!p_psDBRunQuery(config->dbh, query)) { + psError(PS_ERR_UNKNOWN, false, "database error"); + psFree(query); + return false; + } + psFree(query); + + psArray *output = p_psDBFetchResult(config->dbh); + if (!output) { + psError(PS_ERR_UNKNOWN, false, "database error"); + return false; + } + if (!psArrayLength(output)) { + psTrace("addtool", PS_LOG_INFO, "no rows found"); + psFree(output); + return true; + } + + minidvodbRunRow *pendingRow = minidvodbRunObjectFromMetadata(output->data[0]); + psFree(output); + minidvodbProcessedRow *row = minidvodbProcessedRowAlloc( pendingRow->minidvodb_id, merge_order, @@ -1374,105 +1234,113 @@ ); - if (!minidvodbProcessedInsertObject(config->dbh, row)) { - // rollback - if (!psDBRollback(config->dbh)) { - psError(PS_ERR_UNKNOWN, false, "database error"); - } - psError(PS_ERR_UNKNOWN, false, "database error"); - psFree(row); - psFree(pendingRow); - return false; - } - - // since there is only one exp per 'new' set addRun.state = 'full' + if (!minidvodbProcessedInsertObject(config->dbh, row)) { + // rollback + if (!psDBRollback(config->dbh)) { + psError(PS_ERR_UNKNOWN, false, "database error"); + } + psError(PS_ERR_UNKNOWN, false, "database error"); + psFree(row); + psFree(pendingRow); + return false; + } + + // since there is only one exp per 'new' set mindvodbRun.state = 'merging' + + psString query2 = NULL ; + psStringAppend(&query2, "UPDATE minidvodbRun SET state = 'merging' WHERE minidvodb_id = %'" PRIu64, row->minidvodb_id); - psString query2 = NULL ; - psStringAppend(&query2, "UPDATE minidvodbRun SET state = 'merging' WHERE minidvodb_id = %'" PRIu64, row->minidvodb_id); + if (!p_psDBRunQuery(config->dbh, query2)) { + // rollback + if (!psDBRollback(config->dbh)) { + psError(PS_ERR_UNKNOWN, false, "database error"); + } + psError(PS_ERR_UNKNOWN, false, "database error"); + psFree(query2); + return false; + } + + + + + //this finds the # of merged things (for the merge order) + psString query3 = NULL; + psStringAppend(&query3, "select count(*) from minidvodbRun join minidvodbProcessed using (minidvodb_id) where state = 'merged' and minidvodb_group = '%s';", minidvodb_group); + + if (!p_psDBRunQuery(config->dbh, query3)) { + // rollback + if (!psDBRollback(config->dbh)) { + psError(PS_ERR_UNKNOWN, false, "database error"); + } + psError(PS_ERR_UNKNOWN, false, "database error"); + psFree(query3); + return false; + } + psArray *output2 = p_psDBFetchResult(config->dbh); + if (!output2) { + psError(PS_ERR_UNKNOWN, false, "database error"); + return false; + } + if (!psArrayLength(output2)) { + psTrace("addtool", PS_LOG_INFO, "no rows found"); + psFree(output); + return true; + } + bool status; + psS64 m_order = psMetadataLookupS64(&status, output2->data[0], "count(*)"); + if (!status) { + + psAbort("failed to lookup value for count column"); + return false; + } + psString final = NULL; + psStringAppend(&final, "%" PRIu64, m_order); + //return false; + psFree(query3); + psFree(output2); + + + + //update the merge_order + + psString query4 = NULL; + psStringAppend(&query4, "update minidvodbProcessed set merge_order = %"PRIu64,m_order); + psStringAppend(&query4," where minidvodb_id = %" PRIu64, minidvodb_id); + printf("%s", query4); + if (!p_psDBRunQuery(config->dbh, query4)) { + // rollback + if (!psDBRollback(config->dbh)) { + psError(PS_ERR_UNKNOWN, false, "database error"); + } + psError(PS_ERR_UNKNOWN, false, "database error"); + psFree(query4); + return false; + } + // + + + psFree(query4); + psFree(row); + psFree(pendingRow); + + + + + + //commit the changes + if (!psDBCommit(config->dbh)) { + psError(PS_ERR_UNKNOWN, false, "database error"); + return false; + } - if (!p_psDBRunQuery(config->dbh, query2)) { - // rollback - if (!psDBRollback(config->dbh)) { - psError(PS_ERR_UNKNOWN, false, "database error"); - } - psError(PS_ERR_UNKNOWN, false, "database error"); - psFree(query2); - return false; - } - - //this finds the # of merged things (for the merge order) - psString query3 = NULL; - psStringAppend(&query3, "select count(*) from minidvodbRun join minidvodbProcessed using (minidvodb_id) where state = 'merged' and minidvodb_group = '%s';", minidvodb_group); - - if (!p_psDBRunQuery(config->dbh, query3)) { - // rollback - if (!psDBRollback(config->dbh)) { - psError(PS_ERR_UNKNOWN, false, "database error"); - } - psError(PS_ERR_UNKNOWN, false, "database error"); - psFree(query3); - return false; - } - psArray *output2 = p_psDBFetchResult(config->dbh); - if (!output2) { - psError(PS_ERR_UNKNOWN, false, "database error"); - return false; - } - if (!psArrayLength(output2)) { - psTrace("addtool", PS_LOG_INFO, "no rows found"); - psFree(output); - return true; - } - bool status; - psS64 m_order = psMetadataLookupS64(&status, output2->data[0], "count(*)"); - if (!status) { - - psAbort("failed to lookup value for count column"); - return false; - } - psString final = NULL; - psStringAppend(&final, "%" PRIu64, m_order); - printf("%s", final); - //return false; - - - - psFree(query3); - - - psFree(output2); - - - psString query4 = NULL; - psStringAppend(&query4, "update minidvodbProcessed set merge_order = %"PRIu64,m_order); - psStringAppend(&query4," where minidvodb_id = %" PRIu64, minidvodb_id); - printf("%s", query4); - if (!p_psDBRunQuery(config->dbh, query4)) { - // rollback - if (!psDBRollback(config->dbh)) { - psError(PS_ERR_UNKNOWN, false, "database error"); - } - psError(PS_ERR_UNKNOWN, false, "database error"); - psFree(query4); - return false; - } -// - - - psFree(query4); - psFree(row); - psFree(pendingRow); - - if (!psDBCommit(config->dbh)) { - psError(PS_ERR_UNKNOWN, false, "database error"); - return false; - } - - - printf("%s", final); - psFree(final); - - return true; -} - + + //print the merge_order (why not!) + printf("%s", final); + psFree(final); + + return true; +} + + + static bool listminidvodbprocessedMode(pxConfig *config) { psMetadata *where = psMetadataAlloc(); @@ -1520,7 +1388,4 @@ psFree(where); - - //psStringAppend(&query, " GROUP BY minidvodb_name"); - // order by epoch psStringAppend(&query, " ORDER BY minidvodb_id"); @@ -1563,22 +1428,25 @@ } + + static bool revertminidvodbprocessedMode(pxConfig *config) { psMetadata *where = psMetadataAlloc(); - PS_ASSERT_PTR_NON_NULL(config, false); - PXOPT_COPY_S64(config->args, where, "-minidvodb_id", "minidvodbProcessed.minidvodb_id", "=="); - PXOPT_COPY_STR(config->args, where, "-minidvodb_group", "addRun.minidvodb_group", "=="); - if (!psListLength(where->list) && !psMetadataLookupBool(NULL, config->args, "-all")) { - psFree(where); - psError(PXTOOLS_ERR_CONFIG, false, "search parameters are required"); - return false; - } - - if (!psDBTransaction(config->dbh)) { - psError(PS_ERR_UNKNOWN, false, "database error"); - psFree(where); - return false; - } - -{ + PS_ASSERT_PTR_NON_NULL(config, false); + PXOPT_COPY_S64(config->args, where, "-minidvodb_id", "minidvodbProcessed.minidvodb_id", "=="); + PXOPT_COPY_STR(config->args, where, "-minidvodb_group", "addRun.minidvodb_group", "=="); + + if (!psListLength(where->list) && !psMetadataLookupBool(NULL, config->args, "-all")) { + psFree(where); + psError(PXTOOLS_ERR_CONFIG, false, "search parameters are required"); + return false; + } + + if (!psDBTransaction(config->dbh)) { + psError(PS_ERR_UNKNOWN, false, "database error"); + psFree(where); + return false; + } + + { psString query = pxDataGet("addtool_reset_faulted_minidvodbruns.sql"); if (!query) { @@ -1587,150 +1455,144 @@ return false; } - + // use psDBGenerateWhereConditionalSQL with AND ... because the SQL ends in a WHERE - - if (where && psListLength(where->list)) { - psString whereClause = psDBGenerateWhereConditionSQL(where, NULL); - psStringAppend(&query, " AND %s", whereClause); - psFree(whereClause); - } - + + if (where && psListLength(where->list)) { + psString whereClause = psDBGenerateWhereConditionSQL(where, NULL); + psStringAppend(&query, " AND %s", whereClause); + psFree(whereClause); + } + if (!p_psDBRunQuery(config->dbh, query)) { - // rollback + // rollback if (!psDBRollback(config->dbh)) { - psError(PS_ERR_UNKNOWN, false, "database error"); - } - psError(PS_ERR_UNKNOWN, false, "database error"); - psFree(query); - psFree(where); - return false; + psError(PS_ERR_UNKNOWN, false, "database error"); + } + psError(PS_ERR_UNKNOWN, false, "database error"); + psFree(query); + psFree(where); + return false; } psFree(query); - } -{ - psString query = pxDataGet("addtool_revertminidvodbprocessed.sql"); - if (!query) { - // rollback - if (!psDBRollback(config->dbh)) { - psError(PS_ERR_UNKNOWN, false, "database error"); - } - psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement"); - psFree(where); + } + { + psString query = pxDataGet("addtool_revertminidvodbprocessed.sql"); + if (!query) { + // rollback + if (!psDBRollback(config->dbh)) { + psError(PS_ERR_UNKNOWN, false, "database error"); + } + psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement"); + psFree(where); + return false; + } + + // use psDBGenerateWhereConditionalSQL with AND ... because the SQL ends in a WHERE + if (where && psListLength(where->list)) { + psString whereClause = psDBGenerateWhereConditionSQL(where, NULL); + psStringAppend(&query, " AND %s", whereClause); + psFree(whereClause); + } + + if (!p_psDBRunQuery(config->dbh, query)) { + // rollback + if (!psDBRollback(config->dbh)) { + psError(PS_ERR_UNKNOWN, false, "database error"); + } + psError(PS_ERR_UNKNOWN, false, "database error"); + psFree(query); + psFree(where); return false; - } - - // use psDBGenerateWhereConditionalSQL with AND ... because the SQL ends in a WHERE - if (where && psListLength(where->list)) { - psString whereClause = psDBGenerateWhereConditionSQL(where, NULL); - psStringAppend(&query, " AND %s", whereClause); - psFree(whereClause); - } - - if (!p_psDBRunQuery(config->dbh, query)) { - // rollback - if (!psDBRollback(config->dbh)) { - psError(PS_ERR_UNKNOWN, false, "database error"); - } - psError(PS_ERR_UNKNOWN, false, "database error"); - psFree(query); - psFree(where); - return false; - } - psFree(query); - } - psFree(where); - - if (!psDBCommit(config->dbh)) { - psError(PS_ERR_UNKNOWN, false, "database error"); - return false; - } - - - -return true; -} + } + psFree(query); + } + psFree(where); + + if (!psDBCommit(config->dbh)) { + psError(PS_ERR_UNKNOWN, false, "database error"); + return false; + } + + return true; +} + + static bool updateminidvodbprocessedMode(pxConfig *config) { PS_ASSERT_PTR_NON_NULL(config, false); - - psMetadata *where = psMetadataAlloc(); - PXOPT_COPY_S64(config->args, where, "-minidvodb_id", "minidvodbProcessed.minidvodb_id", "=="); - PXOPT_LOOKUP_U64(minidvodb_id, config->args, "-minidvodb_id", true, false); - PXOPT_COPY_STR(config->args, where, "-minidvodb_name", "minidvodbRun.minidvodb_name", "=="); - - PXOPT_LOOKUP_U64(merge_order, config->args, "-set_merge_order", false, false); - PXOPT_LOOKUP_S16(fault, config->args, "-set_fault", false, false); - PXOPT_LOOKUP_F32(dtime_relphot, config->args, "-set_dtime_relphot", false, false); - PXOPT_LOOKUP_F32(dtime_resort, config->args, "-set_dtime_resort", false, false); - PXOPT_LOOKUP_F32(dtime_merge, config->args, "-set_dtime_merge", false, false); - - - - if (!psListLength(where->list)) { - psFree(where); - psError(PXTOOLS_ERR_CONFIG, false, "search parameters are required"); - return false; - } - - psString query = psStringCopy("UPDATE minidvodbProcessed JOIN minidvodbRun USING (minidvodb_id) SET "); - int cnt = 0; - psString comma = ","; - if (fault) { - psStringAppend(&query, " fault = %d", fault); + psMetadata *where = psMetadataAlloc(); + + PXOPT_LOOKUP_U64(minidvodb_id, config->args, "-minidvodb_id", true, false); + PXOPT_LOOKUP_U64(merge_order, config->args, "-set_merge_order", false, false); + PXOPT_LOOKUP_S16(fault, config->args, "-set_fault", false, false); + PXOPT_LOOKUP_F32(dtime_relphot, config->args, "-set_dtime_relphot", false, false); + PXOPT_LOOKUP_F32(dtime_resort, config->args, "-set_dtime_resort", false, false); + PXOPT_LOOKUP_F32(dtime_merge, config->args, "-set_dtime_merge", false, false); + + PXOPT_COPY_S64(config->args, where, "-minidvodb_id", "minidvodbProcessed.minidvodb_id", "=="); + PXOPT_COPY_STR(config->args, where, "-minidvodb_name", "minidvodbRun.minidvodb_name", "=="); + + + if (!psListLength(where->list)) { + psFree(where); + psError(PXTOOLS_ERR_CONFIG, false, "search parameters are required"); + return false; + } + + psString query = psStringCopy("UPDATE minidvodbProcessed JOIN minidvodbRun USING (minidvodb_id) SET "); + int cnt = 0; + psString comma = ","; + if (fault) { + psStringAppend(&query, " fault = %d", fault); cnt++; - } - -if (merge_order) { - if (cnt) { - psStringAppend(&query,comma); - } - - psStringAppend(&query, " merge_order = %" PRId64, merge_order); - cnt++; -} - -if (dtime_relphot) { -if (cnt) { - psStringAppend(&query,comma); - } - psStringAppend(&query, " dtime_relphot = %f", dtime_relphot); - cnt++; - } - -if (dtime_resort) { -if (cnt) { - psStringAppend(&query,comma); - } - psStringAppend(&query, " dtime_resort = %f", dtime_resort); -cnt++; - } - -if (dtime_merge) { -if (cnt) { - psStringAppend(&query,comma); - } - psStringAppend(&query, " dtime_merge = %f", dtime_merge); -cnt++; + } + + if (merge_order) { + if (cnt) { + psStringAppend(&query,comma); + } + + psStringAppend(&query, " merge_order = %" PRId64, merge_order); + cnt++; + } + + if (dtime_relphot) { + if (cnt) { + psStringAppend(&query,comma); + } + psStringAppend(&query, " dtime_relphot = %f", dtime_relphot); + cnt++; + } + + if (dtime_resort) { + if (cnt) { + psStringAppend(&query,comma); + } + psStringAppend(&query, " dtime_resort = %f", dtime_resort); + cnt++; + } + + if (dtime_merge) { + if (cnt) { + psStringAppend(&query,comma); + } + psStringAppend(&query, " dtime_merge = %f", dtime_merge); + cnt++; } - psString whereClause = psDBGenerateWhereConditionSQL(where, NULL); - psStringAppend(&query, " WHERE %s", whereClause); - - if (!p_psDBRunQuery(config->dbh, query)) { + psString whereClause = psDBGenerateWhereConditionSQL(where, NULL); + psStringAppend(&query, " WHERE %s", whereClause); + + if (!p_psDBRunQuery(config->dbh, query)) { psError(PS_ERR_UNKNOWN, false, "database error %s", query); - psFree(query); - return false; - } - - - - psFree(query); - psFree(where); - - - - -return true; -} - - + psFree(query); + return false; + } + + psFree(query); + psFree(where); + + return true; +} + + Index: branches/haf_branches/ipp.20100512/ippTools/src/addtoolConfig.c =================================================================== --- branches/haf_branches/ipp.20100512/ippTools/src/addtoolConfig.c (revision 28171) +++ branches/haf_branches/ipp.20100512/ippTools/src/addtoolConfig.c (revision 28177) @@ -86,4 +86,5 @@ psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-set_dist_group", 0, "define new dist_group", NULL); psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-set_note", 0, "define new note", NULL); + // -pendingexp psMetadata *pendingexpArgs = psMetadataAlloc(); @@ -155,19 +156,19 @@ // -updateminidvodbruns psMetadata *updateminidvodbrunArgs = psMetadataAlloc(); -psMetadataAddU64(updateminidvodbrunArgs, PS_LIST_TAIL, "-minidvodb_id", 0, "search by minidvodb_id ", 0); -psMetadataAddStr(updateminidvodbrunArgs, PS_LIST_TAIL, "-minidvodb_group", 0, "search by minidvodb_name (LIKE)", NULL); -psMetadataAddStr(updateminidvodbrunArgs, PS_LIST_TAIL, "-minidvodb_name", 0, "search by minidvodb_name (LIKE)", NULL); + psMetadataAddU64(updateminidvodbrunArgs, PS_LIST_TAIL, "-minidvodb_id", 0, "search by minidvodb_id ", 0); + psMetadataAddStr(updateminidvodbrunArgs, PS_LIST_TAIL, "-minidvodb_group", 0, "search by minidvodb_name (LIKE)", NULL); + psMetadataAddStr(updateminidvodbrunArgs, PS_LIST_TAIL, "-minidvodb_name", 0, "search by minidvodb_name (LIKE)", NULL); psMetadataAddStr(updateminidvodbrunArgs, PS_LIST_TAIL, "-minidvodb_path", 0, "search by path for minidvodb", NULL); psMetadataAddStr(updateminidvodbrunArgs, PS_LIST_TAIL, "-mergedvodb_path", 0, "search by path for the merged dvodb", NULL); - psMetadataAddStr(updateminidvodbrunArgs, PS_LIST_TAIL, "-state", 0, "search by state", NULL); -psMetadataAddStr(updateminidvodbrunArgs, PS_LIST_TAIL, "-set_minidvodb_name", 0, "define minidvodb_name", NULL); + psMetadataAddStr(updateminidvodbrunArgs, PS_LIST_TAIL, "-set_minidvodb_name", 0, "define minidvodb_name", NULL); psMetadataAddStr(updateminidvodbrunArgs, PS_LIST_TAIL, "-set_minidvodb_path", 0, "define path for minidvodb", NULL); psMetadataAddStr(updateminidvodbrunArgs, PS_LIST_TAIL, "-set_mergedvodb_path", 0, "define path for minidvodb", NULL); psMetadataAddStr(updateminidvodbrunArgs, PS_LIST_TAIL, "-set_minidvodb_group", 0, "define path for the merged dvodb", NULL); psMetadataAddStr(updateminidvodbrunArgs, PS_LIST_TAIL, "-set_state", 0, "define state", NULL); + // -listminidvodbrunArgs psMetadata *listminidvodbrunArgs = psMetadataAlloc(); -psMetadataAddU64(listminidvodbrunArgs, PS_LIST_TAIL, "-minidvodb_id", 0, "search by minidvodb_id", 0); + psMetadataAddU64(listminidvodbrunArgs, PS_LIST_TAIL, "-minidvodb_id", 0, "search by minidvodb_id", 0); psMetadataAddStr(listminidvodbrunArgs, PS_LIST_TAIL, "-minidvodb_name", 0, "search by minidvodb_name (LIKE)", NULL); psMetadataAddStr(listminidvodbrunArgs, PS_LIST_TAIL, "-minidvodb_group", 0, "search by minidvodb.minidvodb_group", NULL); @@ -175,6 +176,6 @@ psMetadataAddU64(listminidvodbrunArgs, PS_LIST_TAIL, "-limit", 0, "limit to N items", 0); psMetadataAddBool(listminidvodbrunArgs, PS_LIST_TAIL, "-simple", 0, "simple output", false); + //psMetadataAddBool(listminidvodbrunArgs, PS_LIST_TAIL, "-finished_addrun", 0, "limit to minidvodbs with completed addRuns (none in new state)", false); - psMetadata *flipminidvodbrunArgs = psMetadataAlloc(); psMetadataAddStr(flipminidvodbrunArgs, PS_LIST_TAIL, "-minidvodb_group", 0, "for the supplied minidvodb_group (required): flip the current 'new' to 'active', the current 'active' to 'waiting'", NULL); @@ -196,5 +197,5 @@ psMetadataAddTime(addminidvodbprocessedArgs, PS_LIST_TAIL, "-epoch", 0, "time merge is finished", NULL); psMetadataAddStr(addminidvodbprocessedArgs, PS_LIST_TAIL, "-mergedvodb_path",0, "path of merged dvodb", NULL); -psMetadataAddStr(addminidvodbprocessedArgs, PS_LIST_TAIL, "-minidvodb_group",0, "minidvodb_group", NULL); + psMetadataAddStr(addminidvodbprocessedArgs, PS_LIST_TAIL, "-minidvodb_group",0, "minidvodb_group", NULL); psMetadataAddS16(addminidvodbprocessedArgs, PS_LIST_TAIL, "-fault", 0, "set fault code", 0); @@ -236,5 +237,5 @@ PXOPT_ADD_MODE("-listminidvodbrun", "list minidvodbs", ADDTOOL_MODE_LISTMINIDVODBRUN, listminidvodbrunArgs); PXOPT_ADD_MODE("-flipminidvodbrun", "flip minidvodbs", ADDTOOL_MODE_FLIPMINIDVODBRUN, flipminidvodbrunArgs); - PXOPT_ADD_MODE("-checkminidvodbrunaddrun", "check minidvodbs to see if addRuns are completed", ADDTOOL_MODE_CHECKMINIDVODBRUNADDRUN, checkminidvodbrunaddrunArgs); + PXOPT_ADD_MODE("-checkminidvodbrunaddrun", "check minidvodbs to see if addRuns are completed", ADDTOOL_MODE_CHECKMINIDVODBRUNADDRUN, checkminidvodbrunaddrunArgs); PXOPT_ADD_MODE("-addminidvodbprocessed","add a processed minidvodb", ADDTOOL_MODE_ADDMINIDVODBPROCESSED, addminidvodbprocessedArgs); PXOPT_ADD_MODE("-listminidvodbprocessed","list processed minidvodbs", ADDTOOL_MODE_LISTMINIDVODBPROCESSED, listminidvodbprocessedArgs); @@ -243,5 +244,4 @@ -