Index: trunk/psLib/src/db/psDB.c
===================================================================
--- trunk/psLib/src/db/psDB.c	(revision 4312)
+++ trunk/psLib/src/db/psDB.c	(revision 4342)
@@ -12,6 +12,6 @@
  *  @author Joshua Hoblitt
  *
- *  @version $Revision: 1.29 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-18 00:53:32 $
+ *  @version $Revision: 1.30 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-22 02:05:41 $
  *
  *  Copyright 2005 Joshua Hoblitt, University of Hawaii
@@ -45,14 +45,14 @@
 
 // database utility functions
-static inline bool psDBPackRow(MYSQL_BIND *bind, psMetadata *values, psU32 paramCount);
+static inline bool psDBPackRow(MYSQL_BIND *bind, const psMetadata *values, psU32 paramCount);
 
 // SQL generation functions
-static char    *psDBGenerateCreateTableSQL(const char *tableName, psMetadata *where);
-static char    *psDBGenerateSelectRowSQL(const char *tableName, const char *col, psMetadata *where, psU64 limit);
-static char    *psDBGenerateInsertRowSQL(const char *tableName, psMetadata *row);
-static char    *psDBGenerateUpdateRowSQL(const char *tableName, psMetadata *where, psMetadata *values);
-static char    *psDBGenerateDeleteRowSQL(const char *tableName, psMetadata *where);
-static char    *psDBGenerateWhereSQL(psMetadata *where);
-static char    *psDBGenerateSetSQL(psMetadata *set
+static char    *psDBGenerateCreateTableSQL(const char *tableName, const psMetadata *where);
+static char    *psDBGenerateSelectRowSQL(const char *tableName, const char *col, const psMetadata *where, psU64 limit);
+static char    *psDBGenerateInsertRowSQL(const char *tableName, const psMetadata *row);
+static char    *psDBGenerateUpdateRowSQL(const char *tableName, const psMetadata *where, const psMetadata *values);
+static char    *psDBGenerateDeleteRowSQL(const char *tableName, const psMetadata *where);
+static char    *psDBGenerateWhereSQL(const psMetadata *where);
+static char    *psDBGenerateSetSQL(const psMetadata *set
                                   );
 
@@ -195,5 +195,5 @@
 }
 
-bool psDBCreateTable(psDB *dbh, const char *tableName, psMetadata *md)
+bool psDBCreateTable(psDB *dbh, const char *tableName, const psMetadata *md)
 {
     char            *query;
@@ -403,5 +403,5 @@
 }
 
-psArray *psDBSelectRows(psDB *dbh, const char *tableName, psMetadata *where, unsigned long long limit)
+psArray *psDBSelectRows(psDB *dbh, const char *tableName, const psMetadata *where, unsigned long long limit)
 {
     MYSQL_RES       *result;            // complete db result set
@@ -509,7 +509,7 @@
 }
 
-bool psDBInsertOneRow(psDB *dbh, const char *tableName, psMetadata *row)
-{
-    psArray         *rowSet;            // psArray of row to insert
+bool psDBInsertOneRow(psDB *dbh, const char *tableName, const psMetadata *row)
+{
+    psArray         *rowSet;           // psArray of row to insert
 
     // Check for null row
@@ -522,5 +522,5 @@
     rowSet = psArrayAlloc(1);
     rowSet->n = 0;
-    psArrayAdd(rowSet, 0, row);
+    psArrayAdd(rowSet, 0, (psPtr)row);
 
     // Execute function to insert rows
@@ -687,5 +687,5 @@
 }
 
-psS64 psDBUpdateRows(psDB *dbh, const char *tableName, psMetadata *where, psMetadata *values)
+psS64 psDBUpdateRows(psDB *dbh, const char *tableName, const psMetadata *where, const psMetadata *values)
 {
     char            *query;
@@ -769,5 +769,5 @@
 }
 
-psS64 psDBDeleteRows(psDB *dbh, const char *tableName, psMetadata *where)
+psS64 psDBDeleteRows(psDB *dbh, const char *tableName, const psMetadata *where)
 {
     char            *query;
@@ -806,5 +806,5 @@
 /*****************************************************************************/
 
-bool p_psDBRunQuery(psDB *dbh, const char *query)
+bool p_psDBRunQuery(psDB *dbh, const char *format)
 {
     // Verify database object is not NULL
@@ -815,5 +815,5 @@
 
     // Run query
-    if (mysql_real_query(dbh->mysql, query, (unsigned long)strlen(query)) !=0) {
+    if (mysql_real_query(dbh->mysql, format, (unsigned long)strlen(format)) !=0) {
         psError(PS_ERR_UNKNOWN, true, PS_ERRORTEXT_psDB_SQL_QUERY_FAIL, mysql_error(dbh->mysql));
         return false;
@@ -823,5 +823,5 @@
 }
 
-static inline bool psDBPackRow(MYSQL_BIND *bind, psMetadata *values, psU32 paramCount)
+static inline bool psDBPackRow(MYSQL_BIND *bind, const psMetadata *values, psU32 paramCount)
 {
     psListIterator  *cursor;            // row iterator
@@ -912,5 +912,5 @@
 /*****************************************************************************/
 
-static char *psDBGenerateCreateTableSQL(const char *tableName, psMetadata *table)
+static char *psDBGenerateCreateTableSQL(const char *tableName, const psMetadata *table)
 {
     char            *query = NULL;      // complete query
@@ -988,5 +988,5 @@
 }
 
-static char *psDBGenerateSelectRowSQL(const char *tableName, const char *col, psMetadata *where, const psU64 limit)
+static char *psDBGenerateSelectRowSQL(const char *tableName, const char *col, const psMetadata *where, psU64 limit)
 {
     char            *query = NULL;
@@ -1025,5 +1025,5 @@
 }
 
-static char *psDBGenerateInsertRowSQL(const char *tableName, psMetadata *row)
+static char *psDBGenerateInsertRowSQL(const char *tableName, const psMetadata *row)
 {
     char            *query = NULL;
@@ -1081,5 +1081,5 @@
 }
 
-static char *psDBGenerateUpdateRowSQL(const char *tableName, psMetadata *where, psMetadata *values)
+static char *psDBGenerateUpdateRowSQL(const char *tableName, const psMetadata *where, const psMetadata *values)
 {
     char            *query = NULL;
@@ -1114,5 +1114,5 @@
 }
 
-static char *psDBGenerateDeleteRowSQL(const char *tableName, psMetadata *where)
+static char *psDBGenerateDeleteRowSQL(const char *tableName, const psMetadata *where)
 {
     char            *query = NULL;
@@ -1139,5 +1139,5 @@
 }
 
-static char *psDBGenerateWhereSQL(psMetadata *where)
+static char *psDBGenerateWhereSQL(const psMetadata *where)
 {
     char            *query = NULL;
@@ -1198,5 +1198,5 @@
 }
 
-static char *psDBGenerateSetSQL(psMetadata *set
+static char *psDBGenerateSetSQL(const psMetadata *set
                                )
 {