Index: trunk/psLib/src/fits/psFitsTable.c
===================================================================
--- trunk/psLib/src/fits/psFitsTable.c	(revision 7984)
+++ trunk/psLib/src/fits/psFitsTable.c	(revision 8232)
@@ -7,6 +7,6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.18 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-07-26 03:37:57 $
+ *  @version $Revision: 1.19 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-08-08 23:32:23 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -17,5 +17,5 @@
 #include "string.h"
 #include "psError.h"
-#include "psErrorText.h"
+
 #include "psImageStructManip.h"
 #include "psMemory.h"
@@ -41,5 +41,5 @@
     if (fits == NULL) {
         psError(PS_ERR_BAD_PARAMETER_NULL, true,
-                PS_ERRORTEXT_psFits_NULL);
+                _("The input psFits object can not NULL."));
         return NULL;
     }
@@ -52,5 +52,5 @@
         (void)fits_get_errstatus(status, fitsErr);
         psError(PS_ERR_IO, true,
-                PS_ERRORTEXT_psFits_GET_HDU_TYPE_FAILED,
+                _("Could not determine the HDU type. CFITSIO Error: %s"),
                 fitsErr);
         return NULL;
@@ -58,5 +58,5 @@
     if (hdutype != ASCII_TBL && hdutype != BINARY_TBL) {
         psError(PS_ERR_IO, true,
-                PS_ERRORTEXT_psFits_NOT_TABLE_TYPE);
+                _("Current FITS HDU type must be a table."));
         return NULL;
     }
@@ -69,5 +69,5 @@
         (void)fits_get_errstatus(status, fitsErr);
         psError(PS_ERR_IO, true,
-                PS_ERRORTEXT_psFits_GET_TABLE_SIZE_FAILED,
+                _("Failed to determine the size of the current HDU table. CFITSIO Error: %s"),
                 fitsErr);
         return NULL;
@@ -78,5 +78,5 @@
     if (row < 0 || row >= numRows) {
         psError(PS_ERR_BAD_PARAMETER_VALUE, true,
-                PS_ERRORTEXT_psFits_ROW_INVALID,
+                _("Specified row, %d, is not valid for current table of %d rows."),
                 row,numRows);
         return NULL;
@@ -168,5 +168,5 @@
             (void)fits_get_errstatus(status, fitsErr);
             psError(PS_ERR_IO, true,
-                    PS_ERRORTEXT_psFits_GET_TABLE_ELEMENT,
+                    _("Failed to retrieve table element (%d,%d). CFITSIO Error: %s"),
                     col,row,fitsErr);
             psFree(data);
@@ -187,5 +187,5 @@
     if (fits == NULL) {
         psError(PS_ERR_BAD_PARAMETER_NULL, true,
-                PS_ERRORTEXT_psFits_NULL);
+                _("The input psFits object can not NULL."));
         return NULL;
     }
@@ -197,5 +197,5 @@
         (void)fits_get_errstatus(status, fitsErr);
         psError(PS_ERR_IO, true,
-                PS_ERRORTEXT_psFits_GET_HDU_TYPE_FAILED,
+                _("Could not determine the HDU type. CFITSIO Error: %s"),
                 fitsErr);
         return NULL;
@@ -203,5 +203,5 @@
     if (hdutype != ASCII_TBL && hdutype != BINARY_TBL) {
         psError(PS_ERR_IO, true,
-                PS_ERRORTEXT_psFits_NOT_TABLE_TYPE);
+                _("Current FITS HDU type must be a table."));
         return NULL;
     }
@@ -212,5 +212,5 @@
         (void)fits_get_errstatus(status, fitsErr);
         psError(PS_ERR_IO, true,
-                PS_ERRORTEXT_psFits_FIND_COLUMN,
+                _("Specified column, %s, was not found. CFITSIO Error: %s"),
                 colname, fitsErr);
         return NULL;
@@ -227,5 +227,5 @@
         (void)fits_get_errstatus(status, fitsErr);
         psError(PS_ERR_IO, true,
-                PS_ERRORTEXT_psFits_GET_COLTYPE,
+                _("Could not determine the datatype of the table column. CFITSIO Error: %s"),
                 fitsErr);
         return NULL;
@@ -253,5 +253,5 @@
         (void)fits_get_errstatus(status, fitsErr);
         psError(PS_ERR_IO, true,
-                PS_ERRORTEXT_psFits_TABLE_READ_COL,
+                _("Failed to read table column. CFITSIO Error: %s"),
                 fitsErr);
         return NULL;
@@ -269,5 +269,5 @@
     if (fits == NULL) {
         psError(PS_ERR_BAD_PARAMETER_NULL, true,
-                PS_ERRORTEXT_psFits_NULL);
+                _("The input psFits object can not NULL."));
         return NULL;
     }
