Index: trunk/psLib/src/db/psDB.c
===================================================================
--- trunk/psLib/src/db/psDB.c	(revision 8116)
+++ trunk/psLib/src/db/psDB.c	(revision 8232)
@@ -12,6 +12,6 @@
  *  @author Joshua Hoblitt
  *
- *  @version $Revision: 1.77 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-08-04 03:50:56 $
+ *  @version $Revision: 1.78 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-08-08 23:32:22 $
  *
  *  Copyright (C) 2005-2006  Joshua Hoblitt, University of Hawaii
@@ -37,5 +37,5 @@
 #include "psError.h"
 #include "psString.h"
-#include "psErrorText.h"
+
 
 // set the pointer to NULL if we are actually freeing the memory
@@ -142,5 +142,5 @@
     if (!mysql_real_connect(mysql, host, user, passwd, dbname, 0, NULL, 0)) {
         psError(PS_ERR_BAD_PARAMETER_TYPE, true,
-                PS_ERRORTEXT_psDB_FAILED_TO_CONNECT,mysql_error(mysql));
+                _("Failed to connect to database.  Error: %s"),mysql_error(mysql));
 
         mysql_close(mysql);
@@ -247,5 +247,5 @@
     // Attempt to select new database
     if (mysql_select_db(dbh->mysql, dbname) != 0) {
-        psError(PS_ERR_UNKNOWN, true, PS_ERRORTEXT_psDB_FAILED_TO_CHANGE,
+        psError(PS_ERR_UNKNOWN, true, _("Failed to change database.  Error: %s"),
                 mysql_error(dbh->mysql));
 
@@ -287,5 +287,5 @@
     char *query = psDBGenerateCreateTableSQL(tableName, md);
     if (!query) {
-        psError(PS_ERR_UNEXPECTED_NULL, false, PS_ERRORTEXT_psDB_QUERY_GEN_FAIL);
+        psError(PS_ERR_UNEXPECTED_NULL, false, _("Query generation failed."));
         return false;
     }
@@ -294,5 +294,5 @@
     bool status = p_psDBRunQuery(dbh, query);
     if (!status) {
-        psError(PS_ERR_UNKNOWN, false, PS_ERRORTEXT_psDB_TABLE_CREATE_FAIL);
+        psError(PS_ERR_UNKNOWN, false, _("Failed to create table."));
     }
 
@@ -315,5 +315,5 @@
     bool status = p_psDBRunQuery(dbh, query);
     if (!status) {
-        psError(PS_ERR_UNKNOWN, false, PS_ERRORTEXT_psDB_TABLE_DROP_FAIL);
+        psError(PS_ERR_UNKNOWN, false, _("Failed to drop table."));
     }
 
@@ -343,5 +343,5 @@
     char *query = psDBGenerateSelectRowSQL(tableName, col, NULL, limit);
     if (!query) {
-        psError(PS_ERR_UNEXPECTED_NULL, false, PS_ERRORTEXT_psDB_QUERY_GEN_FAIL);
+        psError(PS_ERR_UNEXPECTED_NULL, false, _("Query generation failed."));
         return NULL;
     }
@@ -349,5 +349,5 @@
     // Execut SQL query string
     if (!p_psDBRunQuery(dbh, query)) {
-        psError(PS_ERR_UNKNOWN, false, PS_ERRORTEXT_psDB_SEL_COL_FAIL);
+        psError(PS_ERR_UNKNOWN, false, _("Failed to select column."));
         psFree(query);
         return NULL;
@@ -365,5 +365,5 @@
         // then something bad has happened.
         if (fieldCount != 0) {
-            psError(PS_ERR_UNEXPECTED_NULL, true, PS_ERRORTEXT_psDB_QUERY_NO_DATA,
+            psError(PS_ERR_UNEXPECTED_NULL, true, _("Query returned no data.  Error: %s"),
                     mysql_error(dbh->mysql));
             return NULL;
@@ -561,5 +561,5 @@
     // Execute function to insert rows
     if (!psDBInsertRows(dbh, tableName, rowSet)) {
-        psError(PS_ERR_UNKNOWN, false, PS_ERRORTEXT_psDB_INSERT_ROW_FAIL);
+        psError(PS_ERR_UNKNOWN, false, _("Failed to insert row."));
         psFree(rowSet);
         return false;
@@ -586,5 +586,5 @@
     char *query = psDBGenerateInsertRowSQL(tableName, row);
     if (!query) {
-        psError(PS_ERR_UNEXPECTED_NULL, false, PS_ERRORTEXT_psDB_QUERY_GEN_FAIL);
+        psError(PS_ERR_UNEXPECTED_NULL, false, _("Query generation failed."));
         return false;
     }
@@ -675,5 +675,5 @@
     char *query = psDBGenerateUpdateRowSQL(tableName, where, values);
     if (!query) {
-        psError(PS_ERR_UNEXPECTED_NULL, false, PS_ERRORTEXT_psDB_QUERY_GEN_FAIL);
+        psError(PS_ERR_UNEXPECTED_NULL, false, _("Query generation failed."));
         return -1;
     }
@@ -801,7 +801,7 @@
                 "You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'null) WHERE' at line 1", 165);
         if ( !strncmp(mysql_error(dbh->mysql), mysqlTemp, 145) ) {
-            psError(PS_ERR_UNKNOWN, true, PS_ERRORTEXT_psDB_SQL_QUERY_FAIL, mysqlTemp);
+            psError(PS_ERR_UNKNOWN, true, _("Failed to execute SQL query.  Error: %s"), mysqlTemp);
         } else {
-            psError(PS_ERR_UNKNOWN, true, PS_ERRORTEXT_psDB_SQL_QUERY_FAIL, mysql_error(dbh->mysql));
+            psError(PS_ERR_UNKNOWN, true, _("Failed to execute SQL query.  Error: %s"), mysql_error(dbh->mysql));
         }
         psFree(query);
@@ -1405,5 +1405,5 @@
     setSQL = psDBGenerateSetSQL(values);
     if (!setSQL) {
-        psError(PS_ERR_UNEXPECTED_NULL, false, PS_ERRORTEXT_psDB_SQL_SUBSTR_FAIL);
+        psError(PS_ERR_UNEXPECTED_NULL, false, _("SQL substring generation failed."));
         return NULL;
     }
@@ -1412,5 +1412,5 @@
     whereSQL = psDBGenerateWhereSQL(where);
     if (!whereSQL) {
-        psError(PS_ERR_UNEXPECTED_NULL, false, PS_ERRORTEXT_psDB_SQL_SUBSTR_FAIL);
+        psError(PS_ERR_UNEXPECTED_NULL, false, _("SQL substring generation failed."));
         return NULL;
     }
@@ -1443,5 +1443,5 @@
     whereSQL = psDBGenerateWhereSQL(where);
     if (!whereSQL) {
-        psError(PS_ERR_UNEXPECTED_NULL, false, PS_ERRORTEXT_psDB_SQL_SUBSTR_FAIL);
+        psError(PS_ERR_UNEXPECTED_NULL, false, _("SQL substring generation failed."));
         return NULL;
     }