IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Jan 16, 2007, 12:21:17 PM (19 years ago)
Author:
jhoblitt
Message:

VERSION 0.0.76

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/ippdb/src/ippdb.c

    r11077 r11113  
    92249224static void detProcessedImfileRowFree(detProcessedImfileRow *object);
    92259225
    9226 detProcessedImfileRow *detProcessedImfileRowAlloc(psS32 det_id, const char *exp_tag, const char *class_id, const char *uri, const char *recipe, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, const char *b1_uri, const char *b2_uri)
     9226detProcessedImfileRow *detProcessedImfileRowAlloc(psS32 det_id, const char *exp_tag, const char *class_id, const char *uri, const char *recipe, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, const char *b1_uri, const char *b2_uri, psS16 fault)
    92279227{
    92289228    detProcessedImfileRow *_object;
    … …  
    92419241    _object->b1_uri = psStringCopy(b1_uri);
    92429242    _object->b2_uri = psStringCopy(b2_uri);
     9243    _object->fault = fault;
    92439244
    92449245    return _object;
    … …  
    93089309        return false;
    93099310    }
     9311    if (!psMetadataAdd(md, PS_LIST_TAIL, "fault", PS_DATA_S16, "NOT NULL", 0)) {
     9312        psError(PS_ERR_UNKNOWN, false, "failed to add item fault");
     9313        psFree(md);
     9314        return false;
     9315    }
    93109316
    93119317    bool status = psDBCreateTable(dbh, DETPROCESSEDIMFILE_TABLE_NAME, md);
    … …  
    93219327}
    93229328
    9323 bool detProcessedImfileInsert(psDB * dbh, psS32 det_id, const char *exp_tag, const char *class_id, const char *uri, const char *recipe, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, const char *b1_uri, const char *b2_uri)
     9329bool detProcessedImfileInsert(psDB * dbh, psS32 det_id, const char *exp_tag, const char *class_id, const char *uri, const char *recipe, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, const char *b1_uri, const char *b2_uri, psS16 fault)
    93249330{
    93259331    psMetadata *md = psMetadataAlloc();
    … …  
    93719377    if (!psMetadataAdd(md, PS_LIST_TAIL, "b2_uri", PS_DATA_STRING, NULL, b2_uri)) {
    93729378        psError(PS_ERR_UNKNOWN, false, "failed to add item b2_uri");
     9379        psFree(md);
     9380        return false;
     9381    }
     9382    if (!psMetadataAdd(md, PS_LIST_TAIL, "fault", PS_DATA_S16, NULL, fault)) {
     9383        psError(PS_ERR_UNKNOWN, false, "failed to add item fault");
    93739384        psFree(md);
    93749385        return false;
    … …  
    93979408bool detProcessedImfileInsertObject(psDB *dbh, detProcessedImfileRow *object)
    93989409{
    9399     return detProcessedImfileInsert(dbh, object->det_id, object->exp_tag, object->class_id, object->uri, object->recipe, object->bg, object->bg_stdev, object->bg_mean_stdev, object->b1_uri, object->b2_uri);
     9410    return detProcessedImfileInsert(dbh, object->det_id, object->exp_tag, object->class_id, object->uri, object->recipe, object->bg, object->bg_stdev, object->bg_mean_stdev, object->b1_uri, object->b2_uri, object->fault);
    94009411}
    94019412
    … …  
    95209531        return false;
    95219532    }
     9533    if (!psMetadataAdd(md, PS_LIST_TAIL, "fault", PS_DATA_S16, NULL, object->fault)) {
     9534        psError(PS_ERR_UNKNOWN, false, "failed to add item fault");
     9535        psFree(md);
     9536        return false;
     9537    }
    95229538
    95239539
    … …  
    95799595        return false;
    95809596    }
    9581 
    9582     return detProcessedImfileRowAlloc(det_id, exp_tag, class_id, uri, recipe, bg, bg_stdev, bg_mean_stdev, b1_uri, b2_uri);
     9597    psS16 fault = psMetadataLookupS16(&status, md, "fault");
     9598    if (!status) {
     9599        psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item fault");
     9600        return false;
     9601    }
     9602
     9603    return detProcessedImfileRowAlloc(det_id, exp_tag, class_id, uri, recipe, bg, bg_stdev, bg_mean_stdev, b1_uri, b2_uri, fault);
    95839604}
    95849605psArray *detProcessedImfileSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit)
    … …  
    96929713static void detProcessedExpRowFree(detProcessedExpRow *object);
    96939714
    9694 detProcessedExpRow *detProcessedExpRowAlloc(psS32 det_id, const char *exp_tag, const char *recipe, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, const char *b1_uri, const char *b2_uri)
     9715detProcessedExpRow *detProcessedExpRowAlloc(psS32 det_id, const char *exp_tag, const char *recipe, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, const char *b1_uri, const char *b2_uri, psS16 fault)
    96959716{
    96969717    detProcessedExpRow *_object;
    … …  
    97079728    _object->b1_uri = psStringCopy(b1_uri);
    97089729    _object->b2_uri = psStringCopy(b2_uri);
     9730    _object->fault = fault;
    97099731
    97109732    return _object;
    … …  
    97629784        return false;
    97639785    }
     9786    if (!psMetadataAdd(md, PS_LIST_TAIL, "fault", PS_DATA_S16, "NOT NULL", 0)) {
     9787        psError(PS_ERR_UNKNOWN, false, "failed to add item fault");
     9788        psFree(md);
     9789        return false;
     9790    }
    97649791
    97659792    bool status = psDBCreateTable(dbh, DETPROCESSEDEXP_TABLE_NAME, md);
    … …  
    97759802}
    97769803
    9777 bool detProcessedExpInsert(psDB * dbh, psS32 det_id, const char *exp_tag, const char *recipe, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, const char *b1_uri, const char *b2_uri)
     9804bool detProcessedExpInsert(psDB * dbh, psS32 det_id, const char *exp_tag, const char *recipe, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, const char *b1_uri, const char *b2_uri, psS16 fault)
    97789805{
    97799806    psMetadata *md = psMetadataAlloc();
    … …  
    98159842    if (!psMetadataAdd(md, PS_LIST_TAIL, "b2_uri", PS_DATA_STRING, NULL, b2_uri)) {
    98169843        psError(PS_ERR_UNKNOWN, false, "failed to add item b2_uri");
     9844        psFree(md);
     9845        return false;
     9846    }
     9847    if (!psMetadataAdd(md, PS_LIST_TAIL, "fault", PS_DATA_S16, NULL, fault)) {
     9848        psError(PS_ERR_UNKNOWN, false, "failed to add item fault");
    98179849        psFree(md);
    98189850        return false;
    … …  
    98419873bool detProcessedExpInsertObject(psDB *dbh, detProcessedExpRow *object)
    98429874{
    9843     return detProcessedExpInsert(dbh, object->det_id, object->exp_tag, object->recipe, object->bg, object->bg_stdev, object->bg_mean_stdev, object->b1_uri, object->b2_uri);
     9875    return detProcessedExpInsert(dbh, object->det_id, object->exp_tag, object->recipe, object->bg, object->bg_stdev, object->bg_mean_stdev, object->b1_uri, object->b2_uri, object->fault);
    98449876}
    98459877
    … …  
    99549986        return false;
    99559987    }
     9988    if (!psMetadataAdd(md, PS_LIST_TAIL, "fault", PS_DATA_S16, NULL, object->fault)) {
     9989        psError(PS_ERR_UNKNOWN, false, "failed to add item fault");
     9990        psFree(md);
     9991        return false;
     9992    }
    99569993
    99579994
    … …  
    1000310040        return false;
    1000410041    }
    10005 
    10006     return detProcessedExpRowAlloc(det_id, exp_tag, recipe, bg, bg_stdev, bg_mean_stdev, b1_uri, b2_uri);
     10042    psS16 fault = psMetadataLookupS16(&status, md, "fault");
     10043    if (!status) {
     10044        psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item fault");
     10045        return false;
     10046    }
     10047
     10048    return detProcessedExpRowAlloc(det_id, exp_tag, recipe, bg, bg_stdev, bg_mean_stdev, b1_uri, b2_uri, fault);
    1000710049}
    1000810050psArray *detProcessedExpSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit)
    … …  
    1011610158static void detStackedImfileRowFree(detStackedImfileRow *object);
    1011710159
    10118 detStackedImfileRow *detStackedImfileRowAlloc(psS32 det_id, psS32 iteration, const char *class_id, const char *uri, const char *recipe, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev)
     10160detStackedImfileRow *detStackedImfileRowAlloc(psS32 det_id, psS32 iteration, const char *class_id, const char *uri, const char *recipe, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, psS16 fault)
    1011910161{
    1012010162    detStackedImfileRow *_object;
    … …  
    1013110173    _object->bg_stdev = bg_stdev;
    1013210174    _object->bg_mean_stdev = bg_mean_stdev;
     10175    _object->fault = fault;
    1013310176
    1013410177    return _object;
    … …  
    1018510228        return false;
    1018610229    }
     10230    if (!psMetadataAdd(md, PS_LIST_TAIL, "fault", PS_DATA_S16, "NOT NULL", 0)) {
     10231        psError(PS_ERR_UNKNOWN, false, "failed to add item fault");
     10232        psFree(md);
     10233        return false;
     10234    }
    1018710235
    1018810236    bool status = psDBCreateTable(dbh, DETSTACKEDIMFILE_TABLE_NAME, md);
    … …  
    1019810246}
    1019910247
    10200 bool detStackedImfileInsert(psDB * dbh, psS32 det_id, psS32 iteration, const char *class_id, const char *uri, const char *recipe, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev)
     10248bool detStackedImfileInsert(psDB * dbh, psS32 det_id, psS32 iteration, const char *class_id, const char *uri, const char *recipe, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, psS16 fault)
    1020110249{
    1020210250    psMetadata *md = psMetadataAlloc();
    … …  
    1023810286    if (!psMetadataAdd(md, PS_LIST_TAIL, "bg_mean_stdev", PS_DATA_F64, NULL, bg_mean_stdev)) {
    1023910287        psError(PS_ERR_UNKNOWN, false, "failed to add item bg_mean_stdev");
     10288        psFree(md);
     10289        return false;
     10290    }
     10291    if (!psMetadataAdd(md, PS_LIST_TAIL, "fault", PS_DATA_S16, NULL, fault)) {
     10292        psError(PS_ERR_UNKNOWN, false, "failed to add item fault");
    1024010293        psFree(md);
    1024110294        return false;
    … …  
    1026410317bool detStackedImfileInsertObject(psDB *dbh, detStackedImfileRow *object)
    1026510318{
    10266     return detStackedImfileInsert(dbh, object->det_id, object->iteration, object->class_id, object->uri, object->recipe, object->bg, object->bg_stdev, object->bg_mean_stdev);
     10319    return detStackedImfileInsert(dbh, object->det_id, object->iteration, object->class_id, object->uri, object->recipe, object->bg, object->bg_stdev, object->bg_mean_stdev, object->fault);
    1026710320}
    1026810321
    … …  
    1037710430        return false;
    1037810431    }
     10432    if (!psMetadataAdd(md, PS_LIST_TAIL, "fault", PS_DATA_S16, NULL, object->fault)) {
     10433        psError(PS_ERR_UNKNOWN, false, "failed to add item fault");
     10434        psFree(md);
     10435        return false;
     10436    }
    1037910437
    1038010438
    … …  
    1042610484        return false;
    1042710485    }
    10428 
    10429     return detStackedImfileRowAlloc(det_id, iteration, class_id, uri, recipe, bg, bg_stdev, bg_mean_stdev);
     10486    psS16 fault = psMetadataLookupS16(&status, md, "fault");
     10487    if (!status) {
     10488        psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item fault");
     10489        return false;
     10490    }
     10491
     10492    return detStackedImfileRowAlloc(det_id, iteration, class_id, uri, recipe, bg, bg_stdev, bg_mean_stdev, fault);
    1043010493}
    1043110494psArray *detStackedImfileSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit)
    … …  
    1053910602static void detNormalizedStatImfileRowFree(detNormalizedStatImfileRow *object);
    1054010603
    10541 detNormalizedStatImfileRow *detNormalizedStatImfileRowAlloc(psS32 det_id, psS32 iteration, const char *class_id, psF32 norm)
     10604detNormalizedStatImfileRow *detNormalizedStatImfileRowAlloc(psS32 det_id, psS32 iteration, const char *class_id, psF32 norm, psS16 fault)
    1054210605{
    1054310606    detNormalizedStatImfileRow *_object;
    … …  
    1055010613    _object->class_id = psStringCopy(class_id);
    1055110614    _object->norm = norm;
     10615    _object->fault = fault;
    1055210616
    1055310617    return _object;
    … …  
    1058210646        return false;
    1058310647    }
     10648    if (!psMetadataAdd(md, PS_LIST_TAIL, "fault", PS_DATA_S16, "NOT NULL", 0)) {
     10649        psError(PS_ERR_UNKNOWN, false, "failed to add item fault");
     10650        psFree(md);
     10651        return false;
     10652    }
    1058410653
    1058510654    bool status = psDBCreateTable(dbh, DETNORMALIZEDSTATIMFILE_TABLE_NAME, md);
    … …  
    1059510664}
    1059610665
    10597 bool detNormalizedStatImfileInsert(psDB * dbh, psS32 det_id, psS32 iteration, const char *class_id, psF32 norm)
     10666bool detNormalizedStatImfileInsert(psDB * dbh, psS32 det_id, psS32 iteration, const char *class_id, psF32 norm, psS16 fault)
    1059810667{
    1059910668    psMetadata *md = psMetadataAlloc();
    … …  
    1061510684    if (!psMetadataAdd(md, PS_LIST_TAIL, "norm", PS_DATA_F32, NULL, norm)) {
    1061610685        psError(PS_ERR_UNKNOWN, false, "failed to add item norm");
     10686        psFree(md);
     10687        return false;
     10688    }
     10689    if (!psMetadataAdd(md, PS_LIST_TAIL, "fault", PS_DATA_S16, NULL, fault)) {
     10690        psError(PS_ERR_UNKNOWN, false, "failed to add item fault");
    1061710691        psFree(md);
    1061810692        return false;
    … …  
    1064110715bool detNormalizedStatImfileInsertObject(psDB *dbh, detNormalizedStatImfileRow *object)
    1064210716{
    10643     return detNormalizedStatImfileInsert(dbh, object->det_id, object->iteration, object->class_id, object->norm);
     10717    return detNormalizedStatImfileInsert(dbh, object->det_id, object->iteration, object->class_id, object->norm, object->fault);
    1064410718}
    1064510719
    … …  
    1073410808        return false;
    1073510809    }
     10810    if (!psMetadataAdd(md, PS_LIST_TAIL, "fault", PS_DATA_S16, NULL, object->fault)) {
     10811        psError(PS_ERR_UNKNOWN, false, "failed to add item fault");
     10812        psFree(md);
     10813        return false;
     10814    }
    1073610815
    1073710816
    … …  
    1076310842        return false;
    1076410843    }
    10765 
    10766     return detNormalizedStatImfileRowAlloc(det_id, iteration, class_id, norm);
     10844    psS16 fault = psMetadataLookupS16(&status, md, "fault");
     10845    if (!status) {
     10846        psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item fault");
     10847        return false;
     10848    }
     10849
     10850    return detNormalizedStatImfileRowAlloc(det_id, iteration, class_id, norm, fault);
    1076710851}
    1076810852psArray *detNormalizedStatImfileSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit)
    … …  
    1087610960static void detNormalizedImfileRowFree(detNormalizedImfileRow *object);
    1087710961
    10878 detNormalizedImfileRow *detNormalizedImfileRowAlloc(psS32 det_id, psS32 iteration, const char *class_id, const char *uri, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, const char *b1_uri, const char *b2_uri)
     10962detNormalizedImfileRow *detNormalizedImfileRowAlloc(psS32 det_id, psS32 iteration, const char *class_id, const char *uri, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, const char *b1_uri, const char *b2_uri, psS16 fault)
    1087910963{
    1088010964    detNormalizedImfileRow *_object;
    … …  
    1089210976    _object->b1_uri = psStringCopy(b1_uri);
    1089310977    _object->b2_uri = psStringCopy(b2_uri);
     10978    _object->fault = fault;
    1089410979
    1089510980    return _object;
    … …  
    1095211037        return false;
    1095311038    }
     11039    if (!psMetadataAdd(md, PS_LIST_TAIL, "fault", PS_DATA_S16, "NOT NULL", 0)) {
     11040        psError(PS_ERR_UNKNOWN, false, "failed to add item fault");
     11041        psFree(md);
     11042        return false;
     11043    }
    1095411044
    1095511045    bool status = psDBCreateTable(dbh, DETNORMALIZEDIMFILE_TABLE_NAME, md);
    … …  
    1096511055}
    1096611056
    10967 bool detNormalizedImfileInsert(psDB * dbh, psS32 det_id, psS32 iteration, const char *class_id, const char *uri, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, const char *b1_uri, const char *b2_uri)
     11057bool detNormalizedImfileInsert(psDB * dbh, psS32 det_id, psS32 iteration, const char *class_id, const char *uri, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, const char *b1_uri, const char *b2_uri, psS16 fault)
    1096811058{
    1096911059    psMetadata *md = psMetadataAlloc();
    … …  
    1101011100    if (!psMetadataAdd(md, PS_LIST_TAIL, "b2_uri", PS_DATA_STRING, NULL, b2_uri)) {
    1101111101        psError(PS_ERR_UNKNOWN, false, "failed to add item b2_uri");
     11102        psFree(md);
     11103        return false;
     11104    }
     11105    if (!psMetadataAdd(md, PS_LIST_TAIL, "fault", PS_DATA_S16, NULL, fault)) {
     11106        psError(PS_ERR_UNKNOWN, false, "failed to add item fault");
    1101211107        psFree(md);
    1101311108        return false;
    … …  
    1103611131bool detNormalizedImfileInsertObject(psDB *dbh, detNormalizedImfileRow *object)
    1103711132{
    11038     return detNormalizedImfileInsert(dbh, object->det_id, object->iteration, object->class_id, object->uri, object->bg, object->bg_stdev, object->bg_mean_stdev, object->b1_uri, object->b2_uri);
     11133    return detNormalizedImfileInsert(dbh, object->det_id, object->iteration, object->class_id, object->uri, object->bg, object->bg_stdev, object->bg_mean_stdev, object->b1_uri, object->b2_uri, object->fault);
    1103911134}
    1104011135
    … …  
    1115411249        return false;
    1115511250    }
     11251    if (!psMetadataAdd(md, PS_LIST_TAIL, "fault", PS_DATA_S16, NULL, object->fault)) {
     11252        psError(PS_ERR_UNKNOWN, false, "failed to add item fault");
     11253        psFree(md);
     11254        return false;
     11255    }
    1115611256
    1115711257
    … …  
    1120811308        return false;
    1120911309    }
    11210 
    11211     return detNormalizedImfileRowAlloc(det_id, iteration, class_id, uri, bg, bg_stdev, bg_mean_stdev, b1_uri, b2_uri);
     11310    psS16 fault = psMetadataLookupS16(&status, md, "fault");
     11311    if (!status) {
     11312        psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item fault");
     11313        return false;
     11314    }
     11315
     11316    return detNormalizedImfileRowAlloc(det_id, iteration, class_id, uri, bg, bg_stdev, bg_mean_stdev, b1_uri, b2_uri, fault);
    1121211317}
    1121311318psArray *detNormalizedImfileSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit)
    … …  
    1132111426static void detNormalizedExpRowFree(detNormalizedExpRow *object);
    1132211427
    11323 detNormalizedExpRow *detNormalizedExpRowAlloc(psS32 det_id, psS32 iteration, const char *recipe, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, const char *b1_uri, const char *b2_uri)
     11428detNormalizedExpRow *detNormalizedExpRowAlloc(psS32 det_id, psS32 iteration, const char *recipe, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, const char *b1_uri, const char *b2_uri, psS16 fault)
    1132411429{
    1132511430    detNormalizedExpRow *_object;
    … …  
    1133611441    _object->b1_uri = psStringCopy(b1_uri);
    1133711442    _object->b2_uri = psStringCopy(b2_uri);
     11443    _object->fault = fault;
    1133811444
    1133911445    return _object;
    … …  
    1139011496        return false;
    1139111497    }
     11498    if (!psMetadataAdd(md, PS_LIST_TAIL, "fault", PS_DATA_S16, "NOT NULL", 0)) {
     11499        psError(PS_ERR_UNKNOWN, false, "failed to add item fault");
     11500        psFree(md);
     11501        return false;
     11502    }
    1139211503
    1139311504    bool status = psDBCreateTable(dbh, DETNORMALIZEDEXP_TABLE_NAME, md);
    … …  
    1140311514}
    1140411515
    11405 bool detNormalizedExpInsert(psDB * dbh, psS32 det_id, psS32 iteration, const char *recipe, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, const char *b1_uri, const char *b2_uri)
     11516bool detNormalizedExpInsert(psDB * dbh, psS32 det_id, psS32 iteration, const char *recipe, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, const char *b1_uri, const char *b2_uri, psS16 fault)
    1140611517{
    1140711518    psMetadata *md = psMetadataAlloc();
    … …  
    1144311554    if (!psMetadataAdd(md, PS_LIST_TAIL, "b2_uri", PS_DATA_STRING, NULL, b2_uri)) {
    1144411555        psError(PS_ERR_UNKNOWN, false, "failed to add item b2_uri");
     11556        psFree(md);
     11557        return false;
     11558    }
     11559    if (!psMetadataAdd(md, PS_LIST_TAIL, "fault", PS_DATA_S16, NULL, fault)) {
     11560        psError(PS_ERR_UNKNOWN, false, "failed to add item fault");
    1144511561        psFree(md);
    1144611562        return false;
    … …  
    1146911585bool detNormalizedExpInsertObject(psDB *dbh, detNormalizedExpRow *object)
    1147011586{
    11471     return detNormalizedExpInsert(dbh, object->det_id, object->iteration, object->recipe, object->bg, object->bg_stdev, object->bg_mean_stdev, object->b1_uri, object->b2_uri);
     11587    return detNormalizedExpInsert(dbh, object->det_id, object->iteration, object->recipe, object->bg, object->bg_stdev, object->bg_mean_stdev, object->b1_uri, object->b2_uri, object->fault);
    1147211588}
    1147311589
    … …  
    1158211698        return false;
    1158311699    }
     11700    if (!psMetadataAdd(md, PS_LIST_TAIL, "fault", PS_DATA_S16, NULL, object->fault)) {
     11701        psError(PS_ERR_UNKNOWN, false, "failed to add item fault");
     11702        psFree(md);
     11703        return false;
     11704    }
    1158411705
    1158511706
    … …  
    1163111752        return false;
    1163211753    }
    11633 
    11634     return detNormalizedExpRowAlloc(det_id, iteration, recipe, bg, bg_stdev, bg_mean_stdev, b1_uri, b2_uri);
     11754    psS16 fault = psMetadataLookupS16(&status, md, "fault");
     11755    if (!status) {
     11756        psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item fault");
     11757        return false;
     11758    }
     11759
     11760    return detNormalizedExpRowAlloc(det_id, iteration, recipe, bg, bg_stdev, bg_mean_stdev, b1_uri, b2_uri, fault);
    1163511761}
    1163611762psArray *detNormalizedExpSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit)
    … …  
    1174411870static void detResidImfileRowFree(detResidImfileRow *object);
    1174511871
    11746 detResidImfileRow *detResidImfileRowAlloc(psS32 det_id, psS32 iteration, const char *exp_tag, const char *class_id, const char *uri, const char *recipe, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, const char *b1_uri, const char *b2_uri)
     11872detResidImfileRow *detResidImfileRowAlloc(psS32 det_id, psS32 iteration, const char *exp_tag, const char *class_id, const char *uri, const char *recipe, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, const char *b1_uri, const char *b2_uri, psS16 fault)
    1174711873{
    1174811874    detResidImfileRow *_object;
    … …  
    1176211888    _object->b1_uri = psStringCopy(b1_uri);
    1176311889    _object->b2_uri = psStringCopy(b2_uri);
     11890    _object->fault = fault;
    1176411891
    1176511892    return _object;
    … …  
    1183411961        return false;
    1183511962    }
     11963    if (!psMetadataAdd(md, PS_LIST_TAIL, "fault", PS_DATA_S16, "NOT NULL", 0)) {
     11964        psError(PS_ERR_UNKNOWN, false, "failed to add item fault");
     11965        psFree(md);
     11966        return false;
     11967    }
    1183611968
    1183711969    bool status = psDBCreateTable(dbh, DETRESIDIMFILE_TABLE_NAME, md);
    … …  
    1184711979}
    1184811980
    11849 bool detResidImfileInsert(psDB * dbh, psS32 det_id, psS32 iteration, const char *exp_tag, const char *class_id, const char *uri, const char *recipe, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, const char *b1_uri, const char *b2_uri)
     11981bool detResidImfileInsert(psDB * dbh, psS32 det_id, psS32 iteration, const char *exp_tag, const char *class_id, const char *uri, const char *recipe, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, const char *b1_uri, const char *b2_uri, psS16 fault)
    1185011982{
    1185111983    psMetadata *md = psMetadataAlloc();
    … …  
    1190212034    if (!psMetadataAdd(md, PS_LIST_TAIL, "b2_uri", PS_DATA_STRING, NULL, b2_uri)) {
    1190312035        psError(PS_ERR_UNKNOWN, false, "failed to add item b2_uri");
     12036        psFree(md);
     12037        return false;
     12038    }
     12039    if (!psMetadataAdd(md, PS_LIST_TAIL, "fault", PS_DATA_S16, NULL, fault)) {
     12040        psError(PS_ERR_UNKNOWN, false, "failed to add item fault");
    1190412041        psFree(md);
    1190512042        return false;
    … …  
    1192812065bool detResidImfileInsertObject(psDB *dbh, detResidImfileRow *object)
    1192912066{
    11930     return detResidImfileInsert(dbh, object->det_id, object->iteration, object->exp_tag, object->class_id, object->uri, object->recipe, object->bg, object->bg_stdev, object->bg_mean_stdev, object->b1_uri, object->b2_uri);
     12067    return detResidImfileInsert(dbh, object->det_id, object->iteration, object->exp_tag, object->class_id, object->uri, object->recipe, object->bg, object->bg_stdev, object->bg_mean_stdev, object->b1_uri, object->b2_uri, object->fault);
    1193112068}
    1193212069
    … …  
    1205612193        return false;
    1205712194    }
     12195    if (!psMetadataAdd(md, PS_LIST_TAIL, "fault", PS_DATA_S16, NULL, object->fault)) {
     12196        psError(PS_ERR_UNKNOWN, false, "failed to add item fault");
     12197        psFree(md);
     12198        return false;
     12199    }
    1205812200
    1205912201
    … …  
    1212012262        return false;
    1212112263    }
    12122 
    12123     return detResidImfileRowAlloc(det_id, iteration, exp_tag, class_id, uri, recipe, bg, bg_stdev, bg_mean_stdev, b1_uri, b2_uri);
     12264    psS16 fault = psMetadataLookupS16(&status, md, "fault");
     12265    if (!status) {
     12266        psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item fault");
     12267        return false;
     12268    }
     12269
     12270    return detResidImfileRowAlloc(det_id, iteration, exp_tag, class_id, uri, recipe, bg, bg_stdev, bg_mean_stdev, b1_uri, b2_uri, fault);
    1212412271}
    1212512272psArray *detResidImfileSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit)
    … …  
    1223312380static void detResidExpRowFree(detResidExpRow *object);
    1223412381
    12235 detResidExpRow *detResidExpRowAlloc(psS32 det_id, psS32 iteration, const char *exp_tag, const char *recipe, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, const char *b1_uri, const char *b2_uri, bool accept)
     12382detResidExpRow *detResidExpRowAlloc(psS32 det_id, psS32 iteration, const char *exp_tag, const char *recipe, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, const char *b1_uri, const char *b2_uri, bool accept, psS16 fault)
    1223612383{
    1223712384    detResidExpRow  *_object;
    … …  
    1225012397    _object->b2_uri = psStringCopy(b2_uri);
    1225112398    _object->accept = accept;
     12399    _object->fault = fault;
    1225212400
    1225312401    return _object;
    … …  
    1231512463        return false;
    1231612464    }
     12465    if (!psMetadataAdd(md, PS_LIST_TAIL, "fault", PS_DATA_S16, "NOT NULL", 0)) {
     12466        psError(PS_ERR_UNKNOWN, false, "failed to add item fault");
     12467        psFree(md);
     12468        return false;
     12469    }
    1231712470
    1231812471    bool status = psDBCreateTable(dbh, DETRESIDEXP_TABLE_NAME, md);
    … …  
    1232812481}
    1232912482
    12330 bool detResidExpInsert(psDB * dbh, psS32 det_id, psS32 iteration, const char *exp_tag, const char *recipe, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, const char *b1_uri, const char *b2_uri, bool accept)
     12483bool detResidExpInsert(psDB * dbh, psS32 det_id, psS32 iteration, const char *exp_tag, const char *recipe, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, const char *b1_uri, const char *b2_uri, bool accept, psS16 fault)
    1233112484{
    1233212485    psMetadata *md = psMetadataAlloc();
    … …  
    1237812531    if (!psMetadataAdd(md, PS_LIST_TAIL, "accept", PS_DATA_BOOL, NULL, accept)) {
    1237912532        psError(PS_ERR_UNKNOWN, false, "failed to add item accept");
     12533        psFree(md);
     12534        return false;
     12535    }
     12536    if (!psMetadataAdd(md, PS_LIST_TAIL, "fault", PS_DATA_S16, NULL, fault)) {
     12537        psError(PS_ERR_UNKNOWN, false, "failed to add item fault");
    1238012538        psFree(md);
    1238112539        return false;
    … …  
    1240412562bool detResidExpInsertObject(psDB *dbh, detResidExpRow *object)
    1240512563{
    12406     return detResidExpInsert(dbh, object->det_id, object->iteration, object->exp_tag, object->recipe, object->bg, object->bg_stdev, object->bg_mean_stdev, object->b1_uri, object->b2_uri, object->accept);
     12564    return detResidExpInsert(dbh, object->det_id, object->iteration, object->exp_tag, object->recipe, object->bg, object->bg_stdev, object->bg_mean_stdev, object->b1_uri, object->b2_uri, object->accept, object->fault);
    1240712565}
    1240812566
    … …  
    1252712685        return false;
    1252812686    }
     12687    if (!psMetadataAdd(md, PS_LIST_TAIL, "fault", PS_DATA_S16, NULL, object->fault)) {
     12688        psError(PS_ERR_UNKNOWN, false, "failed to add item fault");
     12689        psFree(md);
     12690        return false;
     12691    }
    1252912692
    1253012693
    … …  
    1258612749        return false;
    1258712750    }
    12588 
    12589     return detResidExpRowAlloc(det_id, iteration, exp_tag, recipe, bg, bg_stdev, bg_mean_stdev, b1_uri, b2_uri, accept);
     12751    psS16 fault = psMetadataLookupS16(&status, md, "fault");
     12752    if (!status) {
     12753        psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item fault");
     12754        return false;
     12755    }
     12756
     12757    return detResidExpRowAlloc(det_id, iteration, exp_tag, recipe, bg, bg_stdev, bg_mean_stdev, b1_uri, b2_uri, accept, fault);
    1259012758}
    1259112759psArray *detResidExpSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit)
    … …  
    1269912867static void detRunSummaryRowFree(detRunSummaryRow *object);
    1270012868
    12701 detRunSummaryRow *detRunSummaryRowAlloc(psS32 det_id, psS32 iteration, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, bool accept)
     12869detRunSummaryRow *detRunSummaryRowAlloc(psS32 det_id, psS32 iteration, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, bool accept, psS16 fault)
    1270212870{
    1270312871    detRunSummaryRow *_object;
    … …  
    1271212880    _object->bg_mean_stdev = bg_mean_stdev;
    1271312881    _object->accept = accept;
     12882    _object->fault = fault;
    1271412883
    1271512884    return _object;
    … …  
    1275312922        return false;
    1275412923    }
     12924    if (!psMetadataAdd(md, PS_LIST_TAIL, "fault", PS_DATA_S16, "NOT NULL", 0)) {
     12925        psError(PS_ERR_UNKNOWN, false, "failed to add item fault");
     12926        psFree(md);
     12927        return false;
     12928    }
    1275512929
    1275612930    bool status = psDBCreateTable(dbh, DETRUNSUMMARY_TABLE_NAME, md);
    … …  
    1276612940}
    1276712941
    12768 bool detRunSummaryInsert(psDB * dbh, psS32 det_id, psS32 iteration, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, bool accept)
     12942bool detRunSummaryInsert(psDB * dbh, psS32 det_id, psS32 iteration, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, bool accept, psS16 fault)
    1276912943{
    1277012944    psMetadata *md = psMetadataAlloc();
    … …  
    1279612970    if (!psMetadataAdd(md, PS_LIST_TAIL, "accept", PS_DATA_BOOL, NULL, accept)) {
    1279712971        psError(PS_ERR_UNKNOWN, false, "failed to add item accept");
     12972        psFree(md);
     12973        return false;
     12974    }
     12975    if (!psMetadataAdd(md, PS_LIST_TAIL, "fault", PS_DATA_S16, NULL, fault)) {
     12976        psError(PS_ERR_UNKNOWN, false, "failed to add item fault");
    1279812977        psFree(md);
    1279912978        return false;
    … …  
    1282213001bool detRunSummaryInsertObject(psDB *dbh, detRunSummaryRow *object)
    1282313002{
    12824     return detRunSummaryInsert(dbh, object->det_id, object->iteration, object->bg, object->bg_stdev, object->bg_mean_stdev, object->accept);
     13003    return detRunSummaryInsert(dbh, object->det_id, object->iteration, object->bg, object->bg_stdev, object->bg_mean_stdev, object->accept, object->fault);
    1282513004}
    1282613005
    … …  
    1292513104        return false;
    1292613105    }
     13106    if (!psMetadataAdd(md, PS_LIST_TAIL, "fault", PS_DATA_S16, NULL, object->fault)) {
     13107        psError(PS_ERR_UNKNOWN, false, "failed to add item fault");
     13108        psFree(md);
     13109        return false;
     13110    }
    1292713111
    1292813112
    … …  
    1296413148        return false;
    1296513149    }
    12966 
    12967     return detRunSummaryRowAlloc(det_id, iteration, bg, bg_stdev, bg_mean_stdev, accept);
     13150    psS16 fault = psMetadataLookupS16(&status, md, "fault");
     13151    if (!status) {
     13152        psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item fault");
     13153        return false;
     13154    }
     13155
     13156    return detRunSummaryRowAlloc(det_id, iteration, bg, bg_stdev, bg_mean_stdev, accept, fault);
    1296813157}
    1296913158psArray *detRunSummarySelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit)
Note: See TracChangeset for help on using the changeset viewer.