Index: trunk/ippTools/src/dqstatstool.c =================================================================== --- trunk/ippTools/src/dqstatstool.c (revision 26378) +++ trunk/ippTools/src/dqstatstool.c (revision 26981) @@ -71,5 +71,5 @@ PXOPT_LOOKUP_BOOL(force, config->args, "-force", false); PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, 0); - + // properties of the raw exposures psMetadata *where = psMetadataAlloc(); @@ -79,5 +79,5 @@ psString query = pxDataGet("dqstatstool_definebyquery.sql"); if (!query) { - psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement"); + psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement"); psFree(where); return(false); @@ -96,5 +96,5 @@ psStringAppend(&query, " OR invalid = 0"); } - + psFree(where); if (limit) { @@ -103,5 +103,5 @@ psFree(limitString); } - + if (!p_psDBRunQuery(config->dbh, query)) { psError(PS_ERR_UNKNOWN, false, "database error"); @@ -140,14 +140,14 @@ return false; } - + // Create the run entry and grab the dqstats_id dqstatsRunRow *run = dqstatsRunRowAlloc( - 0, // ID - "new", // state - registered, - set_label, - 0 // fault - ); - + 0, // ID + "new", // state + registered, + set_label, + 0 // fault + ); + if (!dqstatsRunInsertObject(config->dbh, run)) { if (!psDBRollback(config->dbh)) { @@ -182,15 +182,15 @@ if (!dqstatsContentInsert(config->dbh, - dqstats_id, - exp_id, - chip_id, - cam_id, - warp_id, - 0 // do not create automatically invalid contents - )) { + dqstats_id, + exp_id, + chip_id, + cam_id, + warp_id, + 0 // do not create automatically invalid contents + )) { psError(PS_ERR_UNKNOWN, false, "database error"); psFree(output); if (!psDBRollback(config->dbh)) { - psError(PS_ERR_UNKNOWN, false, "database error"); + psError(PS_ERR_UNKNOWN, false, "database error"); } return(false); @@ -210,17 +210,17 @@ static bool pendingbundleMode(pxConfig *config) { PS_ASSERT_PTR_NON_NULL(config,false); - + PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false); PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false); - - + + psMetadata *where = psMetadataAlloc(); - // pxdqstatsGetSearchArgs (config, where); + // pxdqstatsGetSearchArgs (config, where); PXOPT_COPY_S64(config->args, where, "-dqstats_id", "dqstatsRun.dqstats_id", "=="); PXOPT_COPY_STR(config->args, where, "-label", "dqstatsRun.label", "=="); - + psString query = pxDataGet("dqstatstool_get_run.sql"); // query if (!query) { - psError(PXTOOLS_ERR_DATA, false, "Failed to retrieve sql statement (dqstatstool_get_run.sql)"); + psError(PXTOOLS_ERR_SYS, false, "Failed to retrieve sql statement (dqstatstool_get_run.sql)"); return(false); } @@ -239,5 +239,5 @@ psFree(limitString); } - + if (!p_psDBRunQuery(config->dbh, query)) { psError(PS_ERR_UNKNOWN, false, "database error"); @@ -246,5 +246,5 @@ } psFree(query); // where whereClause - + psArray *output = p_psDBFetchResult(config->dbh); // where whereClause output if (!output) { @@ -284,5 +284,5 @@ psString runQuery = pxDataGet("dqstatstool_get_run.sql"); if (!runQuery) { - psError(PXTOOLS_ERR_DATA, false, "Failed to retrieve sql statement (dqstatstool_get_run.sql)"); + psError(PXTOOLS_ERR_SYS, false, "Failed to retrieve sql statement (dqstatstool_get_run.sql)"); return(false); } @@ -292,5 +292,5 @@ psString whereClause = psDBGenerateWhereConditionSQL(where, NULL); // Save for content query psStringAppend(&runQuery, " AND %s", whereClause); - psFree(where); + psFree(where); if (!p_psDBRunQuery(config->dbh, runQuery)) { @@ -301,5 +301,5 @@ } psFree(runQuery); - + psArray *output = p_psDBFetchResult(config->dbh); if (!output) { @@ -333,5 +333,5 @@ return(false); } - + psMetadataIterator *iter = psMetadataIteratorAlloc(columns, PS_LIST_HEAD,NULL); @@ -348,18 +348,18 @@ psStringAppend(&columnlist, ", "); } - + psStringAppend(&columnlist, "%s.%s", - psMetadataLookupStr(&status,coldef,"TABLE"), - psMetadataLookupStr(&status,coldef,"ENTRY")); + psMetadataLookupStr(&status,coldef,"TABLE"), + psMetadataLookupStr(&status,coldef,"ENTRY")); psMetadataAddStr(colNames,PS_LIST_TAIL, - psMetadataLookupStr(&status,coldef,"ENTRY"),0,"", - psMetadataLookupStr(&status,coldef,"COLNAME")); + psMetadataLookupStr(&status,coldef,"ENTRY"),0,"", + psMetadataLookupStr(&status,coldef,"COLNAME")); psMetadataAddStr(colTypes,PS_LIST_TAIL, - psMetadataLookupStr(&status,coldef,"ENTRY"),0,"", - psMetadataLookupStr(&status,coldef,"DATATYPE")); + psMetadataLookupStr(&status,coldef,"ENTRY"),0,"", + psMetadataLookupStr(&status,coldef,"DATATYPE")); } psFree(iter); - + if (!columnlist) { psError(PS_ERR_UNKNOWN, false, "Failed to find a columnlist"); @@ -369,9 +369,9 @@ return(false); } - + // Find the contents that comprise this run psString contentQuery = pxDataGet("dqstatstool_get_contents.sql"); if (!contentQuery) { - psError(PXTOOLS_ERR_DATA, false, "Failed to retrieve sql statement (dqstatstool_get_contents.sql)"); + psError(PXTOOLS_ERR_SYS, false, "Failed to retrieve sql statement (dqstatstool_get_contents.sql)"); psFree(whereClause); psFree(colNames); @@ -414,5 +414,5 @@ psString query = pxDataGet("dqstatstool_createbundle.sql"); if (!query) { - psError(PXTOOLS_ERR_DATA, false, "Failed to retrieve sql statement"); + psError(PXTOOLS_ERR_SYS, false, "Failed to retrieve sql statement"); psFree(colNames); psFree(colTypes); @@ -448,7 +448,7 @@ psMetadataAddS64(where,PS_LIST_TAIL, "warpRun.warp_id", 0, "==", psMetadataLookupS64(&status,row,"warp_id")); } - + psString whereClause = psDBGenerateWhereConditionSQL(where, NULL); - psStringAppend(&MYquery, " WHERE %s", whereClause); + psStringAppend(&MYquery, " WHERE %s", whereClause); psFree(whereClause); psFree(where); @@ -466,5 +466,5 @@ } psFree(MYquery); - + psArray *statsoutput = p_psDBFetchResult(config->dbh); if (!statsoutput) { @@ -501,63 +501,63 @@ psString colType = psMetadataLookupStr(&status,colTypes,rowItem->name); if (!colType) { - psError(PS_ERR_UNKNOWN,false, "Could not find type for %s",rowItem->name); - return(false); + psError(PS_ERR_UNKNOWN,false, "Could not find type for %s",rowItem->name); + return(false); } psString colName = psMetadataLookupStr(&status,colNames,rowItem->name); if (!colName) { - psError(PS_ERR_UNKNOWN,false, "Could not find name for %s",rowItem->name); - return(false); + psError(PS_ERR_UNKNOWN,false, "Could not find name for %s",rowItem->name); + return(false); } if (!strcmp(colType,"PS_DATA_BOOL")) { - success = psMetadataAddBool(tableRow,PS_LIST_TAIL,colName,0,"",rowItem->data.B); + success = psMetadataAddBool(tableRow,PS_LIST_TAIL,colName,0,"",rowItem->data.B); } else if (!strcmp(colType,"PS_DATA_S8")) { - success = psMetadataAddS8(tableRow,PS_LIST_TAIL,colName,0,"",rowItem->data.S8); + success = psMetadataAddS8(tableRow,PS_LIST_TAIL,colName,0,"",rowItem->data.S8); } else if (!strcmp(colType,"PS_DATA_S16")) { - success = psMetadataAddS16(tableRow,PS_LIST_TAIL,colName,0,"",rowItem->data.S16); + success = psMetadataAddS16(tableRow,PS_LIST_TAIL,colName,0,"",rowItem->data.S16); } else if (!strcmp(colType,"PS_DATA_S32")) { - success = psMetadataAddS32(tableRow,PS_LIST_TAIL,colName,0,"",rowItem->data.S32); + success = psMetadataAddS32(tableRow,PS_LIST_TAIL,colName,0,"",rowItem->data.S32); } else if (!strcmp(colType,"PS_DATA_S64")) { - success = psMetadataAddS64(tableRow,PS_LIST_TAIL,colName,0,"",rowItem->data.S64); + success = psMetadataAddS64(tableRow,PS_LIST_TAIL,colName,0,"",rowItem->data.S64); } else if (!strcmp(colType,"PS_DATA_U8")) { - success = psMetadataAddU8(tableRow,PS_LIST_TAIL,colName,0,"",rowItem->data.U8); + success = psMetadataAddU8(tableRow,PS_LIST_TAIL,colName,0,"",rowItem->data.U8); } else if (!strcmp(colType,"PS_DATA_U16")) { - success = psMetadataAddU16(tableRow,PS_LIST_TAIL,colName,0,"",rowItem->data.U16); + success = psMetadataAddU16(tableRow,PS_LIST_TAIL,colName,0,"",rowItem->data.U16); } else if (!strcmp(colType,"PS_DATA_U32")) { - success = psMetadataAddU32(tableRow,PS_LIST_TAIL,colName,0,"",rowItem->data.U32); + success = psMetadataAddU32(tableRow,PS_LIST_TAIL,colName,0,"",rowItem->data.U32); } else if (!strcmp(colType,"PS_DATA_U64")) { - success = psMetadataAddU64(tableRow,PS_LIST_TAIL,colName,0,"",rowItem->data.U64); + success = psMetadataAddU64(tableRow,PS_LIST_TAIL,colName,0,"",rowItem->data.U64); } else if (!strcmp(colType,"PS_DATA_F32")) { - success = psMetadataAddF32(tableRow,PS_LIST_TAIL,colName,0,"",rowItem->data.F32); + success = psMetadataAddF32(tableRow,PS_LIST_TAIL,colName,0,"",rowItem->data.F32); } else if (!strcmp(colType,"PS_DATA_F64")) { - success = psMetadataAddF64(tableRow,PS_LIST_TAIL,colName,0,"",rowItem->data.F64); + success = psMetadataAddF64(tableRow,PS_LIST_TAIL,colName,0,"",rowItem->data.F64); } else if (!strcmp(colType,"PS_DATA_STRING")) { - success = psMetadataAddStr(tableRow,PS_LIST_TAIL,colName,0,"",rowItem->data.str); - } - + success = psMetadataAddStr(tableRow,PS_LIST_TAIL,colName,0,"",rowItem->data.str); + } + if (!success) { - psError(PS_ERR_UNKNOWN,false, "Error constructing fits table row."); - psFree(colNames); - psFree(colTypes); - psFree(contents); - psFree(query); - psFree(outTable); - psFree(statsoutput); - psFree(statIter); - psFree(tableRow); - psFree(colType); - psFree(colName); - return(false); + psError(PS_ERR_UNKNOWN,false, "Error constructing fits table row."); + psFree(colNames); + psFree(colTypes); + psFree(contents); + psFree(query); + psFree(outTable); + psFree(statsoutput); + psFree(statIter); + psFree(tableRow); + psFree(colType); + psFree(colName); + return(false); } } @@ -571,5 +571,5 @@ psFree(query); // Define the fits table here. - + psFits *Table = psFitsOpen(bundleUri,"w"); if (!Table) { @@ -577,9 +577,9 @@ psFree(outTable); return(false); - } + } psMetadata *header = psMetadataAlloc(); psMetadataAddS64(header, PS_LIST_TAIL, "DQSTATS_ID", 0, "ID number of DQSTATS run", dqstats_id); - + if (!psFitsWriteTable(Table,header,outTable,"DQSTATS")) { psError(PS_ERR_UNKNOWN, false, "Unable to write table to fits file."); @@ -594,7 +594,7 @@ // Tear down, cleanup. psFitsClose(Table); - return(true); + return(true); } - + static bool updaterunMode(pxConfig *config) { @@ -603,20 +603,20 @@ PXOPT_LOOKUP_STR(state, config->args, "-set_state", "state", "=="); PXOPT_LOOKUP_S16(fault, config->args, "-fault", "fault", "=="); - + if (state && ! pxIsValidState(state)) { - psError(PXTOOLS_ERR_DATA, false, "pxIsValidState failed"); - return(false); - } - + psError(PXTOOLS_ERR_CONFIG, false, "pxIsValidState failed"); + return(false); + } + psMetadata *where = psMetadataAlloc(); PXOPT_COPY_S64(config->args, where, "-dqstats_id", "dqstats_id", "=="); PXOPT_COPY_S64(config->args, where, "-state", "state", "=="); - + if (!psListLength(where->list)) { psFree(where); - psError(PXTOOLS_ERR_DATA, false, "search parameters are required"); - return(false); - } - + psError(PXTOOLS_ERR_CONFIG, false, "search parameters are required"); + return(false); + } + psString query = psStringCopy("UPDATE dqstatsRun "); psStringAppend(&query," SET state = '%s' ", state); @@ -626,14 +626,14 @@ psString whereClause = psDBGenerateWhereConditionSQL(where, NULL); psStringAppend(&query," WHERE %s ",whereClause); - + if (!p_psDBRunQuery(config->dbh, query)) { psError(PS_ERR_UNKNOWN, false, "database error"); return(false); } - + psFree(query); psFree(where); psFree(whereClause); - + return(true); } @@ -648,5 +648,5 @@ if (!psListLength(where->list)) { psFree(where); - psError(PXTOOLS_ERR_DATA, false, "search parameters are required"); + psError(PXTOOLS_ERR_CONFIG, false, "search parameters are required"); return(false); } @@ -667,9 +667,9 @@ return(true); } - - - - - - - + + + + + + +