Index: trunk/ippTools/src/difftool.c
===================================================================
--- trunk/ippTools/src/difftool.c	(revision 11979)
+++ 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);