IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Mar 25, 2008, 12:32:53 PM (18 years ago)
Author:
jhoblitt
Message:

add warpRun.label

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/ippdb/src/ippdb.c

    r16731 r17142  
    95039503static void warpRunRowFree(warpRunRow *object);
    95049504
    9505 warpRunRow *warpRunRowAlloc(psS64 warp_id, psS64 cam_id, const char *mode, const char *state, const char *workdir, const char *workdir_state, const char *dvodb, const char *tess_id, const char *end_stage, psTime* registered, bool magiced)
     9505warpRunRow *warpRunRowAlloc(psS64 warp_id, psS64 cam_id, const char *mode, const char *state, const char *workdir, const char *workdir_state, const char *label, const char *dvodb, const char *tess_id, const char *end_stage, psTime* registered, bool magiced)
    95069506{
    95079507    warpRunRow      *_object;
    … …  
    95169516    _object->workdir = psStringCopy(workdir);
    95179517    _object->workdir_state = psStringCopy(workdir_state);
     9518    _object->label = psStringCopy(label);
    95189519    _object->dvodb = psStringCopy(dvodb);
    95199520    _object->tess_id = psStringCopy(tess_id);
    … …  
    95319532    psFree(object->workdir);
    95329533    psFree(object->workdir_state);
     9534    psFree(object->label);
    95339535    psFree(object->dvodb);
    95349536    psFree(object->tess_id);
    … …  
    95709572        return false;
    95719573    }
     9574    if (!psMetadataAdd(md, PS_LIST_TAIL, "label", PS_DATA_STRING, "key", "64")) {
     9575        psError(PS_ERR_UNKNOWN, false, "failed to add item label");
     9576        psFree(md);
     9577        return false;
     9578    }
    95729579    if (!psMetadataAdd(md, PS_LIST_TAIL, "dvodb", PS_DATA_STRING, NULL, "255")) {
    95739580        psError(PS_ERR_UNKNOWN, false, "failed to add item dvodb");
    … …  
    96089615}
    96099616
    9610 bool warpRunInsert(psDB * dbh, psS64 warp_id, psS64 cam_id, const char *mode, const char *state, const char *workdir, const char *workdir_state, const char *dvodb, const char *tess_id, const char *end_stage, psTime* registered, bool magiced)
     9617bool warpRunInsert(psDB * dbh, psS64 warp_id, psS64 cam_id, const char *mode, const char *state, const char *workdir, const char *workdir_state, const char *label, const char *dvodb, const char *tess_id, const char *end_stage, psTime* registered, bool magiced)
    96119618{
    96129619    psMetadata *md = psMetadataAlloc();
    … …  
    96389645    if (!psMetadataAdd(md, PS_LIST_TAIL, "workdir_state", PS_DATA_STRING, NULL, workdir_state)) {
    96399646        psError(PS_ERR_UNKNOWN, false, "failed to add item workdir_state");
     9647        psFree(md);
     9648        return false;
     9649    }
     9650    if (!psMetadataAdd(md, PS_LIST_TAIL, "label", PS_DATA_STRING, NULL, label)) {
     9651        psError(PS_ERR_UNKNOWN, false, "failed to add item label");
    96409652        psFree(md);
    96419653        return false;
    … …  
    96899701bool warpRunInsertObject(psDB *dbh, warpRunRow *object)
    96909702{
    9691     return warpRunInsert(dbh, object->warp_id, object->cam_id, object->mode, object->state, object->workdir, object->workdir_state, object->dvodb, object->tess_id, object->end_stage, object->registered, object->magiced);
     9703    return warpRunInsert(dbh, object->warp_id, object->cam_id, object->mode, object->state, object->workdir, object->workdir_state, object->label, object->dvodb, object->tess_id, object->end_stage, object->registered, object->magiced);
    96929704}
    96939705
    … …  
    97929804        return false;
    97939805    }
     9806    if (!psMetadataAdd(md, PS_LIST_TAIL, "label", PS_DATA_STRING, NULL, object->label)) {
     9807        psError(PS_ERR_UNKNOWN, false, "failed to add item label");
     9808        psFree(md);
     9809        return false;
     9810    }
    97949811    if (!psMetadataAdd(md, PS_LIST_TAIL, "dvodb", PS_DATA_STRING, NULL, object->dvodb)) {
    97959812        psError(PS_ERR_UNKNOWN, false, "failed to add item dvodb");
    … …  
    98569873        return false;
    98579874    }
     9875    char* label = psMetadataLookupPtr(&status, md, "label");
     9876    if (!status) {
     9877        psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item label");
     9878        return false;
     9879    }
    98589880    char* dvodb = psMetadataLookupPtr(&status, md, "dvodb");
    98599881    if (!status) {
    … …  
    98829904    }
    98839905
    9884     return warpRunRowAlloc(warp_id, cam_id, mode, state, workdir, workdir_state, dvodb, tess_id, end_stage, registered, magiced);
     9906    return warpRunRowAlloc(warp_id, cam_id, mode, state, workdir, workdir_state, label, dvodb, tess_id, end_stage, registered, magiced);
    98859907}
    98869908psArray *warpRunSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit)
    … …  
    2489824920static void pstampRequestRowFree(pstampRequestRow *object);
    2489924921
    24900 pstampRequestRow *pstampRequestRowAlloc(psS64 req_id, psS64 ds_id, const char *state, const char *outFileset, const char *uri)
     24922pstampRequestRow *pstampRequestRowAlloc(psS64 req_id, psS64 ds_id, const char *state, const char *outFileset, const char *uri, psS16 resultsFile)
    2490124923{
    2490224924    pstampRequestRow *_object;
    … …  
    2491024932    _object->outFileset = psStringCopy(outFileset);
    2491124933    _object->uri = psStringCopy(uri);
     24934    _object->resultsFile = resultsFile;
    2491224935
    2491324936    return _object;
    … …  
    2494924972        return false;
    2495024973    }
     24974    if (!psMetadataAdd(md, PS_LIST_TAIL, "resultsFile", PS_DATA_S16, NULL, 0)) {
     24975        psError(PS_ERR_UNKNOWN, false, "failed to add item resultsFile");
     24976        psFree(md);
     24977        return false;
     24978    }
    2495124979
    2495224980    bool status = psDBCreateTable(dbh, PSTAMPREQUEST_TABLE_NAME, md);
    … …  
    2496224990}
    2496324991
    24964 bool pstampRequestInsert(psDB * dbh, psS64 req_id, psS64 ds_id, const char *state, const char *outFileset, const char *uri)
     24992bool pstampRequestInsert(psDB * dbh, psS64 req_id, psS64 ds_id, const char *state, const char *outFileset, const char *uri, psS16 resultsFile)
    2496524993{
    2496624994    psMetadata *md = psMetadataAlloc();
    … …  
    2498725015    if (!psMetadataAdd(md, PS_LIST_TAIL, "uri", PS_DATA_STRING, NULL, uri)) {
    2498825016        psError(PS_ERR_UNKNOWN, false, "failed to add item uri");
     25017        psFree(md);
     25018        return false;
     25019    }
     25020    if (!psMetadataAdd(md, PS_LIST_TAIL, "resultsFile", PS_DATA_S16, NULL, resultsFile)) {
     25021        psError(PS_ERR_UNKNOWN, false, "failed to add item resultsFile");
    2498925022        psFree(md);
    2499025023        return false;
    … …  
    2501325046bool pstampRequestInsertObject(psDB *dbh, pstampRequestRow *object)
    2501425047{
    25015     return pstampRequestInsert(dbh, object->req_id, object->ds_id, object->state, object->outFileset, object->uri);
     25048    return pstampRequestInsert(dbh, object->req_id, object->ds_id, object->state, object->outFileset, object->uri, object->resultsFile);
    2501625049}
    2501725050
    … …  
    2511125144        return false;
    2511225145    }
     25146    if (!psMetadataAdd(md, PS_LIST_TAIL, "resultsFile", PS_DATA_S16, NULL, object->resultsFile)) {
     25147        psError(PS_ERR_UNKNOWN, false, "failed to add item resultsFile");
     25148        psFree(md);
     25149        return false;
     25150    }
    2511325151
    2511425152
    … …  
    2514525183        return false;
    2514625184    }
    25147 
    25148     return pstampRequestRowAlloc(req_id, ds_id, state, outFileset, uri);
     25185    psS16 resultsFile = psMetadataLookupS16(&status, md, "resultsFile");
     25186    if (!status) {
     25187        psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item resultsFile");
     25188        return false;
     25189    }
     25190
     25191    return pstampRequestRowAlloc(req_id, ds_id, state, outFileset, uri, resultsFile);
    2514925192}
    2515025193psArray *pstampRequestSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit)
    … …  
    2526425307static void pstampJobRowFree(pstampJobRow *object);
    2526525308
    25266 pstampJobRow *pstampJobRowAlloc(psS64 job_id, psS64 req_id, const char *state, psS32 result, const char *uri, const char *outputBase, const char *args)
     25309pstampJobRow *pstampJobRowAlloc(psS64 job_id, psS64 req_id, const char *state, const char *jobType, psS32 result, const char *uri, const char *outputBase, const char *args)
    2526725310{
    2526825311    pstampJobRow    *_object;
    … …  
    2527425317    _object->req_id = req_id;
    2527525318    _object->state = psStringCopy(state);
     25319    _object->jobType = psStringCopy(jobType);
    2527625320    _object->result = result;
    2527725321    _object->uri = psStringCopy(uri);
    … …  
    2528525329{
    2528625330    psFree(object->state);
     25331    psFree(object->jobType);
    2528725332    psFree(object->uri);
    2528825333    psFree(object->outputBase);
    … …  
    2530825353        return false;
    2530925354    }
     25355    if (!psMetadataAdd(md, PS_LIST_TAIL, "jobType", PS_DATA_STRING, NULL, "16")) {
     25356        psError(PS_ERR_UNKNOWN, false, "failed to add item jobType");
     25357        psFree(md);
     25358        return false;
     25359    }
    2531025360    if (!psMetadataAdd(md, PS_LIST_TAIL, "result", PS_DATA_S32, NULL, 0)) {
    2531125361        psError(PS_ERR_UNKNOWN, false, "failed to add item result");
    … …  
    2534125391}
    2534225392
    25343 bool pstampJobInsert(psDB * dbh, psS64 job_id, psS64 req_id, const char *state, psS32 result, const char *uri, const char *outputBase, const char *args)
     25393bool pstampJobInsert(psDB * dbh, psS64 job_id, psS64 req_id, const char *state, const char *jobType, psS32 result, const char *uri, const char *outputBase, const char *args)
    2534425394{
    2534525395    psMetadata *md = psMetadataAlloc();
    … …  
    2535625406    if (!psMetadataAdd(md, PS_LIST_TAIL, "state", PS_DATA_STRING, NULL, state)) {
    2535725407        psError(PS_ERR_UNKNOWN, false, "failed to add item state");
     25408        psFree(md);
     25409        return false;
     25410    }
     25411    if (!psMetadataAdd(md, PS_LIST_TAIL, "jobType", PS_DATA_STRING, NULL, jobType)) {
     25412        psError(PS_ERR_UNKNOWN, false, "failed to add item jobType");
    2535825413        psFree(md);
    2535925414        return false;
    … …  
    2540225457bool pstampJobInsertObject(psDB *dbh, pstampJobRow *object)
    2540325458{
    25404     return pstampJobInsert(dbh, object->job_id, object->req_id, object->state, object->result, object->uri, object->outputBase, object->args);
     25459    return pstampJobInsert(dbh, object->job_id, object->req_id, object->state, object->jobType, object->result, object->uri, object->outputBase, object->args);
    2540525460}
    2540625461
    … …  
    2549025545        return false;
    2549125546    }
     25547    if (!psMetadataAdd(md, PS_LIST_TAIL, "jobType", PS_DATA_STRING, NULL, object->jobType)) {
     25548        psError(PS_ERR_UNKNOWN, false, "failed to add item jobType");
     25549        psFree(md);
     25550        return false;
     25551    }
    2549225552    if (!psMetadataAdd(md, PS_LIST_TAIL, "result", PS_DATA_S32, NULL, object->result)) {
    2549325553        psError(PS_ERR_UNKNOWN, false, "failed to add item result");
    … …  
    2553425594        return false;
    2553525595    }
     25596    char* jobType = psMetadataLookupPtr(&status, md, "jobType");
     25597    if (!status) {
     25598        psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item jobType");
     25599        return false;
     25600    }
    2553625601    psS32 result = psMetadataLookupS32(&status, md, "result");
    2553725602    if (!status) {
    … …  
    2555525620    }
    2555625621
    25557     return pstampJobRowAlloc(job_id, req_id, state, result, uri, outputBase, args);
     25622    return pstampJobRowAlloc(job_id, req_id, state, jobType, result, uri, outputBase, args);
    2555825623}
    2555925624psArray *pstampJobSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit)
Note: See TracChangeset for help on using the changeset viewer.