Index: /trunk/ippTools/src/difftool.c =================================================================== --- /trunk/ippTools/src/difftool.c (revision 11984) +++ /trunk/ippTools/src/difftool.c (revision 11985) @@ -33,9 +33,9 @@ static bool definerunMode(pxConfig *config); static bool updaterunMode(pxConfig *config); -static bool addinputscfileMode(pxConfig *config); -static bool inputscfileMode(pxConfig *config); -static bool todiffscfileMode(pxConfig *config); -static bool adddiffscfileMode(pxConfig *config); -static bool diffscfileMode(pxConfig *config); +static bool addinputskyfileMode(pxConfig *config); +static bool inputskyfileMode(pxConfig *config); +static bool todiffskyfileMode(pxConfig *config); +static bool adddiffskyfileMode(pxConfig *config); +static bool diffskyfileMode(pxConfig *config); static bool setp5RunState(pxConfig *config, const char *p4_id, const char *state); @@ -61,9 +61,9 @@ MODECASE(P5TOOL_MODE_DEFINERUN, definerunMode); MODECASE(P5TOOL_MODE_UPDATERUN, updaterunMode); - MODECASE(P5TOOL_MODE_ADDINPUTSCFILE, addinputscfileMode); - MODECASE(P5TOOL_MODE_INPUTSCFILE, inputscfileMode); - MODECASE(P5TOOL_MODE_TODIFFSCFILE, todiffscfileMode); - MODECASE(P5TOOL_MODE_ADDDIFFSCFILE, adddiffscfileMode); - MODECASE(P5TOOL_MODE_DIFFSCFILE, diffscfileMode); + MODECASE(P5TOOL_MODE_ADDINPUTSKYFILE, addinputskyfileMode); + MODECASE(P5TOOL_MODE_INPUTSKYFILE, inputskyfileMode); + MODECASE(P5TOOL_MODE_TODIFFSKYFILE, todiffskyfileMode); + MODECASE(P5TOOL_MODE_ADDDIFFSKYFILE, adddiffskyfileMode); + MODECASE(P5TOOL_MODE_DIFFSKYFILE, diffskyfileMode); default: psAbort("invalid option (this should not happen)"); @@ -219,5 +219,5 @@ -static bool addinputscfileMode(pxConfig *config) +static bool addinputskyfileMode(pxConfig *config) { PS_ASSERT_PTR_NON_NULL(config, false); @@ -280,5 +280,5 @@ // XXX instead of validiting it here we should just use forgein key // constrants - if (!p5InputScfileInsert(config->dbh, + if (!p5InputSkyfileInsert(config->dbh, (psS32)atoi(p5_id), (psS32)atoi(p4_id), @@ -296,5 +296,5 @@ -static bool inputscfileMode(pxConfig *config) +static bool inputskyfileMode(pxConfig *config) { PS_ASSERT_PTR_NON_NULL(config, false); @@ -310,13 +310,13 @@ psString query = psStringCopy( "SELECT\n" - " p4Scfile.*,\n" - " p5InputScfile.template\n" + " p4Skyfile.*,\n" + " p5InputSkyfile.template\n" " FROM p5Run\n" - " JOIN p5InputScfile\n" + " JOIN p5InputSkyfile\n" " USING(p5_id)\n" - " JOIN p4Scfile\n" - " ON p5InputScfile.p4_id = p4Scfile.p4_id\n" - " AND p5InputScfile.skycell_id = p4Scfile.skycell_id\n" - " AND p5InputScfile.tess_id = p4Scfile.tess_id\n" + " JOIN p4Skyfile\n" + " ON p5InputSkyfile.p4_id = p4Skyfile.p4_id\n" + " AND p5InputSkyfile.skycell_id = p4Skyfile.skycell_id\n" + " AND p5InputSkyfile.tess_id = p4Skyfile.tess_id\n" " WHERE\n" " p5Run.state = 'run'\n" @@ -324,5 +324,5 @@ if (config->where) { - psString whereClause = psDBGenerateWhereConditionSQL(config->where, "p5InputScfile"); + psString whereClause = psDBGenerateWhereConditionSQL(config->where, "p5InputSkyfile"); psStringAppend(&query, " AND %s", whereClause); psFree(whereClause); @@ -358,5 +358,5 @@ } if (!psArrayLength(output)) { - psError(PS_ERR_UNKNOWN, false, "no p5InputScfile rows found"); + psError(PS_ERR_UNKNOWN, false, "no p5InputSkyfile rows found"); psFree(output); return true; @@ -375,5 +375,5 @@ if (psArrayLength(output)) { // negative simple so the default is true - if (!ippdbPrintMetadatas(stdout, output, "p5InputScfile", !simple)) { + if (!ippdbPrintMetadatas(stdout, output, "p5InputSkyfile", !simple)) { psError(PS_ERR_UNKNOWN, false, "failed to print array"); psFree(output); @@ -388,5 +388,5 @@ -static bool todiffscfileMode(pxConfig *config) +static bool todiffskyfileMode(pxConfig *config) { PS_ASSERT_PTR_NON_NULL(config, false); @@ -404,19 +404,19 @@ " p5Run.p5_id\n" " FROM p5Run\n" - " JOIN p5InputScfile\n" + " JOIN p5InputSkyfile\n" " USING(p5_id)\n" - " JOIN p4Scfile\n" - " ON p5InputScfile.p4_id = p4Scfile.p4_id\n" - " AND p5InputScfile.skycell_id = p4Scfile.skycell_id\n" - " AND p5InputScfile.tess_id = p4Scfile.tess_id\n" - " LEFT JOIN p5DiffScfile\n" - " ON p5InputScfile.p5_id = p5DiffScfile.p5_id\n" + " JOIN p4Skyfile\n" + " ON p5InputSkyfile.p4_id = p4Skyfile.p4_id\n" + " AND p5InputSkyfile.skycell_id = p4Skyfile.skycell_id\n" + " AND p5InputSkyfile.tess_id = p4Skyfile.tess_id\n" + " LEFT JOIN p5DiffSkyfile\n" + " ON p5InputSkyfile.p5_id = p5DiffSkyfile.p5_id\n" " WHERE\n" " p5Run.state = 'run'\n" - " AND p5DiffScfile.p5_id IS NULL\n" + " AND p5DiffSkyfile.p5_id IS NULL\n" ); if (config->where) { - psString whereClause = psDBGenerateWhereConditionSQL(config->where, "p5Scfile"); + psString whereClause = psDBGenerateWhereConditionSQL(config->where, "p5Skyfile"); psStringAppend(&query, " AND %s", whereClause); psFree(whereClause); @@ -452,5 +452,5 @@ } if (!psArrayLength(output)) { - psError(PS_ERR_UNKNOWN, false, "no p5Scfile rows found"); + psError(PS_ERR_UNKNOWN, false, "no p5Skyfile rows found"); psFree(output); return true; @@ -469,5 +469,5 @@ if (psArrayLength(output)) { // negative simple so the default is true - if (!ippdbPrintMetadatas(stdout, output, "p5Scfile", !simple)) { + if (!ippdbPrintMetadatas(stdout, output, "p5Skyfile", !simple)) { psError(PS_ERR_UNKNOWN, false, "failed to print array"); psFree(output); @@ -482,5 +482,5 @@ -static bool adddiffscfileMode(pxConfig *config) +static bool adddiffskyfileMode(pxConfig *config) { PS_ASSERT_PTR_NON_NULL(config, false); @@ -521,5 +521,5 @@ - if (!p5DiffScfileInsert(config->dbh, + if (!p5DiffSkyfileInsert(config->dbh, (psS32)atoi(p5_id), uri, @@ -535,5 +535,5 @@ -static bool diffscfileMode(pxConfig *config) +static bool diffskyfileMode(pxConfig *config) { PS_ASSERT_PTR_NON_NULL(config, false); @@ -551,7 +551,7 @@ " p5Run.skycell_id,\n" " p5Run.tess_id,\n" - " p5DiffScfile.*\n" + " p5DiffSkyfile.*\n" " FROM p5Run\n" - " JOIN p5DiffScfile\n" + " JOIN p5DiffSkyfile\n" " USING(p5_id)\n" " WHERE\n" @@ -560,5 +560,5 @@ if (config->where) { - psString whereClause = psDBGenerateWhereConditionSQL(config->where, "p5DiffScfile"); + psString whereClause = psDBGenerateWhereConditionSQL(config->where, "p5DiffSkyfile"); psStringAppend(&query, " AND %s", whereClause); psFree(whereClause); @@ -594,5 +594,5 @@ } if (!psArrayLength(output)) { - psError(PS_ERR_UNKNOWN, false, "no p5DiffScfile rows found"); + psError(PS_ERR_UNKNOWN, false, "no p5DiffSkyfile rows found"); psFree(output); return true; @@ -611,5 +611,5 @@ if (psArrayLength(output)) { // negative simple so the default is true - if (!ippdbPrintMetadatas(stdout, output, "p5DiffScfile", !simple)) { + if (!ippdbPrintMetadatas(stdout, output, "p5DiffSkyfile", !simple)) { psError(PS_ERR_UNKNOWN, false, "failed to print array"); psFree(output); Index: /trunk/ippTools/src/difftool.h =================================================================== --- /trunk/ippTools/src/difftool.h (revision 11984) +++ /trunk/ippTools/src/difftool.h (revision 11985) @@ -27,9 +27,9 @@ P5TOOL_MODE_DEFINERUN, P5TOOL_MODE_UPDATERUN, - P5TOOL_MODE_ADDINPUTSCFILE, - P5TOOL_MODE_INPUTSCFILE, - P5TOOL_MODE_TODIFFSCFILE, - P5TOOL_MODE_ADDDIFFSCFILE, - P5TOOL_MODE_DIFFSCFILE, + P5TOOL_MODE_ADDINPUTSKYFILE, + P5TOOL_MODE_INPUTSKYFILE, + P5TOOL_MODE_TODIFFSKYFILE, + P5TOOL_MODE_ADDDIFFSKYFILE, + P5TOOL_MODE_DIFFSKYFILE, } p5toolMode; Index: /trunk/ippTools/src/difftoolConfig.c =================================================================== --- /trunk/ippTools/src/difftoolConfig.c (revision 11984) +++ /trunk/ippTools/src/difftoolConfig.c (revision 11985) @@ -73,69 +73,69 @@ #endif - // -addinputscfile - psMetadata *addinputscfileArgs = psMetadataAlloc(); - psMetadataAddStr(addinputscfileArgs, PS_LIST_TAIL, "-p5_id", 0, + // -addinputskyfile + psMetadata *addinputskyfileArgs = psMetadataAlloc(); + psMetadataAddStr(addinputskyfileArgs, PS_LIST_TAIL, "-p5_id", 0, "define p5 ID (required)", NULL); - psMetadataAddStr(addinputscfileArgs, PS_LIST_TAIL, "-p4_id", 0, + psMetadataAddStr(addinputskyfileArgs, PS_LIST_TAIL, "-p4_id", 0, "define p4 ID (required)", NULL); - psMetadataAddStr(addinputscfileArgs, PS_LIST_TAIL, "-skycell_id", 0, + psMetadataAddStr(addinputskyfileArgs, PS_LIST_TAIL, "-skycell_id", 0, "define by skycell ID", NULL); - psMetadataAddStr(addinputscfileArgs, PS_LIST_TAIL, "-tess_id", 0, + psMetadataAddStr(addinputskyfileArgs, PS_LIST_TAIL, "-tess_id", 0, "dfine tess ID", NULL); - psMetadataAddStr(addinputscfileArgs, PS_LIST_TAIL, "-kind", 0, + psMetadataAddStr(addinputskyfileArgs, PS_LIST_TAIL, "-kind", 0, "define kind", NULL); - psMetadataAddBool(addinputscfileArgs, PS_LIST_TAIL, "-template", 0, + psMetadataAddBool(addinputskyfileArgs, PS_LIST_TAIL, "-template", 0, "this sky cell file is the subtrahend", false); - // -inputscfile - psMetadata *inputscfileArgs = psMetadataAlloc(); - psMetadataAddStr(inputscfileArgs, PS_LIST_TAIL, "-p5_id", 0, + // -inputskyfile + psMetadata *inputskyfileArgs = psMetadataAlloc(); + psMetadataAddStr(inputskyfileArgs, PS_LIST_TAIL, "-p5_id", 0, "search by p5 ID (required)", NULL); - psMetadataAddStr(inputscfileArgs, PS_LIST_TAIL, "-p4_id", 0, + psMetadataAddStr(inputskyfileArgs, PS_LIST_TAIL, "-p4_id", 0, "search by p4 ID (required)", NULL); - psMetadataAddStr(inputscfileArgs, PS_LIST_TAIL, "-skycell_id", 0, + psMetadataAddStr(inputskyfileArgs, PS_LIST_TAIL, "-skycell_id", 0, "search by skycell ID", NULL); - psMetadataAddStr(inputscfileArgs, PS_LIST_TAIL, "-tess_id", 0, + psMetadataAddStr(inputskyfileArgs, PS_LIST_TAIL, "-tess_id", 0, "search by tess ID", NULL); - psMetadataAddStr(inputscfileArgs, PS_LIST_TAIL, "-kind", 0, + psMetadataAddStr(inputskyfileArgs, PS_LIST_TAIL, "-kind", 0, "search by kind", NULL); - psMetadataAddBool(inputscfileArgs, PS_LIST_TAIL, "-template", 0, + psMetadataAddBool(inputskyfileArgs, PS_LIST_TAIL, "-template", 0, "search by subtrahend", false); - psMetadataAddU64(inputscfileArgs, PS_LIST_TAIL, "-limit", 0, + psMetadataAddU64(inputskyfileArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0); - psMetadataAddBool(inputscfileArgs, PS_LIST_TAIL, "-simple", 0, - "use the simple output format", false); - - // -todiffscfile - psMetadata *todiffscfileArgs = psMetadataAlloc(); - psMetadataAddStr(todiffscfileArgs, PS_LIST_TAIL, "-p5_id", 0, + psMetadataAddBool(inputskyfileArgs, PS_LIST_TAIL, "-simple", 0, + "use the simple output format", false); + + // -todiffskyfile + psMetadata *todiffskyfileArgs = psMetadataAlloc(); + psMetadataAddStr(todiffskyfileArgs, PS_LIST_TAIL, "-p5_id", 0, "search by p5 ID", NULL); - psMetadataAddU64(todiffscfileArgs, PS_LIST_TAIL, "-limit", 0, + psMetadataAddU64(todiffskyfileArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0); - psMetadataAddBool(todiffscfileArgs, PS_LIST_TAIL, "-simple", 0, - "use the simple output format", false); - - // -adddiffscfile - psMetadata *adddiffscfileArgs = psMetadataAlloc(); - psMetadataAddStr(adddiffscfileArgs, PS_LIST_TAIL, "-p5_id", 0, + psMetadataAddBool(todiffskyfileArgs, PS_LIST_TAIL, "-simple", 0, + "use the simple output format", false); + + // -adddiffskyfile + psMetadata *adddiffskyfileArgs = psMetadataAlloc(); + psMetadataAddStr(adddiffskyfileArgs, PS_LIST_TAIL, "-p5_id", 0, "define p4 ID (required)", NULL); - psMetadataAddStr(adddiffscfileArgs, PS_LIST_TAIL, "-uri", 0, + psMetadataAddStr(adddiffskyfileArgs, PS_LIST_TAIL, "-uri", 0, "define URI of file (required)", 0); - psMetadataAddF64(adddiffscfileArgs, PS_LIST_TAIL, "-bg", 0, + psMetadataAddF64(adddiffskyfileArgs, PS_LIST_TAIL, "-bg", 0, "define exposue background", NAN); - psMetadataAddF64(adddiffscfileArgs, PS_LIST_TAIL, "-bg_mean_stdev", 0, + psMetadataAddF64(adddiffskyfileArgs, PS_LIST_TAIL, "-bg_mean_stdev", 0, "define exposue background mean stdev", NAN); - // -diffscfile - psMetadata *diffscfileArgs = psMetadataAlloc(); - psMetadataAddStr(diffscfileArgs, PS_LIST_TAIL, "-p5_id", 0, + // -diffskyfile + psMetadata *diffskyfileArgs = psMetadataAlloc(); + psMetadataAddStr(diffskyfileArgs, PS_LIST_TAIL, "-p5_id", 0, "search by p4 ID", NULL); - psMetadataAddStr(diffscfileArgs , PS_LIST_TAIL, "-skycell_id", 0, + psMetadataAddStr(diffskyfileArgs , PS_LIST_TAIL, "-skycell_id", 0, "define skycell ID (required)", NULL); - psMetadataAddStr(diffscfileArgs, PS_LIST_TAIL, "-tess_id", 0, + psMetadataAddStr(diffskyfileArgs, PS_LIST_TAIL, "-tess_id", 0, "define tessellation ID (required)", NULL); - psMetadataAddU64(diffscfileArgs, PS_LIST_TAIL, "-limit", 0, + psMetadataAddU64(diffskyfileArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0); - psMetadataAddBool(diffscfileArgs, PS_LIST_TAIL, "-simple", 0, + psMetadataAddBool(diffskyfileArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); @@ -165,9 +165,9 @@ PXTOOL_MODE("-definerun", P5TOOL_MODE_DEFINERUN, definerunArgs); PXTOOL_MODE("-updaterun", P5TOOL_MODE_UPDATERUN, updaterunArgs); - PXTOOL_MODE("-addinputscfile", P5TOOL_MODE_ADDINPUTSCFILE, addinputscfileArgs); - PXTOOL_MODE("-inputscfile", P5TOOL_MODE_INPUTSCFILE, inputscfileArgs); - PXTOOL_MODE("-todiffscfile", P5TOOL_MODE_TODIFFSCFILE, todiffscfileArgs); - PXTOOL_MODE("-adddiffscfile", P5TOOL_MODE_ADDDIFFSCFILE, adddiffscfileArgs); - PXTOOL_MODE("-diffscfile", P5TOOL_MODE_DIFFSCFILE, diffscfileArgs); + PXTOOL_MODE("-addinputskyfile", P5TOOL_MODE_ADDINPUTSKYFILE, addinputskyfileArgs); + PXTOOL_MODE("-inputskyfile", P5TOOL_MODE_INPUTSKYFILE, inputskyfileArgs); + PXTOOL_MODE("-todiffskyfile", P5TOOL_MODE_TODIFFSKYFILE, todiffskyfileArgs); + PXTOOL_MODE("-adddiffskyfile", P5TOOL_MODE_ADDDIFFSKYFILE, adddiffskyfileArgs); + PXTOOL_MODE("-diffskyfile", P5TOOL_MODE_DIFFSKYFILE, diffskyfileArgs); bool argErr = false; Index: /trunk/ippTools/src/pxtables.c =================================================================== --- /trunk/ippTools/src/pxtables.c (revision 11984) +++ /trunk/ippTools/src/pxtables.c (revision 11985) @@ -82,11 +82,11 @@ CREATE_TABLE(p4InputExpCreateTable); CREATE_TABLE(p4SkyCellMapCreateTable); - CREATE_TABLE(p4ScfileCreateTable); + CREATE_TABLE(p4SkyfileCreateTable); CREATE_TABLE(p5RunCreateTable); - CREATE_TABLE(p5InputScfileCreateTable); - CREATE_TABLE(p5DiffScfileCreateTable); + CREATE_TABLE(p5InputSkyfileCreateTable); + CREATE_TABLE(p5DiffSkyfileCreateTable); CREATE_TABLE(p6RunCreateTable); - CREATE_TABLE(p6InputScfileCreateTable); - CREATE_TABLE(p6SumScfileCreateTable); + CREATE_TABLE(p6InputSkyfileCreateTable); + CREATE_TABLE(p6SumSkyfileCreateTable); return true; @@ -158,11 +158,11 @@ DROP_TABLE(p4InputExpDropTable); DROP_TABLE(p4SkyCellMapDropTable); - DROP_TABLE(p4ScfileDropTable); + DROP_TABLE(p4SkyfileDropTable); DROP_TABLE(p5RunDropTable); - DROP_TABLE(p5InputScfileDropTable); - DROP_TABLE(p5DiffScfileDropTable); + DROP_TABLE(p5InputSkyfileDropTable); + DROP_TABLE(p5DiffSkyfileDropTable); DROP_TABLE(p6RunDropTable); - DROP_TABLE(p6InputScfileDropTable); - DROP_TABLE(p6SumScfileDropTable); + DROP_TABLE(p6InputSkyfileDropTable); + DROP_TABLE(p6SumSkyfileDropTable); return status; Index: /trunk/ippTools/src/stacktool.c =================================================================== --- /trunk/ippTools/src/stacktool.c (revision 11984) +++ /trunk/ippTools/src/stacktool.c (revision 11985) @@ -33,9 +33,9 @@ static bool definerunMode(pxConfig *config); static bool updaterunMode(pxConfig *config); -static bool addinputscfileMode(pxConfig *config); -static bool inputscfileMode(pxConfig *config); +static bool addinputskyfileMode(pxConfig *config); +static bool inputskyfileMode(pxConfig *config); static bool tosumMode(pxConfig *config); -static bool addsumscfileMode(pxConfig *config); -static bool sumscfileMode(pxConfig *config); +static bool addsumskyfileMode(pxConfig *config); +static bool sumskyfileMode(pxConfig *config); static bool setp6RunState(pxConfig *config, const char *p6_id, const char *state); @@ -61,9 +61,9 @@ MODECASE(P6TOOL_MODE_DEFINERUN, definerunMode); MODECASE(P6TOOL_MODE_UPDATERUN, updaterunMode); - MODECASE(P6TOOL_MODE_ADDINPUTSCFILE, addinputscfileMode); - MODECASE(P6TOOL_MODE_INPUTSCFILE, inputscfileMode); + MODECASE(P6TOOL_MODE_ADDINPUTSKYFILE, addinputskyfileMode); + MODECASE(P6TOOL_MODE_INPUTSKYFILE, inputskyfileMode); MODECASE(P6TOOL_MODE_TOSUM, tosumMode); - MODECASE(P6TOOL_MODE_ADDSUMSCFILE, addsumscfileMode); - MODECASE(P6TOOL_MODE_SUMSCFILE, sumscfileMode); + MODECASE(P6TOOL_MODE_ADDSUMSKYFILE, addsumskyfileMode); + MODECASE(P6TOOL_MODE_SUMSKYFILE, sumskyfileMode); default: psAbort("invalid option (this should not happen)"); @@ -219,5 +219,5 @@ -static bool addinputscfileMode(pxConfig *config) +static bool addinputskyfileMode(pxConfig *config) { PS_ASSERT_PTR_NON_NULL(config, false); @@ -249,5 +249,5 @@ // XXX instead of validiting it here we should just use forgein key // constrants - if (!p6InputScfileInsert(config->dbh, + if (!p6InputSkyfileInsert(config->dbh, (psS32)atoi(p6_id), (psS32)atoi(p4_id) @@ -261,5 +261,5 @@ -static bool inputscfileMode(pxConfig *config) +static bool inputskyfileMode(pxConfig *config) { PS_ASSERT_PTR_NON_NULL(config, false); @@ -275,17 +275,17 @@ psString query = psStringCopy( "SELECT\n" - " p4Scfile.*\n" + " p4Skyfile.*\n" " FROM p6Run\n" - " JOIN p6InputScfile\n" + " JOIN p6InputSkyfile\n" " USING(p6_id)\n" - " JOIN p4Scfile\n" - " ON p6InputScfile.p4_id = p4Scfile.p4_id\n" - " AND p6Run.skycell_id = p4Scfile.skycell_id\n" - " AND p6Run.tess_id = p4Scfile.tess_id\n" + " JOIN p4Skyfile\n" + " ON p6InputSkyfile.p4_id = p4Skyfile.p4_id\n" + " AND p6Run.skycell_id = p4Skyfile.skycell_id\n" + " AND p6Run.tess_id = p4Skyfile.tess_id\n" " WHERE\n" " p6Run.state = 'run'\n" ); if (config->where) { - psString whereClause = psDBGenerateWhereConditionSQL(config->where, "p6InputScfile"); + psString whereClause = psDBGenerateWhereConditionSQL(config->where, "p6InputSkyfile"); psStringAppend(&query, " AND %s", whereClause); psFree(whereClause); @@ -321,5 +321,5 @@ } if (!psArrayLength(output)) { - psError(PS_ERR_UNKNOWN, false, "no p6InputScfile rows found"); + psError(PS_ERR_UNKNOWN, false, "no p6InputSkyfile rows found"); psFree(output); return true; @@ -338,5 +338,5 @@ if (psArrayLength(output)) { // negative simple so the default is true - if (!ippdbPrintMetadatas(stdout, output, "p6InputScfile", !simple)) { + if (!ippdbPrintMetadatas(stdout, output, "p6InputSkyfile", !simple)) { psError(PS_ERR_UNKNOWN, false, "failed to print array"); psFree(output); @@ -367,13 +367,13 @@ " p6Run.p6_id\n" " FROM p6Run\n" - " LEFT JOIN p6SumScfile\n" + " LEFT JOIN p6SumSkyfile\n" " USING(p6_id)\n" " WHERE\n" " p6Run.state = 'run'\n" - " AND p6SumScfile.p6_id IS NULL\n" + " AND p6SumSkyfile.p6_id IS NULL\n" ); if (config->where) { - psString whereClause = psDBGenerateWhereConditionSQL(config->where, "p6SumScfile"); + psString whereClause = psDBGenerateWhereConditionSQL(config->where, "p6SumSkyfile"); psStringAppend(&query, " AND %s", whereClause); psFree(whereClause); @@ -409,5 +409,5 @@ } if (!psArrayLength(output)) { - psError(PS_ERR_UNKNOWN, false, "no p6SumScfile rows found"); + psError(PS_ERR_UNKNOWN, false, "no p6SumSkyfile rows found"); psFree(output); return true; @@ -426,5 +426,5 @@ if (psArrayLength(output)) { // negative simple so the default is true - if (!ippdbPrintMetadatas(stdout, output, "p6SumScfile", !simple)) { + if (!ippdbPrintMetadatas(stdout, output, "p6SumSkyfile", !simple)) { psError(PS_ERR_UNKNOWN, false, "failed to print array"); psFree(output); @@ -439,5 +439,5 @@ -static bool addsumscfileMode(pxConfig *config) +static bool addsumskyfileMode(pxConfig *config) { PS_ASSERT_PTR_NON_NULL(config, false); @@ -486,5 +486,5 @@ // XXX instead of validiting it here we should just use forgein key // constrants - if (!p6SumScfileInsert(config->dbh, + if (!p6SumSkyfileInsert(config->dbh, (psS32)atoi(p6_id), uri, @@ -517,5 +517,5 @@ -static bool sumscfileMode(pxConfig *config) +static bool sumskyfileMode(pxConfig *config) { PS_ASSERT_PTR_NON_NULL(config, false); @@ -531,7 +531,7 @@ psString query = psStringCopy( "SELECT\n" - " p6SumScfile.*\n" + " p6SumSkyfile.*\n" " FROM p6Run\n" - " JOIN p6SumScfile\n" + " JOIN p6SumSkyfile\n" " USING(p6_id)\n" " WHERE\n" @@ -540,5 +540,5 @@ if (config->where) { - psString whereClause = psDBGenerateWhereConditionSQL(config->where, "p6SumScfile"); + psString whereClause = psDBGenerateWhereConditionSQL(config->where, "p6SumSkyfile"); psStringAppend(&query, " AND %s", whereClause); psFree(whereClause); @@ -574,5 +574,5 @@ } if (!psArrayLength(output)) { - psError(PS_ERR_UNKNOWN, false, "no p4Scfile rows found"); + psError(PS_ERR_UNKNOWN, false, "no p4Skyfile rows found"); psFree(output); return true; @@ -590,5 +590,5 @@ if (psArrayLength(output)) { - if (!ippdbPrintMetadatas(stdout, output, "p6SumScfile", !simple)) { + if (!ippdbPrintMetadatas(stdout, output, "p6SumSkyfile", !simple)) { psError(PS_ERR_UNKNOWN, false, "failed to print array"); psFree(output); Index: /trunk/ippTools/src/stacktool.h =================================================================== --- /trunk/ippTools/src/stacktool.h (revision 11984) +++ /trunk/ippTools/src/stacktool.h (revision 11985) @@ -27,9 +27,9 @@ P6TOOL_MODE_DEFINERUN, P6TOOL_MODE_UPDATERUN, - P6TOOL_MODE_ADDINPUTSCFILE, - P6TOOL_MODE_INPUTSCFILE, + P6TOOL_MODE_ADDINPUTSKYFILE, + P6TOOL_MODE_INPUTSKYFILE, P6TOOL_MODE_TOSUM, - P6TOOL_MODE_ADDSUMSCFILE, - P6TOOL_MODE_SUMSCFILE, + P6TOOL_MODE_ADDSUMSKYFILE, + P6TOOL_MODE_SUMSKYFILE, } p6toolMode; Index: /trunk/ippTools/src/stacktoolConfig.c =================================================================== --- /trunk/ippTools/src/stacktoolConfig.c (revision 11984) +++ /trunk/ippTools/src/stacktoolConfig.c (revision 11985) @@ -72,20 +72,20 @@ #endif - // -addinputscfile - psMetadata *addinputscfileArgs = psMetadataAlloc(); - psMetadataAddStr(addinputscfileArgs, PS_LIST_TAIL, "-p6_id", 0, + // -addinputskyfile + psMetadata *addinputskyfileArgs = psMetadataAlloc(); + psMetadataAddStr(addinputskyfileArgs, PS_LIST_TAIL, "-p6_id", 0, "define p6 ID (required)", NULL); - psMetadataAddStr(addinputscfileArgs, PS_LIST_TAIL, "-p4_id", 0, + psMetadataAddStr(addinputskyfileArgs, PS_LIST_TAIL, "-p4_id", 0, "define p4 ID (required)", NULL); - // -inputscfile - psMetadata *inputscfileArgs = psMetadataAlloc(); - psMetadataAddStr(inputscfileArgs, PS_LIST_TAIL, "-p6_id", 0, + // -inputskyfile + psMetadata *inputskyfileArgs = psMetadataAlloc(); + psMetadataAddStr(inputskyfileArgs, PS_LIST_TAIL, "-p6_id", 0, "search by p6 ID (required)", NULL); - psMetadataAddStr(inputscfileArgs, PS_LIST_TAIL, "-p4_id", 0, + psMetadataAddStr(inputskyfileArgs, PS_LIST_TAIL, "-p4_id", 0, "search by p4 ID (required)", NULL); - psMetadataAddU64(inputscfileArgs, PS_LIST_TAIL, "-limit", 0, + psMetadataAddU64(inputskyfileArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0); - psMetadataAddBool(inputscfileArgs, PS_LIST_TAIL, "-simple", 0, + psMetadataAddBool(inputskyfileArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); @@ -101,24 +101,24 @@ "use the simple output format", false); - // -addsumscfile - psMetadata *addsumscfileArgs = psMetadataAlloc(); - psMetadataAddStr(addsumscfileArgs, PS_LIST_TAIL, "-p6_id", 0, + // -addsumskyfile + psMetadata *addsumskyfileArgs = psMetadataAlloc(); + psMetadataAddStr(addsumskyfileArgs, PS_LIST_TAIL, "-p6_id", 0, "define p4 ID (required)", NULL); - psMetadataAddStr(addsumscfileArgs, PS_LIST_TAIL, "-uri", 0, + psMetadataAddStr(addsumskyfileArgs, PS_LIST_TAIL, "-uri", 0, "define URI of file (required)", 0); - psMetadataAddF64(addsumscfileArgs, PS_LIST_TAIL, "-bg", 0, + psMetadataAddF64(addsumskyfileArgs, PS_LIST_TAIL, "-bg", 0, "define exposue background", NAN); - psMetadataAddF64(addsumscfileArgs, PS_LIST_TAIL, "-bg_mean_stdev", 0, + psMetadataAddF64(addsumskyfileArgs, PS_LIST_TAIL, "-bg_mean_stdev", 0, "define exposue background mean stdev", NAN); - // -sumscfile - psMetadata *sumscfileArgs= psMetadataAlloc(); - psMetadataAddStr(sumscfileArgs, PS_LIST_TAIL, "-p6_id", 0, + // -sumskyfile + psMetadata *sumskyfileArgs= psMetadataAlloc(); + psMetadataAddStr(sumskyfileArgs, PS_LIST_TAIL, "-p6_id", 0, "search by p6 ID (required)", NULL); - psMetadataAddStr(sumscfileArgs, PS_LIST_TAIL, "-p4_id", 0, + psMetadataAddStr(sumskyfileArgs, PS_LIST_TAIL, "-p4_id", 0, "search by p4 ID (required)", NULL); - psMetadataAddU64(sumscfileArgs, PS_LIST_TAIL, "-limit", 0, + psMetadataAddU64(sumskyfileArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0); - psMetadataAddBool(sumscfileArgs, PS_LIST_TAIL, "-simple", 0, + psMetadataAddBool(sumskyfileArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); @@ -148,9 +148,9 @@ PXTOOL_MODE("-definerun", P6TOOL_MODE_DEFINERUN, definerunArgs); PXTOOL_MODE("-updaterun", P6TOOL_MODE_UPDATERUN, updaterunArgs); - PXTOOL_MODE("-addinputscfile", P6TOOL_MODE_ADDINPUTSCFILE, addinputscfileArgs); - PXTOOL_MODE("-inputscfile", P6TOOL_MODE_INPUTSCFILE, inputscfileArgs); + PXTOOL_MODE("-addinputskyfile", P6TOOL_MODE_ADDINPUTSKYFILE, addinputskyfileArgs); + PXTOOL_MODE("-inputskyfile", P6TOOL_MODE_INPUTSKYFILE, inputskyfileArgs); PXTOOL_MODE("-tosum", P6TOOL_MODE_TOSUM, tosumArgs); - PXTOOL_MODE("-addsumscfile", P6TOOL_MODE_ADDSUMSCFILE, addsumscfileArgs); - PXTOOL_MODE("-sumscfile", P6TOOL_MODE_SUMSCFILE, sumscfileArgs); + PXTOOL_MODE("-addsumskyfile", P6TOOL_MODE_ADDSUMSKYFILE, addsumskyfileArgs); + PXTOOL_MODE("-sumskyfile", P6TOOL_MODE_SUMSKYFILE, sumskyfileArgs); bool argErr = false; Index: /trunk/ippTools/src/warptool.c =================================================================== --- /trunk/ippTools/src/warptool.c (revision 11984) +++ /trunk/ippTools/src/warptool.c (revision 11985) @@ -761,11 +761,11 @@ " JOIN p4SkyCellMap\n" " USING(p4_id)\n" - " LEFT JOIN p4Scfile\n" + " LEFT JOIN p4Skyfile\n" " USING(p4_id, skycell_id, tess_id)\n" " WHERE\n" " p4Run.state = 'run'\n" - " AND p4Scfile.p4_id IS NULL\n" - " AND p4Scfile.skycell_id IS NULL\n" - " AND p4Scfile.tess_id IS NULL\n" + " AND p4Skyfile.p4_id IS NULL\n" + " AND p4Skyfile.skycell_id IS NULL\n" + " AND p4Skyfile.tess_id IS NULL\n" ); @@ -893,5 +893,5 @@ } - // we don't want to insert the last scfile in a run but then not mark the + // we don't want to insert the last skyfile in a run but then not mark the // run as 'stop' if (!psDBTransaction(config->dbh)) { @@ -901,5 +901,5 @@ // XXX need to validate that this coresponds to an p4InputImfile - if (!p4ScfileInsert(config->dbh, + if (!p4SkyfileInsert(config->dbh, (psS32)atoi(p4_id), skycell_id, @@ -949,9 +949,9 @@ " p4Run.p4_id,\n" " p4SkyCellMap.p4_id as foo,\n" - " p4Scfile.p4_id as bar\n" + " p4Skyfile.p4_id as bar\n" " FROM p4Run\n" " JOIN p4SkyCellMap\n" " USING(p4_id)\n" - " LEFT JOIN p4Scfile\n" + " LEFT JOIN p4Skyfile\n" " USING(p4_id, skycell_id, tess_id)\n" " WHERE\n" @@ -960,5 +960,5 @@ " p4Run.p4_id\n" " HAVING\n" - " COUNT(p4SkyCellMap.p4_id) = COUNT(p4Scfile.p4_id)\n" + " COUNT(p4SkyCellMap.p4_id) = COUNT(p4Skyfile.p4_id)\n" " ) as Foo\n" " )\n" @@ -990,7 +990,7 @@ psString query = psStringCopy( "SELECT\n" - " p4Scfile.*\n" + " p4Skyfile.*\n" " FROM p4Run\n" - " JOIN p4Scfile\n" + " JOIN p4Skyfile\n" " USING(p4_id)\n" " WHERE\n" @@ -999,5 +999,5 @@ if (config->where) { - psString whereClause = psDBGenerateWhereConditionSQL(config->where, "p4Scfile"); + psString whereClause = psDBGenerateWhereConditionSQL(config->where, "p4Skyfile"); psStringAppend(&query, " AND %s", whereClause); psFree(whereClause); @@ -1033,5 +1033,5 @@ } if (!psArrayLength(output)) { - psError(PS_ERR_UNKNOWN, false, "no p4Scfile rows found"); + psError(PS_ERR_UNKNOWN, false, "no p4Skyfile rows found"); psFree(output); return true; @@ -1050,5 +1050,5 @@ if (psArrayLength(output)) { // negative simple so the default is true - if (!ippdbPrintMetadatas(stdout, output, "p4Scfile", !simple)) { + if (!ippdbPrintMetadatas(stdout, output, "p4Skyfile", !simple)) { psError(PS_ERR_UNKNOWN, false, "failed to print array"); psFree(output);