IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 6955


Ignore:
Timestamp:
Apr 21, 2006, 5:20:16 PM (20 years ago)
Author:
Paul Price
Message:

Making psDB optional, for when we don't compile psLib with mysql

Location:
trunk/psModules/src
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/psModules/src/astrom/pmConcepts.h

    r6931 r6955  
    33
    44#include "pslib.h"
    5 
    65#include "pmFPA.h"
    7 
    86
    97// Function to call to parse a concept once it has been read

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

    r6872 r6955  
    258258                               )
    259259{
     260    #ifdef OMIT_PSDB
     261    return false;
     262    #else
     263
    260264    pmHDU *hdu = pmHDUGetLowest(fpa, chip, cell); // The HDU at the lowest level
    261265    if (!hdu) {
    … …  
    364368    }
    365369    return false;
     370    #endif
    366371}
    367372

  • trunk/psModules/src/astrom/pmConceptsRead.h

    r6872 r6955  
    22#define PM_CONCEPTS_READ_H
    33
     4#include "pslib.h"
    45#include "pmFPA.h"
    5 
    66
    77bool pmConceptsReadFromCamera(psMetadata *specs, // The concept specifications

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

    r6896 r6955  
    404404                              )
    405405{
     406    #ifdef OMIT_PSDB
     407    return false;
     408    #else
     409
    406410    pmHDU *hdu = pmHDUGetLowest(NULL, NULL, cell); // The HDU at the lowest level
    407411    if (!hdu) {
    … …  
    519523    }
    520524    return false;
     525    #endif
    521526}
    522527

  • trunk/psModules/src/astrom/pmConceptsWrite.h

    r6872 r6955  
    44#include "pslib.h"
    55#include "pmFPA.h"
    6 
    7 
    86
    97bool pmConceptsWriteToCamera(psMetadata *specs, // The concept specifications

  • trunk/psModules/src/astrom/pmFPARead.h

    r6872 r6955  
    44#include "pslib.h"
    55#include "pmFPA.h"
    6 
    76
    87bool pmReadoutReadNext(pmReadout *readout, // Readout into which to read

  • trunk/psModules/src/config/pmConfig.c

    r6890 r6955  
    33 *  @author PAP, IfA
    44 *
    5  *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
    6  *  @date $Date: 2006-04-18 22:41:40 $
     5 *  @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
     6 *  @date $Date: 2006-04-22 03:20:16 $
    77 *
    88 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    561561    psMetadata *site)
    562562{
     563    #ifdef OMIT_PSDB
     564    return NULL;
     565    #else
     566
    563567    PS_ASSERT_PTR_NON_NULL(site, NULL);
    564568    psBool mdStatus01 = false;
    … …  
    577581
    578582    return(psDBInit(dbServer, dbUsername, dbPassword, dbName));
     583    #endif
    579584}
    580585

  • trunk/psModules/src/config/pmConfig.h

    r6873 r6955  
    33 *  @author PAP, IfA
    44 *
    5  *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
    6  *  @date $Date: 2006-04-17 18:10:08 $
     5 *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
     6 *  @date $Date: 2006-04-22 03:20:16 $
    77 *
    88 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    1313
    1414#include "pslib.h"
    15 
    1615
    1716// Configuration information
    … …  
    103102 *
    104103 */
    105 #ifdef DOMIT_PSDB
    106 typedef psDB void;
    107 #endif
    108 
    109104psDB *pmConfigDB(
    110105    psMetadata *site
Note: See TracChangeset for help on using the changeset viewer.