Index: trunk/psLib/src/db/Makefile.am =================================================================== --- trunk/psLib/src/db/Makefile.am (revision 4502) +++ trunk/psLib/src/db/Makefile.am (revision 4540) @@ -1,22 +1,13 @@ #Makefile for db functions of psLib # -INCLUDES = `echo "$(SRCLIBS} | sed sed "s|\(\\w\+\)|-I\$(top_builddir)/src/\1|g"` - noinst_LTLIBRARIES = libpslibdb.la -libpslibdataIO_la_SOURCES = \ +libpslibdb_la_SOURCES = \ psDB.c - -BUILT_SOURCES = psDBErrors.h -EXTRA_DIST = psDBErrors_en.dat db.i - -psFileUtilsErrors.h: psFileUtilsErrors.dat - $(top_srcdir)/src/psParseErrorCodes --data=$? $@ +EXTRA_DIST = db.i pslibincludedir = $(includedir) pslibinclude_HEADERS = \ - psLookupTable.h \ - psFits.h \ psDB.h Index: trunk/psLib/src/db/psDB.c =================================================================== --- trunk/psLib/src/db/psDB.c (revision 4502) +++ trunk/psLib/src/db/psDB.c (revision 4540) @@ -12,6 +12,6 @@ * @author Joshua Hoblitt * - * @version $Revision: 1.37 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-29 20:33:37 $ + * @version $Revision: 1.38 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-07-12 19:12:00 $ * * Copyright 2005 Joshua Hoblitt, University of Hawaii @@ -35,5 +35,5 @@ #include "psError.h" #include "psString.h" -#include "psFileUtilsErrors.h" +#include "psErrorText.h" typedef struct Index: trunk/psLib/src/db/psDB.h =================================================================== --- trunk/psLib/src/db/psDB.h (revision 4502) +++ trunk/psLib/src/db/psDB.h (revision 4540) @@ -10,6 +10,6 @@ * @author Joshua Hoblitt * - * @version $Revision: 1.10 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-29 19:43:55 $ + * @version $Revision: 1.11 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-07-12 19:12:00 $ * * Copyright 2005 Joshua Hoblitt, University of Hawaii @@ -34,5 +34,5 @@ typedef struct { - void* mysql; ///< MySQL database handle + void* mysql; ///< MySQL database handle } psDB; @@ -44,8 +44,8 @@ */ psDB *psDBInit( - const char *host, ///< Database server hostname - const char *user, ///< Database username - const char *passwd, ///< Database password - const char *dbname ///< Database namespace + const char *host, ///< Database server hostname + const char *user, ///< Database username + const char *passwd, ///< Database password + const char *dbname ///< Database namespace ); @@ -53,5 +53,5 @@ */ void psDBCleanup( - psDB *dbh ///< Database handle + psDB *dbh ///< Database handle ); @@ -61,6 +61,6 @@ */ bool psDBCreate( - psDB *dbh, ///< Database handle - const char *dbname ///< New database namespace + psDB *dbh, ///< Database handle + const char *dbname ///< New database namespace ); @@ -70,6 +70,6 @@ */ bool psDBChange( - psDB *dbh, ///< Database handle - const char *dbname ///< Database namespace + psDB *dbh, ///< Database handle + const char *dbname ///< Database namespace ); @@ -79,6 +79,6 @@ */ bool psDBDrop( - psDB *dbh, ///< Database handle - const char *dbname ///< Database namespace + psDB *dbh, ///< Database handle + const char *dbname ///< Database namespace ); @@ -92,6 +92,6 @@ */ bool p_psDBRunQuery( - psDB *dbh, ///< Database handle - const char *format ///< SQL string to execute + psDB *dbh, ///< Database handle + const char *format ///< SQL string to execute ); @@ -117,7 +117,7 @@ */ bool psDBCreateTable( - psDB *dbh, ///< Database handle - const char *tableName, ///< Table name - const psMetadata *md ///< Column names, types, and indexes + psDB *dbh, ///< Database handle + const char *tableName, ///< Table name + const psMetadata *md ///< Column names, types, and indexes ); @@ -140,8 +140,8 @@ */ psArray *psDBSelectColumn( - psDB *dbh, ///< Database handle - const char *tableName, ///< Table name - const char *col, ///< Column name - unsigned long long limit ///< Maximum number of elements to return + psDB *dbh, ///< Database handle + const char *tableName, ///< Table name + const char *col, ///< Column name + unsigned long long limit ///< Maximum number of elements to return ); @@ -155,9 +155,9 @@ */ psVector *psDBSelectColumnNum( - psDB *dbh, ///< Database handle - const char *tableName, ///< Table name - const char *col, ///< Column name + psDB *dbh, ///< Database handle + const char *tableName, ///< Table name + const char *col, ///< Column name psElemType type, ///< Resulting psVector type - unsigned long long limit ///< Maximum number of elements to return + unsigned long long limit ///< Maximum number of elements to return ); @@ -177,8 +177,8 @@ */ psArray *psDBSelectRows( - psDB *dbh, ///< Database handle - const char *tableName, ///< Table name - const psMetadata *where, ///< Row match criteria - unsigned long long limit ///< Maximum number of elements to return + psDB *dbh, ///< Database handle + const char *tableName, ///< Table name + const psMetadata *where, ///< Row match criteria + unsigned long long limit ///< Maximum number of elements to return ); @@ -195,7 +195,7 @@ */ bool psDBInsertOneRow( - psDB *dbh, ///< Database handle - const char *tableName, ///< Table name - const psMetadata *row ///< Row description + psDB *dbh, ///< Database handle + const char *tableName, ///< Table name + const psMetadata *row ///< Row description ); @@ -210,7 +210,7 @@ */ bool psDBInsertRows( - psDB *dbh, ///< Database handle - const char *tableName, ///< Table name - const psArray *rowSet ///< Set of rows to insert + psDB *dbh, ///< Database handle + const char *tableName, ///< Table name + const psArray *rowSet ///< Set of rows to insert ); @@ -223,6 +223,6 @@ */ psArray *psDBDumpRows( - psDB *dbh, ///< Database handle - const char *tableName ///< Table name + psDB *dbh, ///< Database handle + const char *tableName ///< Table name ); @@ -236,6 +236,6 @@ */ psMetadata *psDBDumpCols( - psDB *dbh, ///< Database handle - const char *tableName ///< Table name + psDB *dbh, ///< Database handle + const char *tableName ///< Table name ); @@ -252,8 +252,8 @@ */ psS64 psDBUpdateRows( - psDB *dbh, ///< Database handle - const char *tableName, ///< Table name - const psMetadata *where, ///< Row match criteria - const psMetadata *values ///< new field values + psDB *dbh, ///< Database handle + const char *tableName, ///< Table name + const psMetadata *where, ///< Row match criteria + const psMetadata *values ///< new field values ); @@ -269,8 +269,8 @@ */ psS64 psDBDeleteRows( - psDB *dbh, ///< Database handle - const char *tableName, ///< Table name - const psMetadata *where, ///< Row match criteria - unsigned long long limit ///< Maximum number of rows to delete + psDB *dbh, ///< Database handle + const char *tableName, ///< Table name + const psMetadata *where, ///< Row match criteria + unsigned long long limit ///< Maximum number of rows to delete ); Index: trunk/psLib/src/db/psDBErrors_en.dat =================================================================== --- trunk/psLib/src/db/psDBErrors_en.dat (revision 4502) +++ (revision ) @@ -1,26 +1,0 @@ -# -# This file is used to generate psDBErrors.h content -# -# Format is: -# ERRORNAME(one word) ERROR_TEXT -# -# N.B. in code, the ERRORNAME appears as PS_ERRORTEXT_ERRORNAME -#################################################################### -psDB_INVALID_PSDB Invalid psDB has been specified. -psDB_NULL_TABLE NULL table specified. -psDB_FAILED_TO_CONNECT Failed to connect to database. Error: %s -psDB_FAILED_TO_CHANGE Failed to change database. Error: %s -psDB_TABLE_PARAM_NULL Create table parameters may not be NULL. -psDB_QUERY_GEN_FAIL Query generation failed. -psDB_TABLE_CREATE_FAIL Failed to create table. -psDB_SQL_PREPARE_FAIL Failed to prepare query. Error: %s -psDB_SQL_QUERY_FAIL Failed to execute SQL query. Error: %s -psDB_TABLE_DROP_FAIL Failed to drop table. -psDB_SEL_COL_FAIL Failed to select column. -psDB_QUERY_NO_DATA Query returned no data. Error: %s -psDB_INSERT_ROW_FAIL Failed to insert row. -psDB_UPDATE_ROW_FAIL Update row SQL generate fail: values and where params may not be NULL. -psDB_SQL_SUBSTR_FAIL SQL substring generation failed. -psDB_WHERE_SUBSTR_FAIL WHERE parameter my not be NULL. - -