Index: trunk/psLib/src/db/psDB.c
===================================================================
--- trunk/psLib/src/db/psDB.c	(revision 9422)
+++ trunk/psLib/src/db/psDB.c	(revision 9538)
@@ -12,6 +12,6 @@
  *  @author Joshua Hoblitt
  *
- *  @version $Revision: 1.100 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-10-09 22:11:34 $
+ *  @version $Revision: 1.101 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-10-13 21:13:47 $
  *
  *  Copyright (C) 2005-2006  Joshua Hoblitt, University of Hawaii
@@ -76,13 +76,13 @@
 
 // SQL generation functions
-static char    *psDBGenerateCreateTableSQL(const char *tableName, const psMetadata *where);
-static char    *psDBGenerateSelectRowSQL(const char *tableName, const char *col,
+static psString psDBGenerateCreateTableSQL(const char *tableName, const psMetadata *where);
+static psString 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,
+static psString psDBGenerateInsertRowSQL(const char *tableName, const psMetadata *row);
+static psString psDBGenerateUpdateRowSQL(const char *tableName, const psMetadata *where,
         const psMetadata *values);
-static char    *psDBGenerateDeleteRowSQL(const char *tableName, const psMetadata *where,
+static psString psDBGenerateDeleteRowSQL(const char *tableName, const psMetadata *where,
         unsigned long long limit);
-static char    *psDBGenerateSetSQL(const psMetadata *set
+static psString psDBGenerateSetSQL(const psMetadata *set
                                   );
 static char *psDBGenerateConditionalSQL(const psMetadataItem *item, const char *tableName);
@@ -90,5 +90,5 @@
 // lookup table functions
 static psElemType psDBMySQLToPType(enum enum_field_types type, unsigned int flags);
-static char    *psDBPTypeToSQL(psElemType pType);
+static psString psDBPTypeToSQL(psElemType pType);
 static mysqlType *psDBPTypeToMySQL(psElemType pType);
 
@@ -116,5 +116,4 @@
 static psPtr    psDBGetPTypeNaN(psElemType pType);
 static bool     psDBIsPTypeNaN(psElemType pType, psPtr data);
-
 
 // public functions
@@ -228,5 +227,5 @@
     PS_ASSERT_PTR_NON_NULL(dbname, false);
 
-    char *query = NULL;
+    psString query = NULL;
     psStringAppend(&query, "CREATE DATABASE %s", dbname);
 
@@ -294,5 +293,5 @@
 
     // Generate SQL query string
-    char *query = psDBGenerateCreateTableSQL(tableName, md);
+    psString query = psDBGenerateCreateTableSQL(tableName, md);
     if (!query) {
         psError(PS_ERR_UNEXPECTED_NULL, false, _("Query generation failed."));
@@ -320,5 +319,5 @@
 
     // Create SQL command string to drop table
-    char *query = NULL;
+    psString query = NULL;
     psStringAppend(&query, "DROP TABLE %s", tableName);
 
@@ -354,5 +353,5 @@
 
     // Generate SQL query string
-    char *query = psDBGenerateSelectRowSQL(tableName, col, NULL, limit);
+    psString query = psDBGenerateSelectRowSQL(tableName, col, NULL, limit);
     if (!query) {
         psError(PS_ERR_UNEXPECTED_NULL, false, _("Query generation failed."));
@@ -541,5 +540,5 @@
 
     // Create select row query
-    char *query = psDBGenerateSelectRowSQL(tableName, NULL, where, limit);
+    psString query = psDBGenerateSelectRowSQL(tableName, NULL, where, limit);
     if (!query) {
         psError(PS_ERR_UNEXPECTED_NULL, false, "Query generation failed.");
@@ -597,5 +596,5 @@
 
     // Generate SQL query string
-    char *query = psDBGenerateInsertRowSQL(tableName, row);
+    psString query = psDBGenerateInsertRowSQL(tableName, row);
     if (!query) {
         psError(PS_ERR_UNEXPECTED_NULL, false, _("Query generation failed."));
@@ -692,5 +691,5 @@
 
     // Generate SQL query to update row
-    char *query = psDBGenerateUpdateRowSQL(tableName, where, values);
+    psString query = psDBGenerateUpdateRowSQL(tableName, where, values);
     if (!query) {
         psError(PS_ERR_UNEXPECTED_NULL, false, _("Query generation failed."));
@@ -720,5 +719,5 @@
 
     // Create SQL statement string
-    char *query = psDBGenerateDeleteRowSQL(tableName, where,limit);
+    psString query = psDBGenerateDeleteRowSQL(tableName, where,limit);
     if (!query) {
         psError(PS_ERR_UNEXPECTED_NULL, false, "Query generation failed.");
@@ -809,5 +808,5 @@
     PS_ASSERT_PTR_NON_NULL(format, false);
 
-    char *query = NULL;
+    psString query = NULL;
 
     // Run query
@@ -847,5 +846,5 @@
     PS_ASSERT_PTR_NON_NULL(format, -1);
 
-    char *query = NULL;
+    psString query = NULL;
 
     // generate query string
@@ -1229,6 +1228,6 @@
 /*****************************************************************************/
 
-static char *psDBGenerateCreateTableSQL(const char *tableName,
-                                        const psMetadata *table)
+static psString psDBGenerateCreateTableSQL(const char *tableName,
+        const psMetadata *table)
 {
     PS_ASSERT_PTR_NON_NULL(tableName, NULL);
@@ -1332,8 +1331,8 @@
 }
 
-static char *psDBGenerateSelectRowSQL(const char *tableName,
-                                      const char *col,
-                                      const psMetadata *where,
-                                      psU64 limit)
+static psString psDBGenerateSelectRowSQL(const char *tableName,
+        const char *col,
+        const psMetadata *where,
+        psU64 limit)
 {
     PS_ASSERT_PTR_NON_NULL(tableName, NULL);
@@ -1374,6 +1373,6 @@
 }
 
-static char *psDBGenerateInsertRowSQL(const char *tableName,
-                                      const psMetadata *row)
+static psString psDBGenerateInsertRowSQL(const char *tableName,
+        const psMetadata *row)
 {
     PS_ASSERT_PTR_NON_NULL(tableName, NULL);
@@ -1422,7 +1421,7 @@
 }
 
-static char *psDBGenerateUpdateRowSQL(const char *tableName,
-                                      const psMetadata *where,
-                                      const psMetadata *values)
+static psString psDBGenerateUpdateRowSQL(const char *tableName,
+        const psMetadata *where,
+        const psMetadata *values)
 {
     PS_ASSERT_PTR_NON_NULL(tableName, NULL);
@@ -1455,7 +1454,7 @@
 }
 
-static char *psDBGenerateDeleteRowSQL(const char *tableName,
-                                      const psMetadata *where,
-                                      unsigned long long limit)
+static psString psDBGenerateDeleteRowSQL(const char *tableName,
+        const psMetadata *where,
+        unsigned long long limit)
 {
     PS_ASSERT_PTR_NON_NULL(tableName, NULL);
@@ -1492,5 +1491,5 @@
 }
 
-char *psDBGenerateWhereSQL(const psMetadata *where, const char *tableName)
+psString psDBGenerateWhereSQL(const psMetadata *where, const char *tableName)
 {
     PS_ASSERT_PTR_NON_NULL(where, NULL);
@@ -1504,9 +1503,9 @@
 }
 
-char *psDBGenerateWhereConditionSQL(const psMetadata *where, const char *tableName)
+psString psDBGenerateWhereConditionSQL(const psMetadata *where, const char *tableName)
 {
     PS_ASSERT_PTR_NON_NULL(where, NULL);
 
-    char *query = NULL;
+    psString query = NULL;
 
     // we need to know if an item is 'MULTI' so we have to march through the
@@ -1540,5 +1539,5 @@
             psStringAppend(&query, "(");
             while ((mItem = psListGetAndIncrement(mCursor))) {
-                char *conditional = psDBGenerateConditionalSQL(mItem, tableName);
+                psString conditional = psDBGenerateConditionalSQL(mItem, tableName);
                 if (!conditional) {
                     psError(PS_ERR_UNKNOWN, false,
@@ -1564,5 +1563,5 @@
             psStringAppend(&query, ")");
         } else {
-            char *conditional = psDBGenerateConditionalSQL(item, tableName);
+            psString conditional = psDBGenerateConditionalSQL(item, tableName);
             if (!conditional) {
                 psError(PS_ERR_UNKNOWN, false,
@@ -1590,11 +1589,11 @@
 }
 
-static char *psDBGenerateSetSQL(const psMetadata *set
-                               )
+static psString psDBGenerateSetSQL(const psMetadata *set
+                                  )
 {
     PS_ASSERT_PTR_NON_NULL(set
                            , NULL);
 
-    char *query = psStringCopy("SET ");
+    psString query = psStringCopy("SET ");
 
     psListIterator *cursor = psListIteratorAlloc(set
@@ -1618,9 +1617,9 @@
 }
 
-static char *psDBGenerateConditionalSQL(const psMetadataItem *item, const char *tableName)
+static psString psDBGenerateConditionalSQL(const psMetadataItem *item, const char *tableName)
 {
     PS_ASSERT_PTR_NON_NULL(item, NULL);
 
-    char *query = NULL;
+    psString query = NULL;
 
     // stringify the psMetadataItem into a SQL search specification
@@ -1725,5 +1724,5 @@
 }
 
-static char *psDBPTypeToSQL(psElemType pType)
+static psString psDBPTypeToSQL(psElemType pType)
 {
     psHash          *pTypeToSQLTable;   // type lookup table
@@ -1986,6 +1985,6 @@
     PS_ASSERT_PTR_NON_NULL(lookupTable, );
 
-    char *key = psDBIntToString((psU64)type);
-    char *value = psStringCopy(string);
+    psString key = psDBIntToString((psU64)type);
+    psString value = psStringCopy(string);
 
     psHashAdd(lookupTable, key, value);
@@ -2001,5 +2000,5 @@
     PS_ASSERT_PTR_NON_NULL(lookupTable, );
 
-    char *key = psDBIntToString((psU64)type);
+    psString key = psDBIntToString((psU64)type);
 
     psHashAdd(lookupTable, key, value);
@@ -2124,5 +2123,4 @@
     return isNaN;
 }
-
 
 // string utility functions
@@ -2135,5 +2133,5 @@
     size_t length = n ? (size_t)log10((double)n) + 1 + 1
                     : 2;
-    char *string = psAlloc(length);
+    psString string = psStringAlloc(length);
     snprintf(string, length, "%li", (long int)n);
 
Index: trunk/psLib/src/db/psDB.h
===================================================================
--- trunk/psLib/src/db/psDB.h	(revision 9422)
+++ trunk/psLib/src/db/psDB.h	(revision 9538)
@@ -10,6 +10,6 @@
  *  @author Joshua Hoblitt
  *
- *  @version $Revision: 1.27 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-10-09 22:11:34 $
+ *  @version $Revision: 1.28 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-10-13 21:13:47 $
  *
  *  Copyright 2005 Joshua Hoblitt, University of Hawaii
@@ -381,5 +381,5 @@
  * @return psString:   A psString or NULL on failure
  */
-char    *psDBGenerateWhereSQL(
+psString psDBGenerateWhereSQL(
     const psMetadata *where,           ///< Row match criteria
     const char *tableName              ///< Table name
@@ -394,5 +394,5 @@
  * @return psString:   A psString or NULL on failure
  */
-char *psDBGenerateWhereConditionSQL(
+psString psDBGenerateWhereConditionSQL(
     const psMetadata *where,           ///< Row match criteria
     const char *tableName              ///< Table name