IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Feb 26, 2007, 1:56:44 PM (19 years ago)
Author:
jhoblitt
Message:

VERSION 1.1.13

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/ippdb/src/ippdb.c

    r12033 r12061  
    67096709static void chipProcessedImfileRowFree(chipProcessedImfileRow *object);
    67106710
    6711 chipProcessedImfileRow *chipProcessedImfileRowAlloc(const char *exp_tag, psS32 chip_version, psS32 guide_version, const char *class_id, const char *recipe, const char *uri, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, const char *b1_uri, const char *b2_uri, psS16 fault)
     6711chipProcessedImfileRow *chipProcessedImfileRowAlloc(const char *exp_tag, psS32 chip_version, psS32 guide_version, const char *class_id, const char *recipe, const char *uri, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, const char *path_base, psS16 fault)
    67126712{
    67136713    chipProcessedImfileRow *_object;
    … …  
    67256725    _object->bg_stdev = bg_stdev;
    67266726    _object->bg_mean_stdev = bg_mean_stdev;
    6727     _object->b1_uri = psStringCopy(b1_uri);
    6728     _object->b2_uri = psStringCopy(b2_uri);
     6727    _object->path_base = psStringCopy(path_base);
    67296728    _object->fault = fault;
    67306729
    … …  
    67386737    psFree(object->recipe);
    67396738    psFree(object->uri);
    6740     psFree(object->b1_uri);
    6741     psFree(object->b2_uri);
     6739    psFree(object->path_base);
    67426740}
    67436741
    … …  
    67906788        return false;
    67916789    }
    6792     if (!psMetadataAdd(md, PS_LIST_TAIL, "b1_uri", PS_DATA_STRING, NULL, "255")) {
    6793         psError(PS_ERR_UNKNOWN, false, "failed to add item b1_uri");
    6794         psFree(md);
    6795         return false;
    6796     }
    6797     if (!psMetadataAdd(md, PS_LIST_TAIL, "b2_uri", PS_DATA_STRING, NULL, "255")) {
    6798         psError(PS_ERR_UNKNOWN, false, "failed to add item b2_uri");
     6790    if (!psMetadataAdd(md, PS_LIST_TAIL, "path_base", PS_DATA_STRING, NULL, "255")) {
     6791        psError(PS_ERR_UNKNOWN, false, "failed to add item path_base");
    67996792        psFree(md);
    68006793        return false;
    … …  
    68186811}
    68196812
    6820 bool chipProcessedImfileInsert(psDB * dbh, const char *exp_tag, psS32 chip_version, psS32 guide_version, const char *class_id, const char *recipe, const char *uri, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, const char *b1_uri, const char *b2_uri, psS16 fault)
     6813bool chipProcessedImfileInsert(psDB * dbh, const char *exp_tag, psS32 chip_version, psS32 guide_version, const char *class_id, const char *recipe, const char *uri, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, const char *path_base, psS16 fault)
    68216814{
    68226815    psMetadata *md = psMetadataAlloc();
    … …  
    68666859        return false;
    68676860    }
    6868     if (!psMetadataAdd(md, PS_LIST_TAIL, "b1_uri", PS_DATA_STRING, NULL, b1_uri)) {
    6869         psError(PS_ERR_UNKNOWN, false, "failed to add item b1_uri");
    6870         psFree(md);
    6871         return false;
    6872     }
    6873     if (!psMetadataAdd(md, PS_LIST_TAIL, "b2_uri", PS_DATA_STRING, NULL, b2_uri)) {
    6874         psError(PS_ERR_UNKNOWN, false, "failed to add item b2_uri");
     6861    if (!psMetadataAdd(md, PS_LIST_TAIL, "path_base", PS_DATA_STRING, NULL, path_base)) {
     6862        psError(PS_ERR_UNKNOWN, false, "failed to add item path_base");
    68756863        psFree(md);
    68766864        return false;
    … …  
    69046892bool chipProcessedImfileInsertObject(psDB *dbh, chipProcessedImfileRow *object)
    69056893{
    6906     return chipProcessedImfileInsert(dbh, object->exp_tag, object->chip_version, object->guide_version, object->class_id, object->recipe, object->uri, object->bg, object->bg_stdev, object->bg_mean_stdev, object->b1_uri, object->b2_uri, object->fault);
     6894    return chipProcessedImfileInsert(dbh, object->exp_tag, object->chip_version, object->guide_version, object->class_id, object->recipe, object->uri, object->bg, object->bg_stdev, object->bg_mean_stdev, object->path_base, object->fault);
    69076895}
    69086896
    … …  
    70227010        return false;
    70237011    }
    7024     if (!psMetadataAdd(md, PS_LIST_TAIL, "b1_uri", PS_DATA_STRING, NULL, object->b1_uri)) {
    7025         psError(PS_ERR_UNKNOWN, false, "failed to add item b1_uri");
    7026         psFree(md);
    7027         return false;
    7028     }
    7029     if (!psMetadataAdd(md, PS_LIST_TAIL, "b2_uri", PS_DATA_STRING, NULL, object->b2_uri)) {
    7030         psError(PS_ERR_UNKNOWN, false, "failed to add item b2_uri");
     7012    if (!psMetadataAdd(md, PS_LIST_TAIL, "path_base", PS_DATA_STRING, NULL, object->path_base)) {
     7013        psError(PS_ERR_UNKNOWN, false, "failed to add item path_base");
    70317014        psFree(md);
    70327015        return false;
    … …  
    70917074        return false;
    70927075    }
    7093     char* b1_uri = psMetadataLookupPtr(&status, md, "b1_uri");
    7094     if (!status) {
    7095         psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item b1_uri");
    7096         return false;
    7097     }
    7098     char* b2_uri = psMetadataLookupPtr(&status, md, "b2_uri");
    7099     if (!status) {
    7100         psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item b2_uri");
     7076    char* path_base = psMetadataLookupPtr(&status, md, "path_base");
     7077    if (!status) {
     7078        psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item path_base");
    71017079        return false;
    71027080    }
    … …  
    71077085    }
    71087086
    7109     return chipProcessedImfileRowAlloc(exp_tag, chip_version, guide_version, class_id, recipe, uri, bg, bg_stdev, bg_mean_stdev, b1_uri, b2_uri, fault);
     7087    return chipProcessedImfileRowAlloc(exp_tag, chip_version, guide_version, class_id, recipe, uri, bg, bg_stdev, bg_mean_stdev, path_base, fault);
    71107088}
    71117089psArray *chipProcessedImfileSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit)
    … …  
    76017579static void camProcessedExpRowFree(camProcessedExpRow *object);
    76027580
    7603 camProcessedExpRow *camProcessedExpRowAlloc(const char *exp_tag, psS32 cam_version, psS32 chip_version, const char *label, const char *uri, const char *recipe, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, psF32 sigma_ra, psF32 sigma_dec, psS32 nastro, const char *b1_uri, const char *b2_uri, psF32 zp_mean, psF32 zp_stdev, psS16 fault, const char *expgroup, const char *dvodb)
     7581camProcessedExpRow *camProcessedExpRowAlloc(const char *exp_tag, psS32 cam_version, psS32 chip_version, const char *label, const char *uri, const char *recipe, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, psF32 sigma_ra, psF32 sigma_dec, psS32 nastro, const char *path_base, psF32 zp_mean, psF32 zp_stdev, psS16 fault, const char *expgroup, const char *dvodb)
    76047582{
    76057583    camProcessedExpRow *_object;
    … …  
    76207598    _object->sigma_dec = sigma_dec;
    76217599    _object->nastro = nastro;
    7622     _object->b1_uri = psStringCopy(b1_uri);
    7623     _object->b2_uri = psStringCopy(b2_uri);
     7600    _object->path_base = psStringCopy(path_base);
    76247601    _object->zp_mean = zp_mean;
    76257602    _object->zp_stdev = zp_stdev;
    … …  
    76377614    psFree(object->uri);
    76387615    psFree(object->recipe);
    7639     psFree(object->b1_uri);
    7640     psFree(object->b2_uri);
     7616    psFree(object->path_base);
    76417617    psFree(object->expgroup);
    76427618    psFree(object->dvodb);
    … …  
    77067682        return false;
    77077683    }
    7708     if (!psMetadataAdd(md, PS_LIST_TAIL, "b1_uri", PS_DATA_STRING, NULL, "255")) {
    7709         psError(PS_ERR_UNKNOWN, false, "failed to add item b1_uri");
    7710         psFree(md);
    7711         return false;
    7712     }
    7713     if (!psMetadataAdd(md, PS_LIST_TAIL, "b2_uri", PS_DATA_STRING, NULL, "255")) {
    7714         psError(PS_ERR_UNKNOWN, false, "failed to add item b2_uri");
     7684    if (!psMetadataAdd(md, PS_LIST_TAIL, "path_base", PS_DATA_STRING, NULL, "255")) {
     7685        psError(PS_ERR_UNKNOWN, false, "failed to add item path_base");
    77157686        psFree(md);
    77167687        return false;
    … …  
    77547725}
    77557726
    7756 bool camProcessedExpInsert(psDB * dbh, const char *exp_tag, psS32 cam_version, psS32 chip_version, const char *label, const char *uri, const char *recipe, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, psF32 sigma_ra, psF32 sigma_dec, psS32 nastro, const char *b1_uri, const char *b2_uri, psF32 zp_mean, psF32 zp_stdev, psS16 fault, const char *expgroup, const char *dvodb)
     7727bool camProcessedExpInsert(psDB * dbh, const char *exp_tag, psS32 cam_version, psS32 chip_version, const char *label, const char *uri, const char *recipe, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, psF32 sigma_ra, psF32 sigma_dec, psS32 nastro, const char *path_base, psF32 zp_mean, psF32 zp_stdev, psS16 fault, const char *expgroup, const char *dvodb)
    77577728{
    77587729    psMetadata *md = psMetadataAlloc();
    … …  
    78177788        return false;
    78187789    }
    7819     if (!psMetadataAdd(md, PS_LIST_TAIL, "b1_uri", PS_DATA_STRING, NULL, b1_uri)) {
    7820         psError(PS_ERR_UNKNOWN, false, "failed to add item b1_uri");
    7821         psFree(md);
    7822         return false;
    7823     }
    7824     if (!psMetadataAdd(md, PS_LIST_TAIL, "b2_uri", PS_DATA_STRING, NULL, b2_uri)) {
    7825         psError(PS_ERR_UNKNOWN, false, "failed to add item b2_uri");
     7790    if (!psMetadataAdd(md, PS_LIST_TAIL, "path_base", PS_DATA_STRING, NULL, path_base)) {
     7791        psError(PS_ERR_UNKNOWN, false, "failed to add item path_base");
    78267792        psFree(md);
    78277793        return false;
    … …  
    78757841bool camProcessedExpInsertObject(psDB *dbh, camProcessedExpRow *object)
    78767842{
    7877     return camProcessedExpInsert(dbh, object->exp_tag, object->cam_version, object->chip_version, object->label, object->uri, object->recipe, object->bg, object->bg_stdev, object->bg_mean_stdev, object->sigma_ra, object->sigma_dec, object->nastro, object->b1_uri, object->b2_uri, object->zp_mean, object->zp_stdev, object->fault, object->expgroup, object->dvodb);
     7843    return camProcessedExpInsert(dbh, object->exp_tag, object->cam_version, object->chip_version, object->label, object->uri, object->recipe, object->bg, object->bg_stdev, object->bg_mean_stdev, object->sigma_ra, object->sigma_dec, object->nastro, object->path_base, object->zp_mean, object->zp_stdev, object->fault, object->expgroup, object->dvodb);
    78787844}
    78797845
    … …  
    80087974        return false;
    80097975    }
    8010     if (!psMetadataAdd(md, PS_LIST_TAIL, "b1_uri", PS_DATA_STRING, NULL, object->b1_uri)) {
    8011         psError(PS_ERR_UNKNOWN, false, "failed to add item b1_uri");
    8012         psFree(md);
    8013         return false;
    8014     }
    8015     if (!psMetadataAdd(md, PS_LIST_TAIL, "b2_uri", PS_DATA_STRING, NULL, object->b2_uri)) {
    8016         psError(PS_ERR_UNKNOWN, false, "failed to add item b2_uri");
     7976    if (!psMetadataAdd(md, PS_LIST_TAIL, "path_base", PS_DATA_STRING, NULL, object->path_base)) {
     7977        psError(PS_ERR_UNKNOWN, false, "failed to add item path_base");
    80177978        psFree(md);
    80187979        return false;
    … …  
    81128073        return false;
    81138074    }
    8114     char* b1_uri = psMetadataLookupPtr(&status, md, "b1_uri");
    8115     if (!status) {
    8116         psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item b1_uri");
    8117         return false;
    8118     }
    8119     char* b2_uri = psMetadataLookupPtr(&status, md, "b2_uri");
    8120     if (!status) {
    8121         psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item b2_uri");
     8075    char* path_base = psMetadataLookupPtr(&status, md, "path_base");
     8076    if (!status) {
     8077        psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item path_base");
    81228078        return false;
    81238079    }
    … …  
    81488104    }
    81498105
    8150     return camProcessedExpRowAlloc(exp_tag, cam_version, chip_version, label, uri, recipe, bg, bg_stdev, bg_mean_stdev, sigma_ra, sigma_dec, nastro, b1_uri, b2_uri, zp_mean, zp_stdev, fault, expgroup, dvodb);
     8106    return camProcessedExpRowAlloc(exp_tag, cam_version, chip_version, label, uri, recipe, bg, bg_stdev, bg_mean_stdev, sigma_ra, sigma_dec, nastro, path_base, zp_mean, zp_stdev, fault, expgroup, dvodb);
    81518107}
    81528108psArray *camProcessedExpSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit)
    … …  
    97049660static void detProcessedImfileRowFree(detProcessedImfileRow *object);
    97059661
    9706 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, psS16 fault)
     9662detProcessedImfileRow *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 *path_base, psS16 fault)
    97079663{
    97089664    detProcessedImfileRow *_object;
    … …  
    97199675    _object->bg_stdev = bg_stdev;
    97209676    _object->bg_mean_stdev = bg_mean_stdev;
    9721     _object->b1_uri = psStringCopy(b1_uri);
    9722     _object->b2_uri = psStringCopy(b2_uri);
     9677    _object->path_base = psStringCopy(path_base);
    97239678    _object->fault = fault;
    97249679
    … …  
    97329687    psFree(object->uri);
    97339688    psFree(object->recipe);
    9734     psFree(object->b1_uri);
    9735     psFree(object->b2_uri);
     9689    psFree(object->path_base);
    97369690}
    97379691
    … …  
    97799733        return false;
    97809734    }
    9781     if (!psMetadataAdd(md, PS_LIST_TAIL, "b1_uri", PS_DATA_STRING, NULL, "255")) {
    9782         psError(PS_ERR_UNKNOWN, false, "failed to add item b1_uri");
    9783         psFree(md);
    9784         return false;
    9785     }
    9786     if (!psMetadataAdd(md, PS_LIST_TAIL, "b2_uri", PS_DATA_STRING, NULL, "255")) {
    9787         psError(PS_ERR_UNKNOWN, false, "failed to add item b2_uri");
     9735    if (!psMetadataAdd(md, PS_LIST_TAIL, "path_base", PS_DATA_STRING, NULL, "255")) {
     9736        psError(PS_ERR_UNKNOWN, false, "failed to add item path_base");
    97889737        psFree(md);
    97899738        return false;
    … …  
    98079756}
    98089757
    9809 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, psS16 fault)
     9758bool 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 *path_base, psS16 fault)
    98109759{
    98119760    psMetadata *md = psMetadataAlloc();
    … …  
    98509799        return false;
    98519800    }
    9852     if (!psMetadataAdd(md, PS_LIST_TAIL, "b1_uri", PS_DATA_STRING, NULL, b1_uri)) {
    9853         psError(PS_ERR_UNKNOWN, false, "failed to add item b1_uri");
    9854         psFree(md);
    9855         return false;
    9856     }
    9857     if (!psMetadataAdd(md, PS_LIST_TAIL, "b2_uri", PS_DATA_STRING, NULL, b2_uri)) {
    9858         psError(PS_ERR_UNKNOWN, false, "failed to add item b2_uri");
     9801    if (!psMetadataAdd(md, PS_LIST_TAIL, "path_base", PS_DATA_STRING, NULL, path_base)) {
     9802        psError(PS_ERR_UNKNOWN, false, "failed to add item path_base");
    98599803        psFree(md);
    98609804        return false;
    … …  
    98889832bool detProcessedImfileInsertObject(psDB *dbh, detProcessedImfileRow *object)
    98899833{
    9890     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);
     9834    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->path_base, object->fault);
    98919835}
    98929836
    … …  
    100019945        return false;
    100029946    }
    10003     if (!psMetadataAdd(md, PS_LIST_TAIL, "b1_uri", PS_DATA_STRING, NULL, object->b1_uri)) {
    10004         psError(PS_ERR_UNKNOWN, false, "failed to add item b1_uri");
    10005         psFree(md);
    10006         return false;
    10007     }
    10008     if (!psMetadataAdd(md, PS_LIST_TAIL, "b2_uri", PS_DATA_STRING, NULL, object->b2_uri)) {
    10009         psError(PS_ERR_UNKNOWN, false, "failed to add item b2_uri");
     9947    if (!psMetadataAdd(md, PS_LIST_TAIL, "path_base", PS_DATA_STRING, NULL, object->path_base)) {
     9948        psError(PS_ERR_UNKNOWN, false, "failed to add item path_base");
    100109949        psFree(md);
    100119950        return false;
    … …  
    1006510004        return false;
    1006610005    }
    10067     char* b1_uri = psMetadataLookupPtr(&status, md, "b1_uri");
    10068     if (!status) {
    10069         psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item b1_uri");
    10070         return false;
    10071     }
    10072     char* b2_uri = psMetadataLookupPtr(&status, md, "b2_uri");
    10073     if (!status) {
    10074         psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item b2_uri");
     10006    char* path_base = psMetadataLookupPtr(&status, md, "path_base");
     10007    if (!status) {
     10008        psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item path_base");
    1007510009        return false;
    1007610010    }
    … …  
    1008110015    }
    1008210016
    10083     return detProcessedImfileRowAlloc(det_id, exp_tag, class_id, uri, recipe, bg, bg_stdev, bg_mean_stdev, b1_uri, b2_uri, fault);
     10017    return detProcessedImfileRowAlloc(det_id, exp_tag, class_id, uri, recipe, bg, bg_stdev, bg_mean_stdev, path_base, fault);
    1008410018}
    1008510019psArray *detProcessedImfileSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit)
    … …  
    1019310127static void detProcessedExpRowFree(detProcessedExpRow *object);
    1019410128
    10195 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, psS16 fault)
     10129detProcessedExpRow *detProcessedExpRowAlloc(psS32 det_id, const char *exp_tag, const char *recipe, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, const char *path_base, psS16 fault)
    1019610130{
    1019710131    detProcessedExpRow *_object;
    … …  
    1020610140    _object->bg_stdev = bg_stdev;
    1020710141    _object->bg_mean_stdev = bg_mean_stdev;
    10208     _object->b1_uri = psStringCopy(b1_uri);
    10209     _object->b2_uri = psStringCopy(b2_uri);
     10142    _object->path_base = psStringCopy(path_base);
    1021010143    _object->fault = fault;
    1021110144
    … …  
    1021710150    psFree(object->exp_tag);
    1021810151    psFree(object->recipe);
    10219     psFree(object->b1_uri);
    10220     psFree(object->b2_uri);
     10152    psFree(object->path_base);
    1022110153}
    1022210154
    … …  
    1025410186        return false;
    1025510187    }
    10256     if (!psMetadataAdd(md, PS_LIST_TAIL, "b1_uri", PS_DATA_STRING, NULL, "255")) {
    10257         psError(PS_ERR_UNKNOWN, false, "failed to add item b1_uri");
    10258         psFree(md);
    10259         return false;
    10260     }
    10261     if (!psMetadataAdd(md, PS_LIST_TAIL, "b2_uri", PS_DATA_STRING, NULL, "255")) {
    10262         psError(PS_ERR_UNKNOWN, false, "failed to add item b2_uri");
     10188    if (!psMetadataAdd(md, PS_LIST_TAIL, "path_base", PS_DATA_STRING, NULL, "255")) {
     10189        psError(PS_ERR_UNKNOWN, false, "failed to add item path_base");
    1026310190        psFree(md);
    1026410191        return false;
    … …  
    1028210209}
    1028310210
    10284 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, psS16 fault)
     10211bool detProcessedExpInsert(psDB * dbh, psS32 det_id, const char *exp_tag, const char *recipe, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, const char *path_base, psS16 fault)
    1028510212{
    1028610213    psMetadata *md = psMetadataAlloc();
    … …  
    1031510242        return false;
    1031610243    }
    10317     if (!psMetadataAdd(md, PS_LIST_TAIL, "b1_uri", PS_DATA_STRING, NULL, b1_uri)) {
    10318         psError(PS_ERR_UNKNOWN, false, "failed to add item b1_uri");
    10319         psFree(md);
    10320         return false;
    10321     }
    10322     if (!psMetadataAdd(md, PS_LIST_TAIL, "b2_uri", PS_DATA_STRING, NULL, b2_uri)) {
    10323         psError(PS_ERR_UNKNOWN, false, "failed to add item b2_uri");
     10244    if (!psMetadataAdd(md, PS_LIST_TAIL, "path_base", PS_DATA_STRING, NULL, path_base)) {
     10245        psError(PS_ERR_UNKNOWN, false, "failed to add item path_base");
    1032410246        psFree(md);
    1032510247        return false;
    … …  
    1035310275bool detProcessedExpInsertObject(psDB *dbh, detProcessedExpRow *object)
    1035410276{
    10355     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);
     10277    return detProcessedExpInsert(dbh, object->det_id, object->exp_tag, object->recipe, object->bg, object->bg_stdev, object->bg_mean_stdev, object->path_base, object->fault);
    1035610278}
    1035710279
    … …  
    1045610378        return false;
    1045710379    }
    10458     if (!psMetadataAdd(md, PS_LIST_TAIL, "b1_uri", PS_DATA_STRING, NULL, object->b1_uri)) {
    10459         psError(PS_ERR_UNKNOWN, false, "failed to add item b1_uri");
    10460         psFree(md);
    10461         return false;
    10462     }
    10463     if (!psMetadataAdd(md, PS_LIST_TAIL, "b2_uri", PS_DATA_STRING, NULL, object->b2_uri)) {
    10464         psError(PS_ERR_UNKNOWN, false, "failed to add item b2_uri");
     10380    if (!psMetadataAdd(md, PS_LIST_TAIL, "path_base", PS_DATA_STRING, NULL, object->path_base)) {
     10381        psError(PS_ERR_UNKNOWN, false, "failed to add item path_base");
    1046510382        psFree(md);
    1046610383        return false;
    … …  
    1051010427        return false;
    1051110428    }
    10512     char* b1_uri = psMetadataLookupPtr(&status, md, "b1_uri");
    10513     if (!status) {
    10514         psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item b1_uri");
    10515         return false;
    10516     }
    10517     char* b2_uri = psMetadataLookupPtr(&status, md, "b2_uri");
    10518     if (!status) {
    10519         psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item b2_uri");
     10429    char* path_base = psMetadataLookupPtr(&status, md, "path_base");
     10430    if (!status) {
     10431        psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item path_base");
    1052010432        return false;
    1052110433    }
    … …  
    1052610438    }
    1052710439
    10528     return detProcessedExpRowAlloc(det_id, exp_tag, recipe, bg, bg_stdev, bg_mean_stdev, b1_uri, b2_uri, fault);
     10440    return detProcessedExpRowAlloc(det_id, exp_tag, recipe, bg, bg_stdev, bg_mean_stdev, path_base, fault);
    1052910441}
    1053010442psArray *detProcessedExpSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit)
    … …  
    1144011352static void detNormalizedImfileRowFree(detNormalizedImfileRow *object);
    1144111353
    11442 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, psS16 fault)
     11354detNormalizedImfileRow *detNormalizedImfileRowAlloc(psS32 det_id, psS32 iteration, const char *class_id, const char *uri, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, const char *path_base, psS16 fault)
    1144311355{
    1144411356    detNormalizedImfileRow *_object;
    … …  
    1145411366    _object->bg_stdev = bg_stdev;
    1145511367    _object->bg_mean_stdev = bg_mean_stdev;
    11456     _object->b1_uri = psStringCopy(b1_uri);
    11457     _object->b2_uri = psStringCopy(b2_uri);
     11368    _object->path_base = psStringCopy(path_base);
    1145811369    _object->fault = fault;
    1145911370
    … …  
    1146511376    psFree(object->class_id);
    1146611377    psFree(object->uri);
    11467     psFree(object->b1_uri);
    11468     psFree(object->b2_uri);
     11378    psFree(object->path_base);
    1146911379}
    1147011380
    … …  
    1150711417        return false;
    1150811418    }
    11509     if (!psMetadataAdd(md, PS_LIST_TAIL, "b1_uri", PS_DATA_STRING, NULL, "255")) {
    11510         psError(PS_ERR_UNKNOWN, false, "failed to add item b1_uri");
    11511         psFree(md);
    11512         return false;
    11513     }
    11514     if (!psMetadataAdd(md, PS_LIST_TAIL, "b2_uri", PS_DATA_STRING, NULL, "255")) {
    11515         psError(PS_ERR_UNKNOWN, false, "failed to add item b2_uri");
     11419    if (!psMetadataAdd(md, PS_LIST_TAIL, "path_base", PS_DATA_STRING, NULL, "255")) {
     11420        psError(PS_ERR_UNKNOWN, false, "failed to add item path_base");
    1151611421        psFree(md);
    1151711422        return false;
    … …  
    1153511440}
    1153611441
    11537 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, psS16 fault)
     11442bool 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 *path_base, psS16 fault)
    1153811443{
    1153911444    psMetadata *md = psMetadataAlloc();
    … …  
    1157311478        return false;
    1157411479    }
    11575     if (!psMetadataAdd(md, PS_LIST_TAIL, "b1_uri", PS_DATA_STRING, NULL, b1_uri)) {
    11576         psError(PS_ERR_UNKNOWN, false, "failed to add item b1_uri");
    11577         psFree(md);
    11578         return false;
    11579     }
    11580     if (!psMetadataAdd(md, PS_LIST_TAIL, "b2_uri", PS_DATA_STRING, NULL, b2_uri)) {
    11581         psError(PS_ERR_UNKNOWN, false, "failed to add item b2_uri");
     11480    if (!psMetadataAdd(md, PS_LIST_TAIL, "path_base", PS_DATA_STRING, NULL, path_base)) {
     11481        psError(PS_ERR_UNKNOWN, false, "failed to add item path_base");
    1158211482        psFree(md);
    1158311483        return false;
    … …  
    1161111511bool detNormalizedImfileInsertObject(psDB *dbh, detNormalizedImfileRow *object)
    1161211512{
    11613     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);
     11513    return detNormalizedImfileInsert(dbh, object->det_id, object->iteration, object->class_id, object->uri, object->bg, object->bg_stdev, object->bg_mean_stdev, object->path_base, object->fault);
    1161411514}
    1161511515
    … …  
    1171911619        return false;
    1172011620    }
    11721     if (!psMetadataAdd(md, PS_LIST_TAIL, "b1_uri", PS_DATA_STRING, NULL, object->b1_uri)) {
    11722         psError(PS_ERR_UNKNOWN, false, "failed to add item b1_uri");
    11723         psFree(md);
    11724         return false;
    11725     }
    11726     if (!psMetadataAdd(md, PS_LIST_TAIL, "b2_uri", PS_DATA_STRING, NULL, object->b2_uri)) {
    11727         psError(PS_ERR_UNKNOWN, false, "failed to add item b2_uri");
     11621    if (!psMetadataAdd(md, PS_LIST_TAIL, "path_base", PS_DATA_STRING, NULL, object->path_base)) {
     11622        psError(PS_ERR_UNKNOWN, false, "failed to add item path_base");
    1172811623        psFree(md);
    1172911624        return false;
    … …  
    1177811673        return false;
    1177911674    }
    11780     char* b1_uri = psMetadataLookupPtr(&status, md, "b1_uri");
    11781     if (!status) {
    11782         psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item b1_uri");
    11783         return false;
    11784     }
    11785     char* b2_uri = psMetadataLookupPtr(&status, md, "b2_uri");
    11786     if (!status) {
    11787         psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item b2_uri");
     11675    char* path_base = psMetadataLookupPtr(&status, md, "path_base");
     11676    if (!status) {
     11677        psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item path_base");
    1178811678        return false;
    1178911679    }
    … …  
    1179411684    }
    1179511685
    11796     return detNormalizedImfileRowAlloc(det_id, iteration, class_id, uri, bg, bg_stdev, bg_mean_stdev, b1_uri, b2_uri, fault);
     11686    return detNormalizedImfileRowAlloc(det_id, iteration, class_id, uri, bg, bg_stdev, bg_mean_stdev, path_base, fault);
    1179711687}
    1179811688psArray *detNormalizedImfileSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit)
    … …  
    1190611796static void detNormalizedExpRowFree(detNormalizedExpRow *object);
    1190711797
    11908 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, psS16 fault)
     11798detNormalizedExpRow *detNormalizedExpRowAlloc(psS32 det_id, psS32 iteration, const char *recipe, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, const char *path_base, psS16 fault)
    1190911799{
    1191011800    detNormalizedExpRow *_object;
    … …  
    1191911809    _object->bg_stdev = bg_stdev;
    1192011810    _object->bg_mean_stdev = bg_mean_stdev;
    11921     _object->b1_uri = psStringCopy(b1_uri);
    11922     _object->b2_uri = psStringCopy(b2_uri);
     11811    _object->path_base = psStringCopy(path_base);
    1192311812    _object->fault = fault;
    1192411813
    … …  
    1192911818{
    1193011819    psFree(object->recipe);
    11931     psFree(object->b1_uri);
    11932     psFree(object->b2_uri);
     11820    psFree(object->path_base);
    1193311821}
    1193411822
    … …  
    1196611854        return false;
    1196711855    }
    11968     if (!psMetadataAdd(md, PS_LIST_TAIL, "b1_uri", PS_DATA_STRING, NULL, "255")) {
    11969         psError(PS_ERR_UNKNOWN, false, "failed to add item b1_uri");
    11970         psFree(md);
    11971         return false;
    11972     }
    11973     if (!psMetadataAdd(md, PS_LIST_TAIL, "b2_uri", PS_DATA_STRING, NULL, "255")) {
    11974         psError(PS_ERR_UNKNOWN, false, "failed to add item b2_uri");
     11856    if (!psMetadataAdd(md, PS_LIST_TAIL, "path_base", PS_DATA_STRING, NULL, "255")) {
     11857        psError(PS_ERR_UNKNOWN, false, "failed to add item path_base");
    1197511858        psFree(md);
    1197611859        return false;
    … …  
    1199411877}
    1199511878
    11996 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, psS16 fault)
     11879bool detNormalizedExpInsert(psDB * dbh, psS32 det_id, psS32 iteration, const char *recipe, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, const char *path_base, psS16 fault)
    1199711880{
    1199811881    psMetadata *md = psMetadataAlloc();
    … …  
    1202711910        return false;
    1202811911    }
    12029     if (!psMetadataAdd(md, PS_LIST_TAIL, "b1_uri", PS_DATA_STRING, NULL, b1_uri)) {
    12030         psError(PS_ERR_UNKNOWN, false, "failed to add item b1_uri");
    12031         psFree(md);
    12032         return false;
    12033     }
    12034     if (!psMetadataAdd(md, PS_LIST_TAIL, "b2_uri", PS_DATA_STRING, NULL, b2_uri)) {
    12035         psError(PS_ERR_UNKNOWN, false, "failed to add item b2_uri");
     11912    if (!psMetadataAdd(md, PS_LIST_TAIL, "path_base", PS_DATA_STRING, NULL, path_base)) {
     11913        psError(PS_ERR_UNKNOWN, false, "failed to add item path_base");
    1203611914        psFree(md);
    1203711915        return false;
    … …  
    1206511943bool detNormalizedExpInsertObject(psDB *dbh, detNormalizedExpRow *object)
    1206611944{
    12067     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);
     11945    return detNormalizedExpInsert(dbh, object->det_id, object->iteration, object->recipe, object->bg, object->bg_stdev, object->bg_mean_stdev, object->path_base, object->fault);
    1206811946}
    1206911947
    … …  
    1216812046        return false;
    1216912047    }
    12170     if (!psMetadataAdd(md, PS_LIST_TAIL, "b1_uri", PS_DATA_STRING, NULL, object->b1_uri)) {
    12171         psError(PS_ERR_UNKNOWN, false, "failed to add item b1_uri");
    12172         psFree(md);
    12173         return false;
    12174     }
    12175     if (!psMetadataAdd(md, PS_LIST_TAIL, "b2_uri", PS_DATA_STRING, NULL, object->b2_uri)) {
    12176         psError(PS_ERR_UNKNOWN, false, "failed to add item b2_uri");
     12048    if (!psMetadataAdd(md, PS_LIST_TAIL, "path_base", PS_DATA_STRING, NULL, object->path_base)) {
     12049        psError(PS_ERR_UNKNOWN, false, "failed to add item path_base");
    1217712050        psFree(md);
    1217812051        return false;
    … …  
    1222212095        return false;
    1222312096    }
    12224     char* b1_uri = psMetadataLookupPtr(&status, md, "b1_uri");
    12225     if (!status) {
    12226         psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item b1_uri");
    12227         return false;
    12228     }
    12229     char* b2_uri = psMetadataLookupPtr(&status, md, "b2_uri");
    12230     if (!status) {
    12231         psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item b2_uri");
     12097    char* path_base = psMetadataLookupPtr(&status, md, "path_base");
     12098    if (!status) {
     12099        psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item path_base");
    1223212100        return false;
    1223312101    }
    … …  
    1223812106    }
    1223912107
    12240     return detNormalizedExpRowAlloc(det_id, iteration, recipe, bg, bg_stdev, bg_mean_stdev, b1_uri, b2_uri, fault);
     12108    return detNormalizedExpRowAlloc(det_id, iteration, recipe, bg, bg_stdev, bg_mean_stdev, path_base, fault);
    1224112109}
    1224212110psArray *detNormalizedExpSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit)
    … …  
    1235012218static void detResidImfileRowFree(detResidImfileRow *object);
    1235112219
    12352 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, psS16 fault)
     12220detResidImfileRow *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 *path_base, psS16 fault)
    1235312221{
    1235412222    detResidImfileRow *_object;
    … …  
    1236612234    _object->bg_stdev = bg_stdev;
    1236712235    _object->bg_mean_stdev = bg_mean_stdev;
    12368     _object->b1_uri = psStringCopy(b1_uri);
    12369     _object->b2_uri = psStringCopy(b2_uri);
     12236    _object->path_base = psStringCopy(path_base);
    1237012237    _object->fault = fault;
    1237112238
    … …  
    1237912246    psFree(object->uri);
    1238012247    psFree(object->recipe);
    12381     psFree(object->b1_uri);
    12382     psFree(object->b2_uri);
     12248    psFree(object->path_base);
    1238312249}
    1238412250
    … …  
    1243112297        return false;
    1243212298    }
    12433     if (!psMetadataAdd(md, PS_LIST_TAIL, "b1_uri", PS_DATA_STRING, NULL, "255")) {
    12434         psError(PS_ERR_UNKNOWN, false, "failed to add item b1_uri");
    12435         psFree(md);
    12436         return false;
    12437     }
    12438     if (!psMetadataAdd(md, PS_LIST_TAIL, "b2_uri", PS_DATA_STRING, NULL, "255")) {
    12439         psError(PS_ERR_UNKNOWN, false, "failed to add item b2_uri");
     12299    if (!psMetadataAdd(md, PS_LIST_TAIL, "path_base", PS_DATA_STRING, NULL, "255")) {
     12300        psError(PS_ERR_UNKNOWN, false, "failed to add item path_base");
    1244012301        psFree(md);
    1244112302        return false;
    … …  
    1245912320}
    1246012321
    12461 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, psS16 fault)
     12322bool 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 *path_base, psS16 fault)
    1246212323{
    1246312324    psMetadata *md = psMetadataAlloc();
    … …  
    1250712368        return false;
    1250812369    }
    12509     if (!psMetadataAdd(md, PS_LIST_TAIL, "b1_uri", PS_DATA_STRING, NULL, b1_uri)) {
    12510         psError(PS_ERR_UNKNOWN, false, "failed to add item b1_uri");
    12511         psFree(md);
    12512         return false;
    12513     }
    12514     if (!psMetadataAdd(md, PS_LIST_TAIL, "b2_uri", PS_DATA_STRING, NULL, b2_uri)) {
    12515         psError(PS_ERR_UNKNOWN, false, "failed to add item b2_uri");
     12370    if (!psMetadataAdd(md, PS_LIST_TAIL, "path_base", PS_DATA_STRING, NULL, path_base)) {
     12371        psError(PS_ERR_UNKNOWN, false, "failed to add item path_base");
    1251612372        psFree(md);
    1251712373        return false;
    … …  
    1254512401bool detResidImfileInsertObject(psDB *dbh, detResidImfileRow *object)
    1254612402{
    12547     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);
     12403    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->path_base, object->fault);
    1254812404}
    1254912405
    … …  
    1266312519        return false;
    1266412520    }
    12665     if (!psMetadataAdd(md, PS_LIST_TAIL, "b1_uri", PS_DATA_STRING, NULL, object->b1_uri)) {
    12666         psError(PS_ERR_UNKNOWN, false, "failed to add item b1_uri");
    12667         psFree(md);
    12668         return false;
    12669     }
    12670     if (!psMetadataAdd(md, PS_LIST_TAIL, "b2_uri", PS_DATA_STRING, NULL, object->b2_uri)) {
    12671         psError(PS_ERR_UNKNOWN, false, "failed to add item b2_uri");
     12521    if (!psMetadataAdd(md, PS_LIST_TAIL, "path_base", PS_DATA_STRING, NULL, object->path_base)) {
     12522        psError(PS_ERR_UNKNOWN, false, "failed to add item path_base");
    1267212523        psFree(md);
    1267312524        return false;
    … …  
    1273212583        return false;
    1273312584    }
    12734     char* b1_uri = psMetadataLookupPtr(&status, md, "b1_uri");
    12735     if (!status) {
    12736         psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item b1_uri");
    12737         return false;
    12738     }
    12739     char* b2_uri = psMetadataLookupPtr(&status, md, "b2_uri");
    12740     if (!status) {
    12741         psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item b2_uri");
     12585    char* path_base = psMetadataLookupPtr(&status, md, "path_base");
     12586    if (!status) {
     12587        psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item path_base");
    1274212588        return false;
    1274312589    }
    … …  
    1274812594    }
    1274912595
    12750     return detResidImfileRowAlloc(det_id, iteration, exp_tag, class_id, uri, recipe, bg, bg_stdev, bg_mean_stdev, b1_uri, b2_uri, fault);
     12596    return detResidImfileRowAlloc(det_id, iteration, exp_tag, class_id, uri, recipe, bg, bg_stdev, bg_mean_stdev, path_base, fault);
    1275112597}
    1275212598psArray *detResidImfileSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit)
    … …  
    1286012706static void detResidExpRowFree(detResidExpRow *object);
    1286112707
    12862 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, psS16 fault)
     12708detResidExpRow *detResidExpRowAlloc(psS32 det_id, psS32 iteration, const char *exp_tag, const char *recipe, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, const char *path_base, bool accept, psS16 fault)
    1286312709{
    1286412710    detResidExpRow  *_object;
    … …  
    1287412720    _object->bg_stdev = bg_stdev;
    1287512721    _object->bg_mean_stdev = bg_mean_stdev;
    12876     _object->b1_uri = psStringCopy(b1_uri);
    12877     _object->b2_uri = psStringCopy(b2_uri);
     12722    _object->path_base = psStringCopy(path_base);
    1287812723    _object->accept = accept;
    1287912724    _object->fault = fault;
    … …  
    1288612731    psFree(object->exp_tag);
    1288712732    psFree(object->recipe);
    12888     psFree(object->b1_uri);
    12889     psFree(object->b2_uri);
     12733    psFree(object->path_base);
    1289012734}
    1289112735
    … …  
    1292812772        return false;
    1292912773    }
    12930     if (!psMetadataAdd(md, PS_LIST_TAIL, "b1_uri", PS_DATA_STRING, NULL, "255")) {
    12931         psError(PS_ERR_UNKNOWN, false, "failed to add item b1_uri");
    12932         psFree(md);
    12933         return false;
    12934     }
    12935     if (!psMetadataAdd(md, PS_LIST_TAIL, "b2_uri", PS_DATA_STRING, NULL, "255")) {
    12936         psError(PS_ERR_UNKNOWN, false, "failed to add item b2_uri");
     12774    if (!psMetadataAdd(md, PS_LIST_TAIL, "path_base", PS_DATA_STRING, NULL, "255")) {
     12775        psError(PS_ERR_UNKNOWN, false, "failed to add item path_base");
    1293712776        psFree(md);
    1293812777        return false;
    … …  
    1296112800}
    1296212801
    12963 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, psS16 fault)
     12802bool 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 *path_base, bool accept, psS16 fault)
    1296412803{
    1296512804    psMetadata *md = psMetadataAlloc();
    … …  
    1299912838        return false;
    1300012839    }
    13001     if (!psMetadataAdd(md, PS_LIST_TAIL, "b1_uri", PS_DATA_STRING, NULL, b1_uri)) {
    13002         psError(PS_ERR_UNKNOWN, false, "failed to add item b1_uri");
    13003         psFree(md);
    13004         return false;
    13005     }
    13006     if (!psMetadataAdd(md, PS_LIST_TAIL, "b2_uri", PS_DATA_STRING, NULL, b2_uri)) {
    13007         psError(PS_ERR_UNKNOWN, false, "failed to add item b2_uri");
     12840    if (!psMetadataAdd(md, PS_LIST_TAIL, "path_base", PS_DATA_STRING, NULL, path_base)) {
     12841        psError(PS_ERR_UNKNOWN, false, "failed to add item path_base");
    1300812842        psFree(md);
    1300912843        return false;
    … …  
    1304212876bool detResidExpInsertObject(psDB *dbh, detResidExpRow *object)
    1304312877{
    13044     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);
     12878    return detResidExpInsert(dbh, object->det_id, object->iteration, object->exp_tag, object->recipe, object->bg, object->bg_stdev, object->bg_mean_stdev, object->path_base, object->accept, object->fault);
    1304512879}
    1304612880
    … …  
    1315012984        return false;
    1315112985    }
    13152     if (!psMetadataAdd(md, PS_LIST_TAIL, "b1_uri", PS_DATA_STRING, NULL, object->b1_uri)) {
    13153         psError(PS_ERR_UNKNOWN, false, "failed to add item b1_uri");
    13154         psFree(md);
    13155         return false;
    13156     }
    13157     if (!psMetadataAdd(md, PS_LIST_TAIL, "b2_uri", PS_DATA_STRING, NULL, object->b2_uri)) {
    13158         psError(PS_ERR_UNKNOWN, false, "failed to add item b2_uri");
     12986    if (!psMetadataAdd(md, PS_LIST_TAIL, "path_base", PS_DATA_STRING, NULL, object->path_base)) {
     12987        psError(PS_ERR_UNKNOWN, false, "failed to add item path_base");
    1315912988        psFree(md);
    1316012989        return false;
    … …  
    1321413043        return false;
    1321513044    }
    13216     char* b1_uri = psMetadataLookupPtr(&status, md, "b1_uri");
    13217     if (!status) {
    13218         psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item b1_uri");
    13219         return false;
    13220     }
    13221     char* b2_uri = psMetadataLookupPtr(&status, md, "b2_uri");
    13222     if (!status) {
    13223         psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item b2_uri");
     13045    char* path_base = psMetadataLookupPtr(&status, md, "path_base");
     13046    if (!status) {
     13047        psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item path_base");
    1322413048        return false;
    1322513049    }
    … …  
    1323513059    }
    1323613060
    13237     return detResidExpRowAlloc(det_id, iteration, exp_tag, recipe, bg, bg_stdev, bg_mean_stdev, b1_uri, b2_uri, accept, fault);
     13061    return detResidExpRowAlloc(det_id, iteration, exp_tag, recipe, bg, bg_stdev, bg_mean_stdev, path_base, accept, fault);
    1323813062}
    1323913063psArray *detResidExpSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit)
    … …  
    1446614290static void warpSkyCellMapRowFree(warpSkyCellMapRow *object);
    1446714291
    14468 warpSkyCellMapRow *warpSkyCellMapRowAlloc(psS32 warp_id, const char *skycell_id, const char *tess_id, const char *exp_tag, psS32 cam_version, const char *class_id)
     14292warpSkyCellMapRow *warpSkyCellMapRowAlloc(psS32 warp_id, const char *skycell_id, const char *tess_id, const char *exp_tag, psS32 cam_version, const char *class_id, psS16 fault)
    1446914293{
    1447014294    warpSkyCellMapRow *_object;
    … …  
    1447914303    _object->cam_version = cam_version;
    1448014304    _object->class_id = psStringCopy(class_id);
     14305    _object->fault = fault;
    1448114306
    1448214307    return _object;
    … …  
    1452414349        return false;
    1452514350    }
     14351    if (!psMetadataAdd(md, PS_LIST_TAIL, "fault", PS_DATA_S16, "Key", 0)) {
     14352        psError(PS_ERR_UNKNOWN, false, "failed to add item fault");
     14353        psFree(md);
     14354        return false;
     14355    }
    1452614356
    1452714357    bool status = psDBCreateTable(dbh, WARPSKYCELLMAP_TABLE_NAME, md);
    … …  
    1453714367}
    1453814368
    14539 bool warpSkyCellMapInsert(psDB * dbh, psS32 warp_id, const char *skycell_id, const char *tess_id, const char *exp_tag, psS32 cam_version, const char *class_id)
     14369bool warpSkyCellMapInsert(psDB * dbh, psS32 warp_id, const char *skycell_id, const char *tess_id, const char *exp_tag, psS32 cam_version, const char *class_id, psS16 fault)
    1454014370{
    1454114371    psMetadata *md = psMetadataAlloc();
    … …  
    1456714397    if (!psMetadataAdd(md, PS_LIST_TAIL, "class_id", PS_DATA_STRING, NULL, class_id)) {
    1456814398        psError(PS_ERR_UNKNOWN, false, "failed to add item class_id");
     14399        psFree(md);
     14400        return false;
     14401    }
     14402    if (!psMetadataAdd(md, PS_LIST_TAIL, "fault", PS_DATA_S16, NULL, fault)) {
     14403        psError(PS_ERR_UNKNOWN, false, "failed to add item fault");
    1456914404        psFree(md);
    1457014405        return false;
    … …  
    1459314428bool warpSkyCellMapInsertObject(psDB *dbh, warpSkyCellMapRow *object)
    1459414429{
    14595     return warpSkyCellMapInsert(dbh, object->warp_id, object->skycell_id, object->tess_id, object->exp_tag, object->cam_version, object->class_id);
     14430    return warpSkyCellMapInsert(dbh, object->warp_id, object->skycell_id, object->tess_id, object->exp_tag, object->cam_version, object->class_id, object->fault);
    1459614431}
    1459714432
    … …  
    1469614531        return false;
    1469714532    }
     14533    if (!psMetadataAdd(md, PS_LIST_TAIL, "fault", PS_DATA_S16, NULL, object->fault)) {
     14534        psError(PS_ERR_UNKNOWN, false, "failed to add item fault");
     14535        psFree(md);
     14536        return false;
     14537    }
    1469814538
    1469914539
    … …  
    1473514575        return false;
    1473614576    }
    14737 
    14738     return warpSkyCellMapRowAlloc(warp_id, skycell_id, tess_id, exp_tag, cam_version, class_id);
     14577    psS16 fault = psMetadataLookupS16(&status, md, "fault");
     14578    if (!status) {
     14579        psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item fault");
     14580        return false;
     14581    }
     14582
     14583    return warpSkyCellMapRowAlloc(warp_id, skycell_id, tess_id, exp_tag, cam_version, class_id, fault);
    1473914584}
    1474014585psArray *warpSkyCellMapSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit)
Note: See TracChangeset for help on using the changeset viewer.