Index: trunk/ippTools/src/difftool.c =================================================================== --- trunk/ippTools/src/difftool.c (revision 24140) +++ trunk/ippTools/src/difftool.c (revision 24174) @@ -40,5 +40,5 @@ static bool revertdiffskyfileMode(pxConfig *config); static bool definepoprunMode(pxConfig *config); -static bool definebyqueryMode(pxConfig *config); +static bool definewarpstackMode(pxConfig *config); static bool definewarpwarpMode(pxConfig *config); static bool pendingcleanuprunMode(pxConfig *config); @@ -79,5 +79,5 @@ MODECASE(DIFFTOOL_MODE_REVERTDIFFSKYFILE, revertdiffskyfileMode); MODECASE(DIFFTOOL_MODE_DEFINEPOPRUN, definepoprunMode); - MODECASE(DIFFTOOL_MODE_DEFINEBYQUERY, definebyqueryMode); + MODECASE(DIFFTOOL_MODE_DEFINEWARPSTACK, definewarpstackMode); MODECASE(DIFFTOOL_MODE_DEFINEWARPWARP, definewarpwarpMode); MODECASE(DIFFTOOL_MODE_PENDINGCLEANUPRUN, pendingcleanuprunMode); @@ -116,7 +116,8 @@ PXOPT_LOOKUP_STR(workdir, config->args, "-workdir", true, false); PXOPT_LOOKUP_STR(tess_id, config->args, "-tess_id", true, false); + PXOPT_LOOKUP_BOOL(bothways, config->args, "-bothways", false); + PXOPT_LOOKUP_BOOL(exposure, config->args, "-exposure", false); PXOPT_LOOKUP_STR(label, config->args, "-label", false, false); PXOPT_LOOKUP_STR(reduction, config->args, "-reduction", false, false); - PXOPT_LOOKUP_S64(exp_id, config->args, "-exp_id", false, false); // default @@ -133,5 +134,6 @@ registered, tess_id, - exp_id, + bothways, + exposure, false ); @@ -487,5 +489,4 @@ PXOPT_LOOKUP_S16(fault, config->args, "-fault", false, false); PXOPT_LOOKUP_S16(quality, config->args, "-quality", false, false); - PXOPT_LOOKUP_STR(uri, config->args, "-uri", (fault == 0), false); PXOPT_LOOKUP_STR(path_base, config->args, "-path_base", (fault == 0), false); @@ -521,5 +522,4 @@ diff_id, skycell_id, - uri, path_base, "full", @@ -771,5 +771,4 @@ psS64 template_warp_id, // Warp identifier for template image, PS_MAX_S64 for none psS64 template_stack_id, // Stack identifier for template image, PS_MAX_S64 for none - psS64 exp_id, // exposure id for input_warp_id (if defined) pxConfig *config // Configuration ) @@ -802,5 +801,6 @@ registered, tess_id, - exp_id, + false, + false, false // magicked ); @@ -882,5 +882,4 @@ PXOPT_LOOKUP_S64(input_warp_id, config->args, "-input_warp_id", false, false); PXOPT_LOOKUP_S64(input_stack_id, config->args, "-input_stack_id", false, false); - PXOPT_LOOKUP_S64(exp_id, config->args, "-exp_id", false, false); PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false); @@ -902,9 +901,4 @@ psError(PS_ERR_BAD_PARAMETER_VALUE, true, "No input has been defined (-input_stack_id or -input_warp_id)"); - return false; - } - if (input_warp_id && !exp_id) { - psError(PS_ERR_BAD_PARAMETER_VALUE, true, - "-exp_id is required with -input_warp_id."); return false; } @@ -917,5 +911,4 @@ template_warp_id ? template_warp_id : PS_MAX_S64, template_stack_id ? template_stack_id : PS_MAX_S64, - exp_id ? exp_id : PS_MAX_S64, config)) { psError(PS_ERR_UNKNOWN, false, "failed to create populated diffRun"); @@ -935,5 +928,5 @@ -static bool definebyqueryMode(pxConfig *config) +static bool definewarpstackMode(pxConfig *config) { PS_ASSERT_PTR_NON_NULL(config, false); @@ -960,7 +953,8 @@ PXOPT_LOOKUP_BOOL(reRun, config->args, "-rerun", false); PXOPT_LOOKUP_BOOL(available, config->args, "-available", false); + PXOPT_LOOKUP_BOOL(pretend, config->args, "-pretend", false); // find all things to queue - psString query = pxDataGet("difftool_definebyquery_part1.sql"); + psString query = pxDataGet("difftool_definewarpstack_part1.sql"); if (!query) { psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement"); @@ -1057,6 +1051,17 @@ } + if (pretend) { + // negative simple so the default is true + if (!ippdbPrintMetadatas(stdout, output, "diffRun", !simple)) { + psError(PS_ERR_UNKNOWN, false, "failed to print array"); + psFree(output); + return false; + } + psFree(output); + return true; + } + // create temporary table - query = pxDataGet("difftool_definebyquery_temp_create.sql"); + query = pxDataGet("difftool_definewarpstack_temp_create.sql"); if (!p_psDBRunQuery(config->dbh, query)) { psError(PS_ERR_UNKNOWN, false, "database error"); @@ -1070,5 +1075,5 @@ query = NULL; - psString skycell_query = pxDataGet("difftool_definebyquery_part2.sql"); + psString skycell_query = pxDataGet("difftool_definewarpstack_part2.sql"); psArray *list = psArrayAllocEmpty(16); // List of runs, to print @@ -1183,5 +1188,6 @@ registered, tess_id, - exp_id, + true, + false, false // magicked ); @@ -1284,5 +1290,7 @@ // Haversine formula for great circle distance PXOPT_COPY_F32(config->args, selectWhere, "-distance", - "DEGREES(2*ASIN(SQRT(POW(SIN(inputRawExp.decl - templateRawExp.decl),2) + COS(inputRawExp.decl)*COS(templateRawExp.decl)*POW(SIN(inputRawExp.ra - templateRawExp.ra),2))))", "<="); + "DEGREES(2*ASIN(SQRT(POW(SIN(inputRawExp.decl - templateRawExp.decl),2) + " + "COS(inputRawExp.decl)*COS(templateRawExp.decl)*" + "POW(SIN(inputRawExp.ra - templateRawExp.ra),2))))", "<="); PXOPT_LOOKUP_BOOL(backwards, config->args, "-backwards", false); @@ -1308,7 +1316,76 @@ PXOPT_LOOKUP_BOOL(pretend, config->args, "-pretend", false); + if (!psDBTransaction(config->dbh)) { + psError(PS_ERR_UNKNOWN, false, "database error"); + psFree(selectWhere); + psFree(insertWhere); + return false; + } + + if (!rerun) { + // Need to build table of exposures with diffs + psString tempCreate = pxDataGet("difftool_definewarpwarp_temp_create.sql"); // Create temp table SQL + if (!tempCreate) { + psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement"); + psFree(selectWhere); + psFree(insertWhere); + if (!psDBRollback(config->dbh)) { + psError(PS_ERR_UNKNOWN, false, "database error"); + } + return false; + } + + if (!p_psDBRunQuery(config->dbh, tempCreate)) { + psError(PS_ERR_UNKNOWN, false, "Unable to create temp table: %s", tempCreate); + psFree(tempCreate); + psFree(selectWhere); + psFree(insertWhere); + if (!psDBRollback(config->dbh)) { + psError(PS_ERR_UNKNOWN, false, "database error"); + } + return false; + } + psFree(tempCreate); + + psString tempInsert = pxDataGet("difftool_definewarpwarp_temp_insert.sql"); // Insert to temp table + if (!tempInsert) { + psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement"); + psFree(selectWhere); + psFree(insertWhere); + if (!psDBRollback(config->dbh)) { + psError(PS_ERR_UNKNOWN, false, "database error"); + } + return false; + } + + psString where = psStringCopy(""); // WHERE for insertion + if (label) { + psStringAppend(&where, "\nAND diffRun.label = '%s'", label); + } + + if (!p_psDBRunQueryF(config->dbh, tempInsert, where, where)) { + psError(PS_ERR_UNKNOWN, false, "Unable to insert into temp table: %s", tempInsert); + psFree(tempInsert); + psFree(where); + psFree(selectWhere); + psFree(insertWhere); + if (!psDBRollback(config->dbh)) { + psError(PS_ERR_UNKNOWN, false, "database error"); + } + return false; + } + psFree(where); + psFree(tempInsert); + } + + // Get list of warps to diff psString select = pxDataGet("difftool_definewarpwarp_select.sql"); if (!select) { psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement"); + psFree(selectWhere); + psFree(insertWhere); + if (!psDBRollback(config->dbh)) { + psError(PS_ERR_UNKNOWN, false, "database error"); + } return false; } @@ -1323,26 +1400,14 @@ psFree(selectWhere); - if (!rerun) { - psStringAppend(&whereClause, "\n%s (diffRun.diff_id IS NULL", whereClause ? "AND" : "WHERE"); - if (label) { - psStringAppend(&whereClause, " OR diffRun.label != '%s'", label); - } - psStringAppend(&whereClause, ")"); - } - if (!available) { psStringAppend(&whereClause, "\n%s inputWarpRun.state = 'full'", whereClause ? "AND" : "WHERE"); } - if (!psDBTransaction(config->dbh)) { - psError(PS_ERR_UNKNOWN, false, "database error"); - psFree(select); - psFree(whereClause); - psFree(insertWhere); - return false; + if (!rerun) { + psStringAppend(&whereClause, "\n%s diffs.diff_id IS NULL", whereClause ? "AND" : "WHERE"); } if (!p_psDBRunQueryF(config->dbh, select, - !rerun ? "\n" : "", // Activate LEFT JOIN against diffRun? + !rerun ? "\n" : "", // Activate LEFT JOIN against diffs? whereClause)) { psError(PS_ERR_UNKNOWN, false, "Unable to run query: %s [WITH] %s", select, whereClause); @@ -1414,9 +1479,8 @@ psMetadata *row = results->data[i]; // Result row from query - psS64 exp_id = psMetadataLookupS64(NULL, row, "input_exp_id"); psS64 input_id = psMetadataLookupS64(NULL, row, "input_warp_id"); const char *template = psMetadataLookupStr(NULL, row, "template_warp_id"); const char *tess_id = psMetadataLookupStr(NULL, row, "tess_id"); - if (!exp_id || !input_id || !template || !tess_id) { + if (!input_id || !template || !tess_id) { psError(PXTOOLS_ERR_PROG, false, "Identifiers not found"); psFree(list); @@ -1430,5 +1494,5 @@ diffRunRow *run = diffRunRowAlloc(0, "reg", workdir, label, reduction, NULL, registered, - tess_id, exp_id, false); // Run to insert + tess_id, true, true, false); // Run to insert if (!diffRunInsertObject(config->dbh, run)) { psError(PS_ERR_UNKNOWN, false, "database error"); Index: trunk/ippTools/src/difftool.h =================================================================== --- trunk/ippTools/src/difftool.h (revision 24140) +++ trunk/ippTools/src/difftool.h (revision 24174) @@ -34,5 +34,5 @@ DIFFTOOL_MODE_REVERTDIFFSKYFILE, DIFFTOOL_MODE_DEFINEPOPRUN, - DIFFTOOL_MODE_DEFINEBYQUERY, + DIFFTOOL_MODE_DEFINEWARPSTACK, DIFFTOOL_MODE_DEFINEWARPWARP, DIFFTOOL_MODE_PENDINGCLEANUPRUN, Index: trunk/ippTools/src/difftoolConfig.c =================================================================== --- trunk/ippTools/src/difftoolConfig.c (revision 24140) +++ trunk/ippTools/src/difftoolConfig.c (revision 24174) @@ -49,4 +49,6 @@ psMetadataAddStr(definerunArgs, PS_LIST_TAIL, "-workdir", 0, "define workdir (required)", NULL); psMetadataAddStr(definerunArgs, PS_LIST_TAIL, "-tess_id", 0, "define tessellation ID (required)", NULL); + psMetadataAddBool(definerunArgs, PS_LIST_TAIL, "-bothways", 0, "do the subtraction both ways?", false); + psMetadataAddBool(definerunArgs, PS_LIST_TAIL, "-exposure", 0, "subtraction for entire exposure?", false); psMetadataAddStr(definerunArgs, PS_LIST_TAIL, "-label", 0, "define label", NULL); psMetadataAddStr(definerunArgs, PS_LIST_TAIL, "-reduction", 0, "define reduction class", NULL); @@ -90,5 +92,4 @@ psMetadataAddS16(adddiffskyfileArgs, PS_LIST_TAIL, "-fault", 0, "set fault code", 0); psMetadataAddS16(adddiffskyfileArgs, PS_LIST_TAIL, "-quality", 0, "set quality", 0); - psMetadataAddStr(adddiffskyfileArgs, PS_LIST_TAIL, "-uri", 0, "define URI of file", 0); psMetadataAddStr(adddiffskyfileArgs, PS_LIST_TAIL, "-path_base", 0, "define base output location", 0); psMetadataAddF64(adddiffskyfileArgs, PS_LIST_TAIL, "-bg", 0, "define exposure background", NAN); @@ -142,5 +143,4 @@ psMetadataAddStr(definepoprunArgs, PS_LIST_TAIL, "-reduction", 0, "define reduction class", NULL); psMetadataAddBool(definepoprunArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); - psMetadataAddS64(definepoprunArgs, PS_LIST_TAIL, "-exp_id", 0, "define exposure ID for template", 0); psMetadataAddS64(definepoprunArgs, PS_LIST_TAIL, "-template_warp_id", 0, "define warp ID for template", 0); psMetadataAddS64(definepoprunArgs, PS_LIST_TAIL, "-template_stack_id", 0, "define stack ID for template", 0); @@ -148,22 +148,23 @@ psMetadataAddS64(definepoprunArgs, PS_LIST_TAIL, "-input_stack_id", 0, "define stack ID for input", 0); - // -definebyquery - psMetadata *definebyqueryArgs = psMetadataAlloc(); - psMetadataAddS64(definebyqueryArgs, PS_LIST_TAIL, "-warp_id", 0, "search by warp ID", 0); - psMetadataAddS64(definebyqueryArgs, PS_LIST_TAIL, "-exp_id", 0, "search by exposure ID", 0); - psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-skycell_id", 0, "search by skycell ID", NULL); - psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-tess_id", 0, "search by tess ID", NULL); - psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-filter", 0, "search by filter", NULL); - psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-stack_label", 0, "search by stack label", NULL); - psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-warp_label", 0, "search by warp label", NULL); - psMetadataAddF32(definebyqueryArgs, PS_LIST_TAIL, "-good_frac", 0, "minimum good fraction of skycell", NAN); - psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-workdir", 0, "define workdir (required)", NULL); - psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-label", 0, "define label", NULL); - psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-reduction", 0, "define reduction class", NULL); - psMetadataAddTime(definebyqueryArgs, PS_LIST_TAIL, "-registered", 0, "time detrend run was registered", now); - psMetadataAddBool(definebyqueryArgs, PS_LIST_TAIL, "-new-templates", 0, "also search for diffs with new template", false); - psMetadataAddBool(definebyqueryArgs, PS_LIST_TAIL, "-rerun", 0, "define new run even if one exists", false); - psMetadataAddBool(definebyqueryArgs, PS_LIST_TAIL, "-available", 0, "define new run even if warpRun has some faults", false); - psMetadataAddBool(definebyqueryArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); + // -definewarpstack + psMetadata *definewarpstackArgs = psMetadataAlloc(); + psMetadataAddS64(definewarpstackArgs, PS_LIST_TAIL, "-warp_id", 0, "search by warp ID", 0); + psMetadataAddS64(definewarpstackArgs, PS_LIST_TAIL, "-exp_id", 0, "search by exposure ID", 0); + psMetadataAddStr(definewarpstackArgs, PS_LIST_TAIL, "-skycell_id", 0, "search by skycell ID", NULL); + psMetadataAddStr(definewarpstackArgs, PS_LIST_TAIL, "-tess_id", 0, "search by tess ID", NULL); + psMetadataAddStr(definewarpstackArgs, PS_LIST_TAIL, "-filter", 0, "search by filter", NULL); + psMetadataAddStr(definewarpstackArgs, PS_LIST_TAIL, "-stack_label", 0, "search by stack label", NULL); + psMetadataAddStr(definewarpstackArgs, PS_LIST_TAIL, "-warp_label", 0, "search by warp label", NULL); + psMetadataAddF32(definewarpstackArgs, PS_LIST_TAIL, "-good_frac", 0, "minimum good fraction of skycell", NAN); + psMetadataAddStr(definewarpstackArgs, PS_LIST_TAIL, "-workdir", 0, "define workdir (required)", NULL); + psMetadataAddStr(definewarpstackArgs, PS_LIST_TAIL, "-label", 0, "define label", NULL); + psMetadataAddStr(definewarpstackArgs, PS_LIST_TAIL, "-reduction", 0, "define reduction class", NULL); + psMetadataAddTime(definewarpstackArgs, PS_LIST_TAIL, "-registered", 0, "time detrend run was registered", now); + psMetadataAddBool(definewarpstackArgs, PS_LIST_TAIL, "-new-templates", 0, "also search for diffs with new template", false); + psMetadataAddBool(definewarpstackArgs, PS_LIST_TAIL, "-rerun", 0, "define new run even if one exists", false); + psMetadataAddBool(definewarpstackArgs, PS_LIST_TAIL, "-available", 0, "define new run even if warpRun has some faults", false); + psMetadataAddBool(definewarpstackArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); + psMetadataAddBool(definewarpstackArgs, PS_LIST_TAIL, "-pretend", 0, "list results but to not queue", false); // -definewarpwarp @@ -239,5 +240,5 @@ PXOPT_ADD_MODE("-revertdiffskyfile","", DIFFTOOL_MODE_REVERTDIFFSKYFILE, revertdiffskyfileArgs); PXOPT_ADD_MODE("-definepoprun", "", DIFFTOOL_MODE_DEFINEPOPRUN, definepoprunArgs); - PXOPT_ADD_MODE("-definebyquery", "", DIFFTOOL_MODE_DEFINEBYQUERY, definebyqueryArgs); + PXOPT_ADD_MODE("-definewarpstack", "", DIFFTOOL_MODE_DEFINEWARPSTACK, definewarpstackArgs); PXOPT_ADD_MODE("-definewarpwarp", "", DIFFTOOL_MODE_DEFINEWARPWARP, definewarpwarpArgs); PXOPT_ADD_MODE("-pendingcleanuprun", "show runs that need to be cleaned up", DIFFTOOL_MODE_PENDINGCLEANUPRUN, pendingcleanuprunArgs); Index: trunk/ippTools/src/magictool.c =================================================================== --- trunk/ippTools/src/magictool.c (revision 24140) +++ trunk/ippTools/src/magictool.c (revision 24174) @@ -127,9 +127,12 @@ PXOPT_LOOKUP_TIME(registered, config->args, "-registered", false, false); PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false); - - psMetadata *where = psMetadataAlloc(); - PXOPT_COPY_S64(config->args, where, "-exp_id", "exp_id", "=="); - PXOPT_COPY_STR(config->args, where, "-diff_label", "diffRun.label", "=="); - + PXOPT_LOOKUP_BOOL(pretend, config->args, "-pretend", false); + + psMetadata *diffWhere = psMetadataAlloc(); // WHERE conditions for diffRuns + PXOPT_COPY_STR(config->args, diffWhere, "-diff_label", "diffRun.label", "=="); + PXOPT_COPY_S64(config->args, diffWhere, "-diff_id", "diff_id", "=="); + + psMetadata *queryWhere = psMetadataAlloc(); // WHERE conditions for everything else + PXOPT_COPY_S64(config->args, queryWhere, "-exp_id", "exp_id", "=="); // Get list of exposures ready to magic @@ -146,36 +149,46 @@ PXOPT_LOOKUP_BOOL(rerun, config->args, "-rerun", false); - psString queryWhere = NULL; // WHERE conditions for entire query + psString diffWhereStr = NULL; // WHERE conditions for diffRuns + psString queryWhereStr = NULL; // WHERE conditions for entire query if (!available) { - psStringAppend(&queryWhere, " \nWHERE diffRun.state = 'full'"); - } else { - // what if no skycells for the diff run completed? - } + psStringAppend(&diffWhereStr, "\nAND diffRun.state = 'full'"); + } + // what if no skycells for the diff run completed? + if (!rerun) { - const char *newWhere = " magic_id IS NULL"; // String to add - if (queryWhere) { - psStringAppend(&queryWhere, " AND %s", newWhere); - } else { - psStringAppend(&queryWhere, "\nWHERE %s", newWhere); - } - } + psStringAppend(&queryWhereStr, "\n%s magic_id IS NULL", queryWhereStr ? "AND" : "WHERE"); + } + // now add the user specified qualifiers - if (psListLength(where->list)) { - psString whereClause = psDBGenerateWhereConditionSQL(where, NULL); - psStringAppend(&queryWhere, "\n%s %s", queryWhere == NULL ? "WHERE" : "AND", whereClause); + if (psListLength(diffWhere->list)) { + psString whereClause = psDBGenerateWhereConditionSQL(diffWhere, NULL); + psStringAppend(&diffWhereStr, "\nAND %s", whereClause); psFree(whereClause); } - psFree(where); - if (!queryWhere) { - psStringAppend(&queryWhere, " "); - } - - if (!p_psDBRunQueryF(config->dbh, query, queryWhere)) { + if (psListLength(queryWhere->list)) { + psString whereClause = psDBGenerateWhereConditionSQL(queryWhere, NULL); + psStringAppend(&queryWhereStr, "\n%s %s", queryWhereStr ? "AND" : "WHERE", whereClause); + psFree(whereClause); + } + psFree(diffWhere); + psFree(queryWhere); + + // Ensure the WHERE strings have something + if (!diffWhereStr) { + diffWhereStr = psStringCopy(""); + } + if (!queryWhereStr) { + queryWhereStr = psStringCopy(""); + } + + if (!p_psDBRunQueryF(config->dbh, query, diffWhereStr, diffWhereStr, queryWhereStr)) { psError(PS_ERR_UNKNOWN, false, "database error"); - psFree(queryWhere); + psFree(diffWhereStr); + psFree(queryWhereStr); psFree(query); return false; } - psFree(queryWhere); + psFree(diffWhereStr); + psFree(queryWhereStr); psFree(query); } @@ -201,6 +214,18 @@ } + + if (pretend) { + // negative simple so the default is true + if (!ippdbPrintMetadatas(stdout, output, "diffRun", !simple)) { + psError(PS_ERR_UNKNOWN, false, "failed to print array"); + psFree(output); + return false; + } + psFree(output); + return true; + } + + // Parse the list of exposures ready to magic - if (!psDBTransaction(config->dbh)) { psError(PS_ERR_UNKNOWN, false, "database error"); @@ -215,7 +240,9 @@ psS64 exp_id = psMetadataLookupS64(NULL, row, "exp_id"); // Exposure identifier psS64 diff_id = psMetadataLookupS64(NULL, row, "diff_id"); // difference identifier + bool inverse = psMetadataLookupU64(NULL, row, "inverse"); // Inverse subtraction? Note types! // create a new magicRun for this group - magicRunRow *run = magicRunRowAlloc(0, exp_id, diff_id, "new", workdir, "dirty", label, dvodb, registered, 0); + magicRunRow *run = magicRunRowAlloc(0, exp_id, diff_id, inverse, "new", workdir, "dirty", label, + dvodb, registered, 0); if (!run) { psAbort("failed to alloc magicRun object"); @@ -296,4 +323,5 @@ // optional + PXOPT_LOOKUP_BOOL(inverse, config->args, "-inverse", false); PXOPT_LOOKUP_STR(label, config->args, "-label", false, false); PXOPT_LOOKUP_STR(dvodb, config->args, "-dvodb", false, false); @@ -305,4 +333,5 @@ exp_id, diff_id ? diff_id : PS_MAX_S64, + inverse, "reg", // state workdir, @@ -363,5 +392,4 @@ // required PXOPT_LOOKUP_S64(magic_id, config->args, "-magic_id", true, false); - PXOPT_LOOKUP_S64(diff_id, config->args, "-diff_id", true, false); PXOPT_LOOKUP_STR(node, config->args, "-node", true, false); @@ -369,5 +397,4 @@ config->dbh, magic_id, - diff_id, node ); @@ -563,5 +590,5 @@ PXOPT_COPY_S16(config->args, where, "-fault", "fault", "=="); - psString query = psStringCopy("UPDATE magicRun SET fault = 0, state = 'run' WHERE fault != 0"); + psString query = psStringCopy("UPDATE magicRun SET fault = 0, state = 'new' WHERE fault != 0"); if (psListLength(where->list)) { @@ -584,7 +611,13 @@ PS_ASSERT_PTR_NON_NULL(config, false); - psMetadata *where = psMetadataAlloc(); - PXOPT_COPY_S64(config->args, where, "-magic_id", "magic_id", "=="); - PXOPT_COPY_STR(config->args, where, "-node", "node", "=="); + // Regrettably, there are multiple WHERE hooks which call the same things different names + psMetadata *templatesWhere = psMetadataAlloc(); // WHERE for selecting template + psMetadata *magicWhere = psMetadataAlloc(); // WHERE for selecting magic runs + + PXOPT_COPY_S64(config->args, templatesWhere, "-magic_id", "magicRun.magic_id", "=="); + PXOPT_COPY_STR(config->args, templatesWhere, "-node", "diffInputSkyfile.skycell_id", "=="); + + PXOPT_COPY_S64(config->args, magicWhere, "-magic_id", "magicRun.magic_id", "=="); + PXOPT_COPY_STR(config->args, magicWhere, "-node", "magicTree.node", "=="); PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false); @@ -597,10 +630,20 @@ } - if (psListLength(where->list)) { - psString whereClause = psDBGenerateWhereConditionSQL(where, NULL); - psStringAppend(&query, " AND %s", whereClause); + psString templatesWhereStr = psStringCopy(""); // WHERE for selecting template + psString magicWhereStr = psStringCopy(""); // WHERE for selecting magic runs + + if (psListLength(templatesWhere->list)) { + psString whereClause = psDBGenerateWhereConditionSQL(templatesWhere, NULL); + psStringAppend(&templatesWhereStr, "\nAND %s", whereClause); psFree(whereClause); } - psFree(where); + psFree(templatesWhere); + + if (psListLength(magicWhere->list)) { + psString whereClause = psDBGenerateWhereConditionSQL(magicWhere, NULL); + psStringAppend(&magicWhereStr, "\nWHERE %s", whereClause); + psFree(whereClause); + } + psFree(magicWhere); // treat limit == 0 as "no limit" @@ -611,9 +654,15 @@ } - if (!p_psDBRunQuery(config->dbh, query)) { - psError(PS_ERR_UNKNOWN, false, "database error"); + if (!p_psDBRunQueryF(config->dbh, query, + templatesWhereStr, templatesWhereStr, + magicWhereStr, magicWhereStr)) { + psError(PS_ERR_UNKNOWN, false, "database error"); + psFree(templatesWhereStr); + psFree(magicWhereStr); psFree(query); return false; } + psFree(templatesWhereStr); + psFree(magicWhereStr); psFree(query); @@ -704,9 +753,9 @@ bool status = false; - psS32 done = psMetadataLookupS32(&status, data, "done"); + psS64 done = psMetadataLookupS64(&status, data, "done"); if (!status) { psAbort("failed to lookup value for done column"); } - psS16 bad = psMetadataLookupS16(&status, data, "bad"); + psS64 bad = psMetadataLookupS64(&status, data, "bad"); if (!status) { psAbort("failed to lookup value for bad column"); @@ -738,5 +787,5 @@ psMetadata *where = psMetadataAlloc(); - PXOPT_COPY_S64(config->args, where, "-magic_id", "magic_id", "=="); + PXOPT_COPY_S64(config->args, where, "-magic_id", "magicRun.magic_id", "=="); pxAddLabelSearchArgs (config, where, "-label", "magicRun.label", "=="); @@ -794,5 +843,5 @@ if (limit) { if (psArrayLength(output) >= limit) { - // we've found enough (not that limit was applied to the query so '> limit' won't happen) + // we've found enough (note that limit was applied to the query so '> limit' won't happen) // negative simple so the default is true if (!ippdbPrintMetadatas(stdout, output, "magicMe", !simple)) { @@ -936,5 +985,5 @@ // optional - PXOPT_LOOKUP_STR(uri, config->args, "-uri", false, false); + PXOPT_LOOKUP_STR(path_base, config->args, "-path_base", false, false); // default values @@ -944,5 +993,5 @@ magic_id, node, - uri, + path_base, fault )) { Index: trunk/ippTools/src/magictoolConfig.c =================================================================== --- trunk/ippTools/src/magictoolConfig.c (revision 24140) +++ trunk/ippTools/src/magictoolConfig.c (revision 24174) @@ -53,4 +53,5 @@ psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-dvodb", 0, "define dvodb", NULL); psMetadataAddTime(definebyqueryArgs, PS_LIST_TAIL, "-registered", 0, "time detrend run was registered", now); + psMetadataAddS64(definebyqueryArgs, PS_LIST_TAIL, "-diff_id", 0, "search diff_id", 0); psMetadataAddS64(definebyqueryArgs, PS_LIST_TAIL, "-exp_id", 0, "search exp_id", 0); psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-diff_label", 0, "select diff label", NULL); @@ -58,4 +59,5 @@ psMetadataAddBool(definebyqueryArgs, PS_LIST_TAIL, "-rerun", 0, "generate new run even if existing?", false); psMetadataAddBool(definebyqueryArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); + psMetadataAddBool(definebyqueryArgs, PS_LIST_TAIL, "-pretend", 0, "list results but do not queue", false); // -definerun @@ -65,4 +67,5 @@ // following argument is for compatability psMetadataAddS64(definerunArgs, PS_LIST_TAIL, "-diff_id", 0, "define diff_id", 0); + psMetadataAddBool(definerunArgs, PS_LIST_TAIL, "-inverse", 0, "use the inverse subtraction?", false); psMetadataAddStr(definerunArgs, PS_LIST_TAIL, "-label", 0, "define label", NULL); psMetadataAddStr(definerunArgs, PS_LIST_TAIL, "-dvodb", 0, "define dvodb", NULL); @@ -78,5 +81,4 @@ psMetadata *addinputskyfileArgs = psMetadataAlloc(); psMetadataAddS64(addinputskyfileArgs, PS_LIST_TAIL, "-magic_id", 0, "define magictool ID (required)", 0); - psMetadataAddS64(addinputskyfileArgs, PS_LIST_TAIL, "-diff_id", 0, "define difftool ID (required)", 0); psMetadataAddStr(addinputskyfileArgs, PS_LIST_TAIL, "-node", 0, "define symbolic node name (required)", NULL); @@ -125,5 +127,5 @@ psMetadataAddS64(addresultArgs, PS_LIST_TAIL, "-magic_id", 0, "define magictool ID (required)", 0); psMetadataAddStr(addresultArgs, PS_LIST_TAIL, "-node", 0, "define symbolic node name (required)", NULL); - psMetadataAddStr(addresultArgs, PS_LIST_TAIL, "-uri", 0, "define URI", NULL); + psMetadataAddStr(addresultArgs, PS_LIST_TAIL, "-path_base", 0, "define path_base", NULL); psMetadataAddS16(addresultArgs, PS_LIST_TAIL, "-fault", 0, "set fault code", 0);