@@ -279,5 +279,5 @@
         (void)fits_get_errstatus(status, fitsErr);
         psError(PS_ERR_IO, true,
-                PS_ERRORTEXT_psFits_GET_HDU_TYPE_FAILED,
+                _("Could not determine the HDU type. CFITSIO Error: %s"),
                 fitsErr);
         return NULL;
@@ -285,5 +285,5 @@
     if (hdutype != ASCII_TBL && hdutype != BINARY_TBL) {
         psError(PS_ERR_IO, true,
-                PS_ERRORTEXT_psFits_NOT_TABLE_TYPE);
+                _("Current FITS HDU type must be a table."));
         return NULL;
     }
@@ -294,5 +294,5 @@
         (void)fits_get_errstatus(status, fitsErr);
         psError(PS_ERR_IO, true,
-                PS_ERRORTEXT_psFits_FIND_COLUMN,
+                _("Specified column, %s, was not found. CFITSIO Error: %s"),
                 colname, fitsErr);
         return NULL;
@@ -313,5 +313,5 @@
         (void)fits_get_errstatus(status, fitsErr);
         psError(PS_ERR_IO, true,
-                PS_ERRORTEXT_psFits_GET_COLTYPE,
+                _("Could not determine the datatype of the table column. CFITSIO Error: %s"),
                 fitsErr);
         return NULL;
@@ -336,5 +336,5 @@
         (void)fits_get_errstatus(status, fitsErr);
         psError(PS_ERR_IO, true,
-                PS_ERRORTEXT_psFits_TABLE_READ_COL,
+                _("Failed to read table column. CFITSIO Error: %s"),
                 fitsErr);
         return NULL;
@@ -351,5 +351,5 @@
     if (fits == NULL) {
         psError(PS_ERR_BAD_PARAMETER_NULL, true,
-                PS_ERRORTEXT_psFits_NULL);
+                _("The input psFits object can not NULL."));
         return NULL;
     }
@@ -361,5 +361,5 @@
         (void)fits_get_errstatus(status, fitsErr);
         psError(PS_ERR_IO, true,
-                PS_ERRORTEXT_psFits_GET_HDU_TYPE_FAILED,
+                _("Could not determine the HDU type. CFITSIO Error: %s"),
                 fitsErr);
         return NULL;
@@ -367,5 +367,5 @@
     if (hdutype != ASCII_TBL && hdutype != BINARY_TBL) {
         psError(PS_ERR_IO, true,
-                PS_ERRORTEXT_psFits_NOT_TABLE_TYPE);
+                _("Current FITS HDU type must be a table."));
         return NULL;
     }
@@ -378,5 +378,5 @@
         (void)fits_get_errstatus(status, fitsErr);
         psError(PS_ERR_IO, true,
-                PS_ERRORTEXT_psFits_GET_TABLE_SIZE_FAILED,
+                _("Failed to determine the size of the current HDU table. CFITSIO Error: %s"),
                 fitsErr);
         return NULL;
@@ -488,5 +488,5 @@
         // no table data, what can I do?
         psError(PS_ERR_BAD_PARAMETER_SIZE, true,
-                PS_ERRORTEXT_psFits_TABLE_EMPTY);
+                _("Can't create a table without any rows."));
         return false;
     }
@@ -731,5 +731,5 @@
     if (fits == NULL) {
         psError(PS_ERR_BAD_PARAMETER_NULL, true,
-                PS_ERRORTEXT_psFits_NULL);
+                _("The input psFits object can not NULL."));
         return false;
     }
@@ -737,5 +737,5 @@
     if (data == NULL) {
         psError(PS_ERR_BAD_PARAMETER_NULL, true,
-                PS_ERRORTEXT_psFits_IMAGE_NULL);
+                _("The input psImage was NULL.  Need a non-NULL psImage for operation to be performed."));
         return false;
     }
@@ -747,5 +747,5 @@
         (void)fits_get_errstatus(status, fitsErr);
         psError(PS_ERR_IO, true,
-                PS_ERRORTEXT_psFits_GET_HDU_TYPE_FAILED,
+                _("Could not determine the HDU type. CFITSIO Error: %s"),
                 fitsErr);
         return false;
@@ -753,5 +753,5 @@
     if (hdutype != ASCII_TBL && hdutype != BINARY_TBL) {
         psError(PS_ERR_IO, true,
-                PS_ERRORTEXT_psFits_NOT_TABLE_TYPE);
+                _("Current FITS HDU type must be a table."));
         return false;
     }
@@ -777,5 +777,5 @@
                     (void)fits_get_errstatus(status, fitsErr);
                     psError(PS_ERR_IO, true,
-                            PS_ERRORTEXT_psFits_WRITE_FAILED,
+                            _("Could not write data to file. CFITSIO Error: %s"),
                             fitsErr);
                     psFree(iter);