Index: trunk/ippTools/src/regtool.c =================================================================== --- trunk/ippTools/src/regtool.c (revision 30070) +++ trunk/ippTools/src/regtool.c (revision 30179) @@ -74,6 +74,6 @@ // imfile MODECASE(REGTOOL_MODE_PENDINGIMFILE, pendingimfileMode); - MODECASE(REGTOOL_MODE_CHECKBURNTOOLIMFILE, checkburntoolimfileMode); - MODECASE(REGTOOL_MODE_PENDINGBURNTOOLIMFILE, pendingburntoolimfileMode); + MODECASE(REGTOOL_MODE_CHECKBURNTOOLIMFILE, checkburntoolimfileMode); + MODECASE(REGTOOL_MODE_PENDINGBURNTOOLIMFILE, pendingburntoolimfileMode); MODECASE(REGTOOL_MODE_ADDPROCESSEDIMFILE, addprocessedimfileMode); MODECASE(REGTOOL_MODE_PROCESSEDIMFILE, processedimfileMode); @@ -201,5 +201,5 @@ psFree(query); query = rep; - + psStringSubstitute(&query,exp_name,"@EXP_NAME@"); psStringSubstitute(&query,class_id,"@CLASS_ID@"); @@ -215,5 +215,5 @@ } psFree(query); - + psArray *output = p_psDBFetchResult(config->dbh); if (!output) { @@ -227,5 +227,5 @@ psError(PXTOOLS_ERR_PROG, false, "unknown error"); } - + return false; } @@ -243,5 +243,5 @@ if ((psMetadataLookupS32(NULL,row,"is_downloaded") != 1)|| - (psMetadataLookupS32(NULL,row,"is_registered") != 1)) { + (psMetadataLookupS32(NULL,row,"is_registered") != 1)) { ok_to_burn = false; } @@ -255,5 +255,5 @@ already_burned = false; } - + if (previous_uri) { psMetadataAddStr(row,PS_LIST_TAIL,"previous_uri",PS_META_REPLACE,"",previous_uri); @@ -264,5 +264,5 @@ previous_uri = psStringCopy(psMetadataLookupStr(NULL,row,"uri")); } - + // negate simple so the default is true if (!ippdbPrintMetadatas(stdout, output, "regBurntoolImfile", !simple)) { @@ -271,10 +271,10 @@ return false; } - + psFree(output); - + return(true); - + } @@ -297,8 +297,8 @@ psFree(query); query = rep; - + psStringSubstitute(&query,date,"@DATE@"); - // fprintf(stderr,"%s",query); + // fprintf(stderr,"%s",query); if (!p_psDBRunQuery(config->dbh, query)) { @@ -309,5 +309,5 @@ } psFree(query); - + psArray *output = p_psDBFetchResult(config->dbh); if (!output) { @@ -321,7 +321,9 @@ psError(PXTOOLS_ERR_PROG, false, "unknown error"); } - + return false; } + + // fprintf (stderr, "found %ld rows\n", output->n); if (!psArrayLength(output)) { psTrace("regtool", PS_LOG_INFO, "no rows found"); @@ -337,5 +339,5 @@ psString this_class_id = NULL; psArray *results = psArrayAllocEmpty(60); // List of suggested imfiles to burntool. - + for (long i = 0; i < output->n; i++) { psMetadata *row = output->data[i]; @@ -356,7 +358,7 @@ if (previous_class_id) { if (strcmp(this_class_id,previous_class_id) != 0) { - ok_to_burn = true; - already_burned = true; - previous_uri = NULL; + ok_to_burn = true; + already_burned = true; + previous_uri = NULL; } } @@ -364,5 +366,5 @@ // Write the URIs as well. this_uri = psStringCopy(psMetadataLookupStr(NULL,row,"uri")); // Duplicate, but helpful for my debugging. - psMetadataAddStr(row,PS_LIST_TAIL,"this_uri",PS_META_REPLACE,"",this_uri); + psMetadataAddStr(row,PS_LIST_TAIL,"this_uri",PS_META_REPLACE,"",this_uri); if (previous_uri) { psMetadataAddStr(row,PS_LIST_TAIL,"previous_uri",PS_META_REPLACE,"",previous_uri); @@ -372,11 +374,11 @@ // Convert bits of the SQL query into booleans describing the data state if ((psMetadataLookupS32(NULL,row,"is_downloaded") != 1)|| - (psMetadataLookupS32(NULL,row,"is_registered") != 1)) { - // printf("I claim this isn't downloaded or registered? %s %s\n",this_uri,this_class_id); - ok_to_burn = false; + (psMetadataLookupS32(NULL,row,"is_registered") != 1)) { + // printf("I claim this isn't downloaded or registered? %s %s\n",this_uri,this_class_id); + ok_to_burn = false; } if (already_burned == false) { - // printf("already_burned looks false %s %s\n",this_uri,this_class_id); - ok_to_burn = false; + // printf("already_burned looks false %s %s\n",this_uri,this_class_id); + ok_to_burn = false; } if (abs(psMetadataLookupS32(NULL,row,"burntool_state")) == valid_burntool) { @@ -391,44 +393,44 @@ // Check the uri for this exposure if (!this_uri) { - ok_to_burn = false; - already_burned = false; - - // Save this round for next round. - psFree(previous_class_id); - psFree(previous_uri); - previous_class_id = psStringCopy(psMetadataLookupStr(NULL,row,"tmp_class_id")); - psStringSubstitute(&previous_class_id,"XY","ota"); - previous_uri = psStringCopy(psMetadataLookupStr(NULL,row,"uri")); // Save for next round. - continue; - } - - // printf("STATUS: %s %s %s %s (%d %d) %d %d %d\n",this_uri,previous_uri,this_class_id,previous_class_id,ok_to_burn,already_burned,psMetadataLookupS32(NULL,row,"burntool_state"),psMetadataLookupS32(NULL,row,"is_registered"),psMetadataLookupS32(NULL,row,"is_downloaded")); - - // If the state of this imfile is not "pending_burntool" then we can't burn it. + ok_to_burn = false; + already_burned = false; + + // Save this round for next round. + psFree(previous_class_id); + psFree(previous_uri); + previous_class_id = psStringCopy(psMetadataLookupStr(NULL,row,"tmp_class_id")); + psStringSubstitute(&previous_class_id,"XY","ota"); + previous_uri = psStringCopy(psMetadataLookupStr(NULL,row,"uri")); // Save for next round. + continue; + } + + // printf("STATUS: %s %s %s %s (%d %d) %d %d %d\n",this_uri,previous_uri,this_class_id,previous_class_id,ok_to_burn,already_burned,psMetadataLookupS32(NULL,row,"burntool_state"),psMetadataLookupS32(NULL,row,"is_registered"),psMetadataLookupS32(NULL,row,"is_downloaded")); + + // If the state of this imfile is not "pending_burntool" then we can't burn it. if (!ignore_state) { psString imfile_state = psMetadataLookupStr(NULL,row,"imfile_state"); if (!imfile_state) { // imfile state is NULL, so we probably aren't registered. - ok_to_burn = false; - - // Save this round for next round. - psFree(previous_class_id); - psFree(previous_uri); - previous_class_id = psStringCopy(psMetadataLookupStr(NULL,row,"tmp_class_id")); - psStringSubstitute(&previous_class_id,"XY","ota"); - previous_uri = psStringCopy(psMetadataLookupStr(NULL,row,"uri")); // Save for next round. - continue; + ok_to_burn = false; + + // Save this round for next round. + psFree(previous_class_id); + psFree(previous_uri); + previous_class_id = psStringCopy(psMetadataLookupStr(NULL,row,"tmp_class_id")); + psStringSubstitute(&previous_class_id,"XY","ota"); + previous_uri = psStringCopy(psMetadataLookupStr(NULL,row,"uri")); // Save for next round. + continue; } - if (strcmp("pending_burntool",imfile_state) != 0) { // Probably the state is full, do not twiddle states - // Save this round for next round. - psFree(previous_class_id); - psFree(previous_uri); - previous_class_id = psStringCopy(psMetadataLookupStr(NULL,row,"tmp_class_id")); - psStringSubstitute(&previous_class_id,"XY","ota"); - previous_uri = psStringCopy(psMetadataLookupStr(NULL,row,"uri")); // Save for next round. - continue; + if (strcmp("pending_burntool",imfile_state) != 0) { // Probably the state is full, do not twiddle states + // Save this round for next round. + psFree(previous_class_id); + psFree(previous_uri); + previous_class_id = psStringCopy(psMetadataLookupStr(NULL,row,"tmp_class_id")); + psStringSubstitute(&previous_class_id,"XY","ota"); + previous_uri = psStringCopy(psMetadataLookupStr(NULL,row,"uri")); // Save for next round. + continue; } } - + // Determine if we've already suggested an entry for this ota, and if not, copy this // suggestion into our output result list. @@ -439,5 +441,5 @@ previous_class_id = psStringCopy(psMetadataLookupStr(NULL,row,"tmp_class_id")); psStringSubstitute(&previous_class_id,"XY","ota"); - previous_uri = psStringCopy(psMetadataLookupStr(NULL,row,"uri")); // Save for next round. + previous_uri = psStringCopy(psMetadataLookupStr(NULL,row,"uri")); // Save for next round. continue; } @@ -450,7 +452,7 @@ previous_class_id = psStringCopy(psMetadataLookupStr(NULL,row,"tmp_class_id")); psStringSubstitute(&previous_class_id,"XY","ota"); - previous_uri = psStringCopy(psMetadataLookupStr(NULL,row,"uri")); // Save for next round. - } - + previous_uri = psStringCopy(psMetadataLookupStr(NULL,row,"uri")); // Save for next round. + } + // negate simple so the default is true if (!ippdbPrintMetadatas(stdout, results, "regPendingBurntoolImfile", !simple)) { @@ -460,14 +462,14 @@ return false; } - + psFree(output); psFree(results); - + return(true); - -} - - + +} + + static bool addprocessedimfileMode(pxConfig *config) @@ -545,5 +547,5 @@ PXOPT_LOOKUP_STR(md5sum, config->args, "-md5sum", false, false); PXOPT_LOOKUP_BOOL(video_cells, config->args, "-video_cells", false); - + PXOPT_LOOKUP_S16(fault, config->args, "-fault", false, false); PXOPT_LOOKUP_S16(quality, config->args, "-quality", false, false); @@ -618,5 +620,5 @@ bytes, md5sum, - video_cells, + video_cells, 0 // burntool_state )) { @@ -806,9 +808,9 @@ PXOPT_LOOKUP_STR(set_state, config->args, "-set_state", false, false); - if ((fault == INT16_MAX) && !isfinite(burntool_state) && !(set_state)) { + if ((fault == INT16_MAX) && (burntool_state == INT16_MAX) && !set_state) { psError(PS_ERR_UNKNOWN, false, "one of -fault or -burntool_state or -set_state must be selected"); return false; } - if ((fault != INT16_MAX) && isfinite(burntool_state)) { + if ((fault != INT16_MAX) && (burntool_state != INT16_MAX)) { psError(PS_ERR_UNKNOWN, false, "only one of -fault or -burntool_state must be selected"); return false; @@ -1312,8 +1314,8 @@ if (!pxchipQueueByExpTag(config, exp_id, - chip_workdir, + chip_workdir, label, - data_group, - dist_group, + data_group, + dist_group, reduction, NULL, // expgroup