IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Oct 13, 2006, 11:22:09 AM (20 years ago)
Author:
Paul Price
Message:

Fixing psLib APIs following clean-up.

Location:
trunk/psModules/src/concepts
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/psModules/src/concepts/pmConceptsRead.c

    r8848 r9539  
    191191    psMetadata *cameraFormat = hdu->format; // The camera format
    192192    bool mdok = true;                   // Status of MD lookup
    193     psMetadata *defaults = psMetadataLookupMD(&mdok, cameraFormat, "DEFAULTS"); // The DEFAULTS spec
     193    psMetadata *defaults = psMetadataLookupMetadata(&mdok, cameraFormat, "DEFAULTS"); // The DEFAULTS spec
    194194    if (!mdok || !defaults) {
    195195        psError(PS_ERR_IO, true, "Failed to find \"DEFAULTS\"");
    … …  
    279279    psMetadata *cameraFormat = hduLow->format; // The camera format
    280280    bool mdok = true;                   // Status of MD lookup
    281     psMetadata *transSpec = psMetadataLookupMD(&mdok, cameraFormat, "TRANSLATION"); // The TRANSLATION spec
     281    psMetadata *transSpec = psMetadataLookupMetadata(&mdok, cameraFormat, "TRANSLATION"); // The TRANSLATION spec
    282282    if (!mdok || !transSpec) {
    283283        psError(PS_ERR_IO, true, "Failed to find \"TRANSLATION\"");
    … …  
    381381    psMetadata *cameraFormat = hdu->format; // The camera format
    382382    bool mdok = true;                   // Status of MD lookup
    383     psMetadata *dbSpec = psMetadataLookupMD(&mdok, cameraFormat, "DATABASE"); // The DATABASE spec
     383    psMetadata *dbSpec = psMetadataLookupMetadata(&mdok, cameraFormat, "DATABASE"); // The DATABASE spec
    384384    if (!mdok || !dbSpec) {
    385385        psError(PS_ERR_IO, true, "Unable to find DATABASE in camera configuration.\n");
    … …  
    394394        psString name = specItem->name; // The concept name
    395395
    396         psMetadata *dbLookup = psMetadataLookupMD(&mdok, dbSpec, name);
     396        psMetadata *dbLookup = psMetadataLookupMetadata(&mdok, dbSpec, name);
    397397        if (mdok && dbLookup) {
    398398            const char *tableName = psMetadataLookupStr(&mdok, dbLookup, "TABLE"); // Table name

  • trunk/psModules/src/concepts/pmConceptsStandard.c

    r9510 r9539  
    9191    // How to interpret the coordinates
    9292    bool mdok = true;           // Status of MD lookup
    93     psMetadata *formats = psMetadataLookupMD(&mdok, cameraFormat, "FORMATS");
     93    psMetadata *formats = psMetadataLookupMetadata(&mdok, cameraFormat, "FORMATS");
    9494    if (mdok && formats) {
    9595        psString format = psMetadataLookupStr(&mdok, formats, pattern->name);
    … …  
    128128    // How to interpret the coordinates
    129129    bool mdok = true;                   // Status of MD lookup
    130     psMetadata *formats = psMetadataLookupMD(&mdok,
     130    psMetadata *formats = psMetadataLookupMetadata(&mdok,
    131131                          cameraFormat,
    132132                          "FORMATS");
    … …  
    350350
    351351    // Get format
    352     psMetadata *formats = psMetadataLookupMD(&mdok, cameraFormat, "FORMATS");
     352    psMetadata *formats = psMetadataLookupMetadata(&mdok, cameraFormat, "FORMATS");
    353353    if (!mdok || !formats) {
    354354        psError(PS_ERR_UNKNOWN, true, "Unable to find FORMATS in camera configuration.\n");
    … …  
    528528{
    529529    bool mdok = false;                  // Result of MD lookup
    530     psMetadata *formats = psMetadataLookupMD(&mdok, cameraFormat, "FORMATS");
     530    psMetadata *formats = psMetadataLookupMetadata(&mdok, cameraFormat, "FORMATS");
    531531    if (mdok && formats) {
    532532        psString format = psMetadataLookupStr(&mdok, formats, name);
    … …  
    622622    assert(concept);
    623623
    624     psMetadata *translation = psMetadataLookupMD(NULL, cameraFormat, "TRANSLATION");
     624    psMetadata *translation = psMetadataLookupMetadata(NULL, cameraFormat, "TRANSLATION");
    625625    bool xBinOK = true, yBinOK = true;  // Status of MD lookups
    626626    psString xKeyword = psMetadataLookupStr(&xBinOK, translation, "CELL.XBIN");
    … …  
    649649    assert(concept);
    650650
    651     psMetadata *translation = psMetadataLookupMD(NULL, cameraFormat, "TRANSLATION");
     651    psMetadata *translation = psMetadataLookupMetadata(NULL, cameraFormat, "TRANSLATION");
    652652    bool xBinOK = true, yBinOK = true;  // Status of MD lookups
    653653    psString xKeyword = psMetadataLookupStr(&xBinOK, translation, "CELL.XBIN");
    … …  
    710710
    711711    bool mdok = true;                   // Status of MD lookup
    712     psMetadata *formats = psMetadataLookupMD(&mdok, cameraFormat, "FORMATS"); // The formats
     712    psMetadata *formats = psMetadataLookupMetadata(&mdok, cameraFormat, "FORMATS"); // The formats
    713713    if (mdok && formats) {
    714714        psString format = psMetadataLookupStr(&mdok, formats, concept->name); // The formats for eg, CELL.TIME

  • trunk/psModules/src/concepts/pmConceptsWrite.c

    r8848 r9539  
    307307    psMetadata *cameraFormat = hdu->format; // The camera format
    308308    bool mdok = true;                   // Status of MD lookup
    309     psMetadata *defaults = psMetadataLookupMD(&mdok, cameraFormat, "DEFAULTS"); // The DEFAULTS spec
     309    psMetadata *defaults = psMetadataLookupMetadata(&mdok, cameraFormat, "DEFAULTS"); // The DEFAULTS spec
    310310    if (!mdok || !defaults) {
    311311        return false;
    … …  
    373373    psMetadata *cameraFormat = hdu->format; // The camera format
    374374    bool mdok = true;                   // Status of MD lookup
    375     psMetadata *translation = psMetadataLookupMD(&mdok, cameraFormat, "TRANSLATION"); // The TRANSLATION spec
     375    psMetadata *translation = psMetadataLookupMetadata(&mdok, cameraFormat, "TRANSLATION"); // The TRANSLATION spec
    376376    if (!mdok || !translation) {
    377377        return false;
    … …  
    430430    psMetadata *cameraFormat = hdu->format; // The camera format
    431431    bool mdok = true;                   // Status of MD lookup
    432     psMetadata *database = psMetadataLookupMD(&mdok, cameraFormat, "DATABASE"); // The DATABASE spec
     432    psMetadata *database = psMetadataLookupMetadata(&mdok, cameraFormat, "DATABASE"); // The DATABASE spec
    433433    if (!mdok || !database) {
    434434        return false;
Note: See TracChangeset for help on using the changeset viewer.