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