Index: /branches/backtrack/dbconfig/cam.md =================================================================== --- /branches/backtrack/dbconfig/cam.md (revision 13996) +++ /branches/backtrack/dbconfig/cam.md (revision 13997) @@ -1,4 +1,2 @@ -# imfiles is not here... is it needed? - camRun METADATA cam_id S64 0 # Primary Key AUTO_INCREMENT Index: /branches/backtrack/dbconfig/chip.md =================================================================== --- /branches/backtrack/dbconfig/chip.md (revision 13996) +++ /branches/backtrack/dbconfig/chip.md (revision 13997) @@ -1,4 +1,6 @@ -# do we need nclass? -# class is missing +# +# We are dependant on the assumption that there is only ever one exp_tag in a +# chipRun although the database does not enforce this. +# chipRun METADATA @@ -13,21 +15,9 @@ END -# uris in & out ? - -chipPendingImfile METADATA +chipInputImfile METADATA chip_id S64 0 # Primary Key fkey (chip_id) ref chipRun(chip_id) exp_tag STR 64 # Primary Key fkey (exp_tag, class_id) ref rawImfile (exp_tag, class_id) class_id STR 64 # Primary Key END - -# nclass & ndone? -# and/or logging imfile done better? - -chipMask METADATA - label STR 64 # Primary Key -END - -# uris in & out ? -# state? chipProcessedImfile METADATA @@ -57,2 +47,6 @@ fault S16 0 # Key NOT NULL END + +chipMask METADATA + label STR 64 # Primary Key +END Index: /branches/backtrack/ippTools/share/chiptool_completely_processed_exp.sql =================================================================== --- /branches/backtrack/ippTools/share/chiptool_completely_processed_exp.sql (revision 13996) +++ /branches/backtrack/ippTools/share/chiptool_completely_processed_exp.sql (revision 13997) @@ -15,17 +15,17 @@ chipProcessedImfile.class_id FROM chipRun - JOIN chipPendingImfile + JOIN chipInputImfile USING(chip_id) JOIN rawExp - ON chipPendingImfile.exp_tag = rawExp.exp_tag + ON chipInputImfile.exp_tag = rawExp.exp_tag JOIN chipProcessedImfile - ON chipPendingImfile.chip_id = chipProcessedImfile.chip_id - AND chipPendingImfile.exp_tag = chipProcessedImfile.exp_tag - AND chipPendingImfile.class_id = chipProcessedImfile.class_id + ON chipInputImfile.chip_id = chipProcessedImfile.chip_id + AND chipInputImfile.exp_tag = chipProcessedImfile.exp_tag + AND chipInputImfile.class_id = chipProcessedImfile.class_id WHERE chipRun.state = 'run' AND chipProcessedImfile.fault = 0 GROUP BY - chipPendingImfile.chip_id, - chipPendingImfile.exp_tag + chipInputImfile.chip_id, + chipInputImfile.exp_tag HAVING rawExp.imfiles = COUNT(chipProcessedImfile.class_id)) as Foo Index: /branches/backtrack/ippTools/share/chiptool_find_unprocessed_imfile.pl =================================================================== --- /branches/backtrack/ippTools/share/chiptool_find_unprocessed_imfile.pl (revision 13996) +++ /branches/backtrack/ippTools/share/chiptool_find_unprocessed_imfile.pl (revision 13997) @@ -1,5 +1,5 @@ SELECT DISTINCT - chipPendingImfile.* -FROM chipPendingImfile + chipInputImfile.* +FROM chipInputImfile LEFT JOIN chipProcessedImfile USING(chip_id, class_id) Index: /branches/backtrack/ippTools/share/chiptool_pendingimfile.sql =================================================================== --- /branches/backtrack/ippTools/share/chiptool_pendingimfile.sql (revision 13996) +++ /branches/backtrack/ippTools/share/chiptool_pendingimfile.sql (revision 13997) @@ -1,6 +1,6 @@ SELECT chipRun.*, - chipPendingImfile.exp_tag, - chipPendingImfile.class_id, + chipInputImfile.exp_tag, + chipInputImfile.class_id, rawImfile.uri, rawExp.exp_id, @@ -9,13 +9,13 @@ rawExp.filelevel FROM chipRun -JOIN chipPendingImfile +JOIN chipInputImfile USING(chip_id) LEFT JOIN chipProcessedImfile - ON chipPendingImfile.chip_id = chipProcessedImfile.chip_id - AND chipPendingImfile.exp_tag = chipProcessedImfile.exp_tag - AND chipPendingImfile.class_id = chipProcessedImfile.class_id + ON chipInputImfile.chip_id = chipProcessedImfile.chip_id + AND chipInputImfile.exp_tag = chipProcessedImfile.exp_tag + AND chipInputImfile.class_id = chipProcessedImfile.class_id JOIN rawImfile - ON chipPendingImfile.exp_tag = rawImfile.exp_tag - AND chipPendingImfile.class_id = rawImfile.class_id + ON chipInputImfile.exp_tag = rawImfile.exp_tag + AND chipInputImfile.class_id = rawImfile.class_id JOIN rawExp ON rawImfile.exp_tag = rawExp.exp_tag Index: /branches/backtrack/ippTools/share/chiptool_queuerawimfile.sql =================================================================== --- /branches/backtrack/ippTools/share/chiptool_queuerawimfile.sql (revision 13996) +++ /branches/backtrack/ippTools/share/chiptool_queuerawimfile.sql (revision 13997) @@ -1,3 +1,3 @@ -INSERT INTO chipPendingImfile +INSERT INTO chipInputImfile SELECT LAST_INSERT_ID(), Index: /branches/backtrack/ippTools/src/chiptool.c =================================================================== --- /branches/backtrack/ippTools/src/chiptool.c (revision 13996) +++ /branches/backtrack/ippTools/src/chiptool.c (revision 13997) @@ -282,5 +282,5 @@ if (config->where) { - psString whereClause = psDBGenerateWhereConditionSQL(config->where, "chipPendingImfile"); + psString whereClause = psDBGenerateWhereConditionSQL(config->where, "chipInputImfile"); psStringAppend(&query, " AND %s", whereClause); psFree(whereClause); @@ -329,5 +329,5 @@ // negative simple so the default is true - if (!ippdbPrintMetadatas(stdout, output, "chipPendingImfile", !simple)) { + if (!ippdbPrintMetadatas(stdout, output, "chipInputImfile", !simple)) { psError(PS_ERR_UNKNOWN, false, "failed to print array"); psFree(output); Index: /branches/backtrack/ippTools/src/pxchip.c =================================================================== --- /branches/backtrack/ippTools/src/pxchip.c (revision 13996) +++ /branches/backtrack/ippTools/src/pxchip.c (revision 13997) @@ -96,5 +96,5 @@ #endif - // populate the chipPendingImfile table from rawImfile based on exp_tag, + // populate the chipInputImfile table from rawImfile based on exp_tag, // where the coresponding newExp.state entry is set to stop psString query = pxDataGetCached("chiptool_queuerawimfile.sql"); Index: /branches/backtrack/ippTools/src/pxtables.c =================================================================== --- /branches/backtrack/ippTools/src/pxtables.c (revision 13996) +++ /branches/backtrack/ippTools/src/pxtables.c (revision 13997) @@ -61,5 +61,5 @@ CREATE_TABLE(guidePendingExpCreateTable); CREATE_TABLE(chipRunCreateTable); - CREATE_TABLE(chipPendingImfileCreateTable); + CREATE_TABLE(chipInputImfileCreateTable); CREATE_TABLE(chipProcessedImfileCreateTable); CREATE_TABLE(chipMaskCreateTable); @@ -142,5 +142,5 @@ DROP_TABLE(guidePendingExpDropTable); DROP_TABLE(chipRunDropTable); - DROP_TABLE(chipPendingImfileDropTable); + DROP_TABLE(chipInputImfileDropTable); DROP_TABLE(chipProcessedImfileDropTable); DROP_TABLE(chipMaskDropTable); Index: /branches/backtrack/ippTools/src/regtool.c =================================================================== --- /branches/backtrack/ippTools/src/regtool.c (revision 13996) +++ /branches/backtrack/ippTools/src/regtool.c (revision 13997) @@ -44,5 +44,5 @@ // static guidePendingExpRow *newToP1PendingExp(newExpRow *newExp); //static chipPendingExpRow *newTochipPendingExp(pxConfig *config, newExpRow *newExp); -//static chipPendingImfileRow *rawImfileTochipPendingImfile(pxConfig *config, psS64 chip_id, rawImfileRow *rawImfile); +//static chipInputImfileRow *rawImfileTochipInputImfile(pxConfig *config, psS64 chip_id, rawImfileRow *rawImfile); static rawExpRow *newToRawExp(pxConfig *config, newExpRow *exp); @@ -822,7 +822,7 @@ -static chipPendingImfileRow *rawImfileTochipPendingImfile(pxConfig *config, psS64 chip_id, rawImfileRow *rawImfile) -{ - return chipPendingImfileRowAlloc( +static chipInputImfileRow *rawImfileTochipInputImfile(pxConfig *config, psS64 chip_id, rawImfileRow *rawImfile) +{ + return chipInputImfileRowAlloc( chip_id, rawImfile->class_id,