IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Mar 5, 2007, 5:42:40 PM (19 years ago)
Author:
jhoblitt
Message:

VERSION 1.1.16

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/ippdb/src/ippdb.c

    r12236 r12260  
    35263526static void rawExpRowFree(rawExpRow *object);
    35273527
    3528 rawExpRow *rawExpRowAlloc(const char *exp_tag, const char *exp_id, const char *camera, const char *telescope, psTime* dateobs, const char *exp_type, psS32 imfiles, const char *workdir, const char *filter, psF32 airmass, psF64 ra, psF64 decl, psF32 exp_time, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, psF64 alt, psF64 az, psF32 ccd_temp, psF64 posang, const char *object, psF32 solang, psS16 fault)
     3528rawExpRow *rawExpRowAlloc(const char *exp_tag, const char *exp_id, const char *camera, const char *telescope, psTime* dateobs, const char *exp_type, psS32 imfiles, const char *filelevel, const char *workdir, const char *filter, psF32 airmass, psF64 ra, psF64 decl, psF32 exp_time, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, psF64 alt, psF64 az, psF32 ccd_temp, psF64 posang, const char *object, psF32 solang, psS16 fault)
    35293529{
    35303530    rawExpRow       *_object;
    … …  
    35403540    _object->exp_type = psStringCopy(exp_type);
    35413541    _object->imfiles = imfiles;
     3542    _object->filelevel = psStringCopy(filelevel);
    35423543    _object->workdir = psStringCopy(workdir);
    35433544    _object->filter = psStringCopy(filter);
    … …  
    35683569    psFree(object->dateobs);
    35693570    psFree(object->exp_type);
     3571    psFree(object->filelevel);
    35703572    psFree(object->workdir);
    35713573    psFree(object->filter);
    … …  
    36113613        return false;
    36123614    }
     3615    if (!psMetadataAdd(md, PS_LIST_TAIL, "filelevel", PS_DATA_STRING, NULL, "64")) {
     3616        psError(PS_ERR_UNKNOWN, false, "failed to add item filelevel");
     3617        psFree(md);
     3618        return false;
     3619    }
    36133620    if (!psMetadataAdd(md, PS_LIST_TAIL, "workdir", PS_DATA_STRING, "destination for output files", "255")) {
    36143621        psError(PS_ERR_UNKNOWN, false, "failed to add item workdir");
    … …  
    37043711}
    37053712
    3706 bool rawExpInsert(psDB * dbh, const char *exp_tag, const char *exp_id, const char *camera, const char *telescope, psTime* dateobs, const char *exp_type, psS32 imfiles, const char *workdir, const char *filter, psF32 airmass, psF64 ra, psF64 decl, psF32 exp_time, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, psF64 alt, psF64 az, psF32 ccd_temp, psF64 posang, const char *object, psF32 solang, psS16 fault)
     3713bool rawExpInsert(psDB * dbh, const char *exp_tag, const char *exp_id, const char *camera, const char *telescope, psTime* dateobs, const char *exp_type, psS32 imfiles, const char *filelevel, const char *workdir, const char *filter, psF32 airmass, psF64 ra, psF64 decl, psF32 exp_time, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, psF64 alt, psF64 az, psF32 ccd_temp, psF64 posang, const char *object, psF32 solang, psS16 fault)
    37073714{
    37083715    psMetadata *md = psMetadataAlloc();
    … …  
    37393746    if (!psMetadataAdd(md, PS_LIST_TAIL, "imfiles", PS_DATA_S32, NULL, imfiles)) {
    37403747        psError(PS_ERR_UNKNOWN, false, "failed to add item imfiles");
     3748        psFree(md);
     3749        return false;
     3750    }
     3751    if (!psMetadataAdd(md, PS_LIST_TAIL, "filelevel", PS_DATA_STRING, NULL, filelevel)) {
     3752        psError(PS_ERR_UNKNOWN, false, "failed to add item filelevel");
    37413753        psFree(md);
    37423754        return false;
    … …  
    38453857bool rawExpInsertObject(psDB *dbh, rawExpRow *object)
    38463858{
    3847     return rawExpInsert(dbh, object->exp_tag, object->exp_id, object->camera, object->telescope, object->dateobs, object->exp_type, object->imfiles, object->workdir, object->filter, object->airmass, object->ra, object->decl, object->exp_time, object->bg, object->bg_stdev, object->bg_mean_stdev, object->alt, object->az, object->ccd_temp, object->posang, object->object, object->solang, object->fault);
     3859    return rawExpInsert(dbh, object->exp_tag, object->exp_id, object->camera, object->telescope, object->dateobs, object->exp_type, object->imfiles, object->filelevel, object->workdir, object->filter, object->airmass, object->ra, object->decl, object->exp_time, object->bg, object->bg_stdev, object->bg_mean_stdev, object->alt, object->az, object->ccd_temp, object->posang, object->object, object->solang, object->fault);
    38483860}
    38493861
    … …  
    39533965        return false;
    39543966    }
     3967    if (!psMetadataAdd(md, PS_LIST_TAIL, "filelevel", PS_DATA_STRING, NULL, object->filelevel)) {
     3968        psError(PS_ERR_UNKNOWN, false, "failed to add item filelevel");
     3969        psFree(md);
     3970        return false;
     3971    }
    39553972    if (!psMetadataAdd(md, PS_LIST_TAIL, "workdir", PS_DATA_STRING, NULL, object->workdir)) {
    39563973        psError(PS_ERR_UNKNOWN, false, "failed to add item workdir");
    … …  
    40774094        return false;
    40784095    }
     4096    char* filelevel = psMetadataLookupPtr(&status, md, "filelevel");
     4097    if (!status) {
     4098        psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item filelevel");
     4099        return false;
     4100    }
    40794101    char* workdir = psMetadataLookupPtr(&status, md, "workdir");
    40804102    if (!status) {
    … …  
    41584180    }
    41594181
    4160     return rawExpRowAlloc(exp_tag, exp_id, camera, telescope, dateobs, exp_type, imfiles, workdir, filter, airmass, ra, decl, exp_time, bg, bg_stdev, bg_mean_stdev, alt, az, ccd_temp, posang, object, solang, fault);
     4182    return rawExpRowAlloc(exp_tag, exp_id, camera, telescope, dateobs, exp_type, imfiles, filelevel, workdir, filter, airmass, ra, decl, exp_time, bg, bg_stdev, bg_mean_stdev, alt, az, ccd_temp, posang, object, solang, fault);
    41614183}
    41624184psArray *rawExpSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit)
    … …  
    42704292static void rawImfileRowFree(rawImfileRow *object);
    42714293
    4272 rawImfileRow *rawImfileRowAlloc(const char *exp_tag, const char *class, const char *class_id, const char *uri, const char *exp_type, const char *filter, psF32 airmass, psF64 ra, psF64 decl, psF32 exp_time, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, psF64 alt, psF64 az, psF32 ccd_temp, psF64 posang, const char *object, psTime* dateobs, psS16 fault)
     4294rawImfileRow *rawImfileRowAlloc(const char *exp_tag, const char *class_id, const char *uri, const char *exp_type, const char *filter, psF32 airmass, psF64 ra, psF64 decl, psF32 exp_time, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, psF64 alt, psF64 az, psF32 ccd_temp, psF64 posang, const char *object, psTime* dateobs, psS16 fault)
    42734295{
    42744296    rawImfileRow    *_object;
    … …  
    42784300
    42794301    _object->exp_tag = psStringCopy(exp_tag);
    4280     _object->class = psStringCopy(class);
    42814302    _object->class_id = psStringCopy(class_id);
    42824303    _object->uri = psStringCopy(uri);
    … …  
    43044325{
    43054326    psFree(object->exp_tag);
    4306     psFree(object->class);
    43074327    psFree(object->class_id);
    43084328    psFree(object->uri);
    … …  
    43214341        return false;
    43224342    }
    4323     if (!psMetadataAdd(md, PS_LIST_TAIL, "class", PS_DATA_STRING, NULL, "64")) {
    4324         psError(PS_ERR_UNKNOWN, false, "failed to add item class");
    4325         psFree(md);
    4326         return false;
    4327     }
    43284343    if (!psMetadataAdd(md, PS_LIST_TAIL, "class_id", PS_DATA_STRING, "Primary Key", "64")) {
    43294344        psError(PS_ERR_UNKNOWN, false, "failed to add item class_id");
    … …  
    44294444}
    44304445
    4431 bool rawImfileInsert(psDB * dbh, const char *exp_tag, const char *class, const char *class_id, const char *uri, const char *exp_type, const char *filter, psF32 airmass, psF64 ra, psF64 decl, psF32 exp_time, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, psF64 alt, psF64 az, psF32 ccd_temp, psF64 posang, const char *object, psTime* dateobs, psS16 fault)
     4446bool rawImfileInsert(psDB * dbh, const char *exp_tag, const char *class_id, const char *uri, const char *exp_type, const char *filter, psF32 airmass, psF64 ra, psF64 decl, psF32 exp_time, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, psF64 alt, psF64 az, psF32 ccd_temp, psF64 posang, const char *object, psTime* dateobs, psS16 fault)
    44324447{
    44334448    psMetadata *md = psMetadataAlloc();
    44344449    if (!psMetadataAdd(md, PS_LIST_TAIL, "exp_tag", PS_DATA_STRING, NULL, exp_tag)) {
    44354450        psError(PS_ERR_UNKNOWN, false, "failed to add item exp_tag");
    4436         psFree(md);
    4437         return false;
    4438     }
    4439     if (!psMetadataAdd(md, PS_LIST_TAIL, "class", PS_DATA_STRING, NULL, class)) {
    4440         psError(PS_ERR_UNKNOWN, false, "failed to add item class");
    44414451        psFree(md);
    44424452        return false;
    … …  
    45554565bool rawImfileInsertObject(psDB *dbh, rawImfileRow *object)
    45564566{
    4557     return rawImfileInsert(dbh, object->exp_tag, object->class, object->class_id, object->uri, object->exp_type, object->filter, object->airmass, object->ra, object->decl, object->exp_time, object->bg, object->bg_stdev, object->bg_mean_stdev, object->alt, object->az, object->ccd_temp, object->posang, object->object, object->dateobs, object->fault);
     4567    return rawImfileInsert(dbh, object->exp_tag, object->class_id, object->uri, object->exp_type, object->filter, object->airmass, object->ra, object->decl, object->exp_time, object->bg, object->bg_stdev, object->bg_mean_stdev, object->alt, object->az, object->ccd_temp, object->posang, object->object, object->dateobs, object->fault);
    45584568}
    45594569
    … …  
    46334643        return false;
    46344644    }
    4635     if (!psMetadataAdd(md, PS_LIST_TAIL, "class", PS_DATA_STRING, NULL, object->class)) {
    4636         psError(PS_ERR_UNKNOWN, false, "failed to add item class");
    4637         psFree(md);
    4638         return false;
    4639     }
    46404645    if (!psMetadataAdd(md, PS_LIST_TAIL, "class_id", PS_DATA_STRING, NULL, object->class_id)) {
    46414646        psError(PS_ERR_UNKNOWN, false, "failed to add item class_id");
    … …  
    47424747        return false;
    47434748    }
    4744     char* class = psMetadataLookupPtr(&status, md, "class");
    4745     if (!status) {
    4746         psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item class");
    4747         return false;
    4748     }
    47494749    char* class_id = psMetadataLookupPtr(&status, md, "class_id");
    47504750    if (!status) {
    … …  
    48384838    }
    48394839
    4840     return rawImfileRowAlloc(exp_tag, class, class_id, uri, exp_type, filter, airmass, ra, decl, exp_time, bg, bg_stdev, bg_mean_stdev, alt, az, ccd_temp, posang, object, dateobs, fault);
     4840    return rawImfileRowAlloc(exp_tag, class_id, uri, exp_type, filter, airmass, ra, decl, exp_time, bg, bg_stdev, bg_mean_stdev, alt, az, ccd_temp, posang, object, dateobs, fault);
    48414841}
    48424842psArray *rawImfileSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit)
Note: See TracChangeset for help on using the changeset viewer.