Index: trunk/psLib/src/.cvsignore =================================================================== --- trunk/psLib/src/.cvsignore (revision 8231) +++ trunk/psLib/src/.cvsignore (revision 8232) @@ -10,5 +10,4 @@ libpslib.la.temp config.h.in -psErrorText.h *.bb *.bbg Index: trunk/psLib/src/Makefile.am =================================================================== --- trunk/psLib/src/Makefile.am (revision 8231) +++ trunk/psLib/src/Makefile.am (revision 8232) @@ -11,9 +11,5 @@ -EXTRA_DIST = mainpage.dox psErrorCodes_en.dat psTest.h psErrorText.h.in psErrorText_en.dat - -BUILT_SOURCES = psErrorText.h -psErrorText.h: psErrorText_$(PS_LANG).dat - $(top_srcdir)/psParseErrorCodes --data=$? $(srcdir)/psErrorText.h +EXTRA_DIST = mainpage.dox psErrorCodes_en.dat psTest.h pslibincludedir = $(includedir) @@ -21,6 +17,5 @@ psTest.h \ pslib.h \ - pslib_strict.h \ - psErrorText.h + pslib_strict.h install-exec-local: libpslib.la Index: trunk/psLib/src/astro/psCoord.c =================================================================== --- trunk/psLib/src/astro/psCoord.c (revision 8231) +++ trunk/psLib/src/astro/psCoord.c (revision 8232) @@ -10,6 +10,6 @@ * @author GLG, MHPCC * -* @version $Revision: 1.121 $ $Name: not supported by cvs2svn $ -* @date $Date: 2006-07-15 02:57:12 $ +* @version $Revision: 1.122 $ $Name: not supported by cvs2svn $ +* @date $Date: 2006-08-08 23:32:22 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -26,5 +26,5 @@ #include "psLogMsg.h" #include "psTrace.h" -#include "psErrorText.h" + #include "psMatrix.h" #include "psMinimizePolyFit.h" @@ -435,5 +435,5 @@ default: psError(PS_ERR_BAD_PARAMETER_TYPE, true, - PS_ERRORTEXT_psCoord_PROJECTION_TYPE_UNKNOWN, + _("The projection type, %d, is unknown."), projection->type); psFree(out); @@ -537,5 +537,5 @@ default: psError(PS_ERR_BAD_PARAMETER_TYPE, true, - PS_ERRORTEXT_psCoord_PROJECTION_TYPE_UNKNOWN, + _("The projection type, %d, is unknown."), projection->type); psFree(out); Index: trunk/psLib/src/astro/psEarthOrientation.c =================================================================== --- trunk/psLib/src/astro/psEarthOrientation.c (revision 8231) +++ trunk/psLib/src/astro/psEarthOrientation.c (revision 8232) @@ -8,6 +8,6 @@ * @author Robert Daniel DeSonia, MHPCC * - * @version $Revision: 1.37 $ $Name: not supported by cvs2svn $ - * @date $Date: 2006-06-30 02:20:06 $ + * @version $Revision: 1.38 $ $Name: not supported by cvs2svn $ + * @date $Date: 2006-08-08 23:32:22 $ * * Copyright 2005 Maui High Performance Computing Center, University of Hawaii @@ -24,5 +24,5 @@ #include "psMetadataConfig.h" #include "psError.h" -#include "psErrorText.h" + #include "psMemory.h" #include "psCoord.h" @@ -103,5 +103,5 @@ "psLib.eoc.precession.table.format"); if(! success || tableFormat == NULL) { - psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psTime_LOOKUP_METADATA_FAILED, + psError(PS_ERR_BAD_PARAMETER_VALUE, true, _("Failed find '%s' in time metadata."), "psLib.eoc.precession.table.format"); return false; @@ -112,5 +112,5 @@ if(! success || xTableName == NULL) { psFree(tableFormat); - psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psTime_LOOKUP_METADATA_FAILED, + psError(PS_ERR_BAD_PARAMETER_VALUE, true, _("Failed find '%s' in time metadata."), "psLib.eoc.precession.x.file"); return false; @@ -122,5 +122,5 @@ psFree(tableFormat); psFree(xTableName); - psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psTime_LOOKUP_METADATA_FAILED, + psError(PS_ERR_BAD_PARAMETER_VALUE, true, _("Failed find '%s' in time metadata."), "psLib.eoc.precession.y.file"); return false; @@ -133,5 +133,5 @@ psFree(xTableName); psFree(yTableName); - psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psTime_LOOKUP_METADATA_FAILED, + psError(PS_ERR_BAD_PARAMETER_VALUE, true, _("Failed find '%s' in time metadata."), "psLib.eoc.precession.s.file"); return false; @@ -145,5 +145,5 @@ psFree(yTableName); psFree(sTableName); - psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psTime_LOOKUP_METADATA_FAILED, + psError(PS_ERR_BAD_PARAMETER_VALUE, true, _("Failed find '%s' in time metadata."), "psLib.eoc.precession.iers.file"); return false; @@ -158,5 +158,5 @@ psFree(sTableName); psFree(iersTableName); - psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psTime_LOOKUP_METADATA_FAILED, + psError(PS_ERR_BAD_PARAMETER_VALUE, true, _("Failed find '%s' in time metadata."), "psLib.eoc.precession.finals.file"); return false; @@ -172,5 +172,5 @@ psFree(iersTableName); psFree(finalsTableName); - psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psTime_LOOKUP_METADATA_FAILED, + psError(PS_ERR_BAD_PARAMETER_VALUE, true, _("Failed find '%s' in time metadata."), "psLib.eoc.precession.iers.table.format"); return false; @@ -187,5 +187,5 @@ psFree(finalsTableName); psFree(iersTableFormat); - psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psTime_LOOKUP_METADATA_FAILED, + psError(PS_ERR_BAD_PARAMETER_VALUE, true, _("Failed find '%s' in time metadata."), "psLib.eoc.precession.iers.table.format"); return false; @@ -214,5 +214,5 @@ psVector* xCoeff = psMetadataLookupPtr(&success, eocMetadata, "psLib.eoc.precession.poly.x"); if(! success || xCoeff == NULL || xCoeff->type.type != PS_TYPE_F64) { - psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psTime_LOOKUP_METADATA_FAILED, + psError(PS_ERR_BAD_PARAMETER_VALUE, true, _("Failed find '%s' in time metadata."), "psLib.eoc.precession.poly.x"); return false; @@ -221,5 +221,5 @@ if(! success || yCoeff == NULL || yCoeff->type.type != PS_TYPE_F64) { psFree(xCoeff); - psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psTime_LOOKUP_METADATA_FAILED, + psError(PS_ERR_BAD_PARAMETER_VALUE, true, _("Failed find '%s' in time metadata."), "psLib.eoc.precession.poly.y"); return false; @@ -229,5 +229,5 @@ psFree(xCoeff); psFree(yCoeff); - psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psTime_LOOKUP_METADATA_FAILED, + psError(PS_ERR_BAD_PARAMETER_VALUE, true, _("Failed find '%s' in time metadata."), "psLib.eoc.precession.poly.s"); return false; Index: trunk/psLib/src/astro/psSphereOps.c =================================================================== --- trunk/psLib/src/astro/psSphereOps.c (revision 8231) +++ trunk/psLib/src/astro/psSphereOps.c (revision 8232) @@ -8,6 +8,6 @@ * @author Dave Robbins, MHPCC * - * @version $Revision: 1.14 $ $Name: not supported by cvs2svn $ - * @date $Date: 2006-07-15 02:57:12 $ + * @version $Revision: 1.15 $ $Name: not supported by cvs2svn $ + * @date $Date: 2006-08-08 23:32:22 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -25,5 +25,5 @@ #include "psError.h" #include "psLogMsg.h" -#include "psErrorText.h" + @@ -225,5 +225,5 @@ // Check the specified MJD is greater than 1900 if ( MJD < MJD_1900 ) { - psError(PS_ERR_BAD_PARAMETER_TYPE,true,PS_ERRORTEXT_psCoord_INVALID_MJD); + psError(PS_ERR_BAD_PARAMETER_TYPE,true,_("Specified time is less than 1900.")); return NULL; } @@ -252,5 +252,5 @@ // Check the specified MJD is greater than 1900 if ( MJD < MJD_1900 ) { - psError(PS_ERR_BAD_PARAMETER_TYPE,true,PS_ERRORTEXT_psCoord_INVALID_MJD); + psError(PS_ERR_BAD_PARAMETER_TYPE,true,_("Specified time is less than 1900.")); return NULL; } @@ -361,5 +361,5 @@ else { psError(PS_ERR_BAD_PARAMETER_VALUE, true, - PS_ERRORTEXT_psCoord_UNITS_UNKNOWN, + _("Specified units, 0x%x, is not supported."), unit); psFree(tmp); @@ -370,5 +370,5 @@ } else { psError(PS_ERR_BAD_PARAMETER_VALUE, true, - PS_ERRORTEXT_psCoord_OFFSET_MODE_UNKNOWN, + _("Specified offset mode, 0x%x, is not supported."), mode); psFree(tmp); @@ -432,5 +432,5 @@ } else { psError(PS_ERR_BAD_PARAMETER_VALUE, true, - PS_ERRORTEXT_psCoord_UNITS_UNKNOWN, + _("Specified units, 0x%x, is not supported."), unit); return NULL; @@ -451,5 +451,5 @@ } else { psError(PS_ERR_BAD_PARAMETER_VALUE, true, - PS_ERRORTEXT_psCoord_OFFSET_MODE_UNKNOWN, + _("Specified offset mode, 0x%x, is not supported."), mode); return NULL; Index: trunk/psLib/src/astro/psTime.c =================================================================== --- trunk/psLib/src/astro/psTime.c (revision 8231) +++ trunk/psLib/src/astro/psTime.c (revision 8232) @@ -10,6 +10,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.92 $ $Name: not supported by cvs2svn $ - * @date $Date: 2006-07-25 01:16:04 $ + * @version $Revision: 1.93 $ $Name: not supported by cvs2svn $ + * @date $Date: 2006-08-08 23:32:22 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -33,5 +33,5 @@ #include "psLookupTable.h" #include "psAssert.h" -#include "psErrorText.h" + #include "config.h" @@ -205,5 +205,5 @@ // Check if table not a metadata item if(tableMetadataItem == NULL) { - psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psTime_LOOKUP_METADATA_FAILED, + psError(PS_ERR_BAD_PARAMETER_VALUE, true, _("Failed find '%s' in time metadata."), tableName); *status = PS_LOOKUP_ERROR; @@ -282,5 +282,5 @@ if(metadataItem == NULL) { p_psMemAllocatePersistent(initialPersistence); - psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psTime_LOOKUP_METADATA_FAILED, + psError(PS_ERR_BAD_PARAMETER_VALUE, true, _("Failed find '%s' in time metadata."), "psLib.time.tables.n"); return false; @@ -292,5 +292,5 @@ if(metadataItem == NULL) { p_psMemAllocatePersistent(initialPersistence); - psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psTime_LOOKUP_METADATA_FAILED, + psError(PS_ERR_BAD_PARAMETER_VALUE, true, _("Failed find '%s' in time metadata."), "psLib.time.tables.from"); return false; @@ -299,5 +299,5 @@ if(tablesFrom->n != numTables) { p_psMemAllocatePersistent(initialPersistence); - psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psTime_BAD_VECTOR, tablesFrom->n, numTables); + psError(PS_ERR_BAD_PARAMETER_VALUE, true, _("Incorrect vector size. Size: %d, Expected %d."), tablesFrom->n, numTables); psFree(tablesFrom); return false; @@ -308,5 +308,5 @@ if(metadataItem == NULL) { p_psMemAllocatePersistent(initialPersistence); - psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psTime_LOOKUP_METADATA_FAILED, + psError(PS_ERR_BAD_PARAMETER_VALUE, true, _("Failed find '%s' in time metadata."), "psLib.time.tables.to"); psFree(tablesFrom); @@ -316,5 +316,5 @@ if(tablesTo->n != numTables) { p_psMemAllocatePersistent(initialPersistence); - psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psTime_BAD_VECTOR, tablesTo->n, numTables); + psError(PS_ERR_BAD_PARAMETER_VALUE, true, _("Incorrect vector size. Size: %d, Expected %d."), tablesTo->n, numTables); psFree(tablesFrom); psFree(tablesTo); @@ -326,5 +326,5 @@ if(metadataItem == NULL) { p_psMemAllocatePersistent(initialPersistence); - psError(PS_ERR_BAD_PARAMETER_VALUE,true,PS_ERRORTEXT_psTime_LOOKUP_METADATA_FAILED, + psError(PS_ERR_BAD_PARAMETER_VALUE,true,_("Failed find '%s' in time metadata."), "psLib.time.tables.index"); psFree(tablesFrom); @@ -335,5 +335,5 @@ if(tablesIndex->n != numTables) { p_psMemAllocatePersistent(initialPersistence); - psError(PS_ERR_BAD_PARAMETER_VALUE,true,PS_ERRORTEXT_psTime_BAD_VECTOR,tablesIndex->n,numTables); + psError(PS_ERR_BAD_PARAMETER_VALUE,true,_("Incorrect vector size. Size: %d, Expected %d."),tablesIndex->n,numTables); psFree(tablesFrom); psFree(tablesTo); @@ -346,5 +346,5 @@ if(metadataItem == NULL) { p_psMemAllocatePersistent(initialPersistence); - psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psTime_LOOKUP_METADATA_FAILED, + psError(PS_ERR_BAD_PARAMETER_VALUE, true, _("Failed find '%s' in time metadata."), "psLib.time.tables.dir"); psFree(tablesFrom); @@ -359,5 +359,5 @@ if(metadataItem == NULL) { p_psMemAllocatePersistent(initialPersistence); - psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psTime_LOOKUP_METADATA_FAILED, + psError(PS_ERR_BAD_PARAMETER_VALUE, true, _("Failed find '%s' in time metadata."), "psLib.time.tables.files"); @@ -374,5 +374,5 @@ if(metadataItem == NULL) { p_psMemAllocatePersistent(initialPersistence); - psError(PS_ERR_BAD_PARAMETER_VALUE,true, PS_ERRORTEXT_psTime_LOOKUP_METADATA_FAILED, + psError(PS_ERR_BAD_PARAMETER_VALUE,true, _("Failed find '%s' in time metadata."), "psLib.time.tables.format"); psFree(tablesFrom); @@ -404,5 +404,5 @@ tableFormat = getToken(&formatPtr,",",&status); if(tableFormat == NULL) { - psError(PS_ERR_BAD_PARAMETER_VALUE,no_problem,PS_ERRORTEXT_psTime_LOOKUP_METADATA_FAILED, + psError(PS_ERR_BAD_PARAMETER_VALUE,no_problem,_("Failed find '%s' in time metadata."), "psLib.time.tables.format"); no_problem = false; @@ -415,5 +415,5 @@ } else { psError(PS_ERR_BAD_PARAMETER_VALUE, no_problem, - PS_ERRORTEXT_psTime_BAD_TABLE_COUNT, i+1, numTables); + _("Incorrect number of table files entered. Found: %d. Expected: %d."), i+1, numTables); no_problem = false; } @@ -429,5 +429,5 @@ } else if(foundTable==false && j==numTables-1) { psError(PS_ERR_BAD_PARAMETER_VALUE, no_problem, - PS_ERRORTEXT_psTime_BAD_TABLE_COUNT, j, numTables); + _("Incorrect number of table files entered. Found: %d. Expected: %d."), j, numTables); no_problem = false; } @@ -444,5 +444,5 @@ if(numTables != i) { - psError(PS_ERR_BAD_PARAMETER_VALUE, no_problem, PS_ERRORTEXT_psTime_BAD_TABLE_COUNT, i, numTables); + psError(PS_ERR_BAD_PARAMETER_VALUE, no_problem, _("Incorrect number of table files entered. Found: %d. Expected: %d."), i, numTables); } @@ -480,5 +480,5 @@ type!=PS_TIME_TT) { psError(PS_ERR_BAD_PARAMETER_VALUE, true, - PS_ERRORTEXT_psTime_TYPE_UNKNOWN, + _("Specified type, %d, is not supported."), type); return NULL; @@ -521,5 +521,5 @@ if (gettimeofday(&now, 0) == -1) { psError(PS_ERR_OS_CALL_FAILED, true, - PS_ERRORTEXT_psTime_GET_TOD_FAILED); + _("Failed to determine the current time from gettimeofday function.")); return NULL; } @@ -728,5 +728,5 @@ // Convert from TAI to unknown time type } else { - psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psTime_TYPE_UNKNOWN, type); + psError(PS_ERR_BAD_PARAMETER_VALUE, true, _("Specified type, %d, is not supported."), type); return NULL; } @@ -753,5 +753,5 @@ // Convert from TT to unknown time type } else { - psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psTime_TYPE_UNKNOWN, type); + psError(PS_ERR_BAD_PARAMETER_VALUE, true, _("Specified type, %d, is not supported."), type); return NULL; } @@ -772,10 +772,10 @@ // Convert UTC to unknown time type } else { - psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psTime_TYPE_UNKNOWN, type); + psError(PS_ERR_BAD_PARAMETER_VALUE, true, _("Specified type, %d, is not supported."), type); return NULL; } // Convert unknown time type } else { - psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psTime_TYPE_UNKNOWN, time->type); + psError(PS_ERR_BAD_PARAMETER_VALUE, true, _("Specified type, %d, is not supported."), time->type); return NULL; } @@ -810,5 +810,5 @@ // Verify input time is not in UT1 seconds if(time->type == PS_TIME_UT1) { - psError(PS_ERR_BAD_PARAMETER_VALUE,true,PS_ERRORTEXT_psTime_TYPE_INCORRECT,time->type); + psError(PS_ERR_BAD_PARAMETER_VALUE,true,_("Specified type, %d, is incorrect."),time->type); return NAN; } @@ -897,10 +897,10 @@ // Date too early for tables. Get default time delta value from metadata, and issue warning. - psLogMsg(__func__,PS_LOG_WARN,PS_ERRORTEXT_psTime_TIME_PREDATES_TABLES,mjd,"UT1-UTC"); + psLogMsg(__func__,PS_LOG_WARN,_("Specified psTime predates (%g) all tables of %s information."),mjd,"UT1-UTC"); // Lookup value from time metadata loaded from pslib.config tableMetadataItem = psMetadataLookup(timeMetadata, "psLib.time.before.dut"); if(tableMetadataItem == NULL) { - psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psTime_LOOKUP_METADATA_FAILED, + psError(PS_ERR_BAD_PARAMETER_VALUE, true, _("Failed find '%s' in time metadata."), "psLib.time.before.dut"); return NAN; @@ -917,10 +917,10 @@ */ // Generate warning of postdate information - psLogMsg(__func__,PS_LOG_WARN,PS_ERRORTEXT_psTime_TIME_POSTDATES_TABLES, mjd, "UT1-UTC"); + psLogMsg(__func__,PS_LOG_WARN,_("Specified psTime postdates (%g) all tables of %s information."), mjd, "UT1-UTC"); // Lookup values to calculate prediction tableMetadataItem = psMetadataLookup(timeMetadata, "psLib.time.predict.dut"); if(tableMetadataItem == NULL) { - psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psTime_LOOKUP_METADATA_FAILED, + psError(PS_ERR_BAD_PARAMETER_VALUE, true, _("Failed find '%s' in time metadata."), "psLib.time.predict.dut"); return NAN; @@ -935,5 +935,5 @@ } else if(status != PS_LOOKUP_SUCCESS) { - psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psTime_INTERPOLATION_FAILED); + psError(PS_ERR_BAD_PARAMETER_VALUE, true, _("Failed time table interpolation.")); return NAN; } @@ -1059,5 +1059,5 @@ if(time->type != PS_TIME_TAI) { - psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psTime_TYPE_INCORRECT, time->type); + psError(PS_ERR_BAD_PARAMETER_VALUE, true, _("Specified type, %d, is incorrect."), time->type); return NULL; } @@ -1075,9 +1075,9 @@ // Date too earlier for tables. Get default polar coodinate values from metadata, and issue warning. #if 0 - psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psTime_TIME_PREDATES_TABLES, mjd, "polar motion"); + psError(PS_ERR_BAD_PARAMETER_VALUE, true, _("Specified psTime predates (%g) all tables of %s information."), mjd, "polar motion"); return NULL; #else - psLogMsg(PS_FILE_LINE, PS_LOG_ERROR, PS_ERRORTEXT_psTime_TIME_PREDATES_TABLES, mjd, "polar motion"); + psLogMsg(PS_FILE_LINE, PS_LOG_ERROR, _("Specified psTime predates (%g) all tables of %s information."), mjd, "polar motion"); #endif @@ -1085,5 +1085,5 @@ if(tableMetadataItem == NULL) { psError(PS_ERR_BAD_PARAMETER_VALUE, true, - PS_ERRORTEXT_psTime_LOOKUP_METADATA_FAILED, "psLib.time.before.xp"); + _("Failed find '%s' in time metadata."), "psLib.time.before.xp"); return NULL; } @@ -1092,5 +1092,5 @@ tableMetadataItem = psMetadataLookup(timeMetadata, "psLib.time.before.yp"); if(tableMetadataItem == NULL) { - psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psTime_LOOKUP_METADATA_FAILED, "psLib.time.before.yp"); + psError(PS_ERR_BAD_PARAMETER_VALUE, true, _("Failed find '%s' in time metadata."), "psLib.time.before.yp"); return NULL; } @@ -1110,10 +1110,10 @@ #if 0 psError(PS_ERR_BAD_PARAMETER_VALUE, true, - PS_ERRORTEXT_psTime_TIME_POSTDATES_TABLES, mjd, "polar motion"); + _("Specified psTime postdates (%g) all tables of %s information."), mjd, "polar motion"); return NULL; #else psLogMsg(PS_FILE_LINE, PS_LOG_ERROR, - PS_ERRORTEXT_psTime_TIME_POSTDATES_TABLES, mjd, "polar motion"); + _("Specified psTime postdates (%g) all tables of %s information."), mjd, "polar motion"); #endif @@ -1121,5 +1121,5 @@ tableMetadataItem = psMetadataLookup(timeMetadata, "psLib.time.predict.mjd"); if(tableMetadataItem == NULL) { - psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psTime_LOOKUP_METADATA_FAILED, + psError(PS_ERR_BAD_PARAMETER_VALUE, true, _("Failed find '%s' in time metadata."), "psLib.time.predict.mjd"); return NULL; @@ -1130,5 +1130,5 @@ tableMetadataItem = psMetadataLookup(timeMetadata, "psLib.time.predict.xp"); if(tableMetadataItem == NULL) { - psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psTime_LOOKUP_METADATA_FAILED, "psLib.time.predict.xp"); + psError(PS_ERR_BAD_PARAMETER_VALUE, true, _("Failed find '%s' in time metadata."), "psLib.time.predict.xp"); return NULL; } @@ -1139,5 +1139,5 @@ tableMetadataItem = psMetadataLookup(timeMetadata, "psLib.time.predict.yp"); if(tableMetadataItem == NULL) { - psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psTime_LOOKUP_METADATA_FAILED, "psLib.time.predict.yp"); + psError(PS_ERR_BAD_PARAMETER_VALUE, true, _("Failed find '%s' in time metadata."), "psLib.time.predict.yp"); return NULL; } @@ -1163,5 +1163,5 @@ } else if(xStatus!=PS_LOOKUP_SUCCESS || yStatus!=PS_LOOKUP_SUCCESS) { - psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psTime_INTERPOLATION_FAILED); + psError(PS_ERR_BAD_PARAMETER_VALUE, true, _("Failed time table interpolation.")); return NULL; } @@ -1193,5 +1193,5 @@ // Check if psTime tables are loaded/loadable if(!p_psTimeInit(p_psGetConfigFileName())) { - psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psTime_FILE_NOT_FOUND, + psError(PS_ERR_BAD_PARAMETER_VALUE, true, _("Failed to open file %s."), p_psGetConfigFileName()); return NAN; @@ -1201,5 +1201,5 @@ tableMetadataItem = psMetadataLookup(timeMetadata, "taiTable"); if(tableMetadataItem == NULL) { - psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psTime_LOOKUP_METADATA_FAILED, "taiTable"); + psError(PS_ERR_BAD_PARAMETER_VALUE, true, _("Failed find '%s' in time metadata."), "taiTable"); return NAN; } @@ -1228,5 +1228,5 @@ // Check for successful interpolation if(results == NULL) { - psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psTime_INTERPOLATION_FAILED); + psError(PS_ERR_BAD_PARAMETER_VALUE, true, _("Failed time table interpolation.")); return NAN; } @@ -1273,5 +1273,5 @@ // Verify time is UTC type if(utc->type != PS_TIME_UTC) { - psError(PS_ERR_BAD_PARAMETER_VALUE,true,PS_ERRORTEXT_psTime_TYPE_INCORRECT,utc->type); + psError(PS_ERR_BAD_PARAMETER_VALUE,true,_("Specified type, %d, is incorrect."),utc->type); return false; } @@ -1371,5 +1371,5 @@ // Converts psTime to YYYY-MM-DDThh:mm:ss.sss in string form if (!strftime(tempString, MAX_TIME_STRING_LENGTH, "%Y-%m-%dT%H:%M:%S", tmTime)) { - psError(PS_ERR_OS_CALL_FAILED, true, PS_ERRORTEXT_psTime_CONVERT_TIME_TO_STRING_FAILED); + psError(PS_ERR_OS_CALL_FAILED, true, _("Failed to convert a time via strftime function.")); return NULL; } @@ -1385,5 +1385,5 @@ // Create string with milliseconds if (snprintf(timeString, MAX_TIME_STRING_LENGTH, "%s.%1dZ", tempString, ds) < 0) { - psError(PS_ERR_OS_CALL_FAILED, true, PS_ERRORTEXT_psTime_APPEND_MSEC_FAILED); + psError(PS_ERR_OS_CALL_FAILED, true, _("Failed to append millisecond to time string with snprintf function.")); return NULL; } @@ -1501,5 +1501,5 @@ if (sscanf(input, "%d-%d-%dT%d:%d:%d.%d", &tmTime.tm_year, &tmTime.tm_mon, &tmTime.tm_mday, &tmTime.tm_hour, &tmTime.tm_min, &tmTime.tm_sec,&millisecond) < 7) { - psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psTime_ISOTIME_MALFORMED, input); + psError(PS_ERR_BAD_PARAMETER_VALUE, true, _("Specified ISO Time string, '%s', is malformed. Must be in 'YYYY-MM-DDThh:mm:ss.sss' format."), input); return NULL; } @@ -1760,5 +1760,5 @@ // Verify both times of the same type if(time1->type != time2->type) { - psError(PS_ERR_BAD_PARAMETER_VALUE,true,PS_ERRORTEXT_psTime_TYPE_INCORRECT,time1->type); + psError(PS_ERR_BAD_PARAMETER_VALUE,true,_("Specified type, %d, is incorrect."),time1->type); return NAN; } Index: trunk/psLib/src/db/psDB.c =================================================================== --- trunk/psLib/src/db/psDB.c (revision 8231) +++ 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; } Index: trunk/psLib/src/fft/psImageFFT.c =================================================================== --- trunk/psLib/src/fft/psImageFFT.c (revision 8231) +++ trunk/psLib/src/fft/psImageFFT.c (revision 8232) @@ -5,6 +5,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.17 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-07-12 19:30:18 $ + * @version $Revision: 1.18 $ $Name: not supported by cvs2svn $ + * @date $Date: 2006-08-08 23:32:23 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -21,5 +21,5 @@ #include "psImageStructManip.h" -#include "psErrorText.h" + #define PS_FFTW_PLAN_RIGOR FFTW_ESTIMATE @@ -43,5 +43,5 @@ if ((direction & PS_FFT_REVERSE) != 0) { psError(PS_ERR_BAD_PARAMETER_VALUE, true, - PS_ERRORTEXT_psImageFFT_FORWARD_REVERSE); + _("Can not specify both PS_FFT_FORWARD and PS_FFT_REVERSE options.")); psFree(out); return NULL; @@ -49,5 +49,5 @@ if ((direction & PS_FFT_REAL_RESULT) != 0) { psError(PS_ERR_BAD_PARAMETER_VALUE, true, - PS_ERRORTEXT_psImageFFT_REAL_FORWARD_NOTSUPPORTED); + _("The PS_FFT_FORWARD and PS_FFT_REAL_RESULT combinition is not supported.")); psFree(out); return NULL; @@ -55,5 +55,5 @@ } else if ((direction & PS_FFT_REVERSE) == 0) { psError(PS_ERR_BAD_PARAMETER_VALUE, true, - PS_ERRORTEXT_psImageFFT_NO_DIRECTION_OPTION); + _("Must specify either PS_FFT_FORWARD or PS_FFT_REVERSE option.")); psFree(out); return NULL; @@ -86,5 +86,5 @@ if (plan == NULL) { psError(PS_ERR_BAD_PARAMETER_TYPE, true, - PS_ERRORTEXT_psImageFFT_FFTW_PLAN_NULL); + _("Could not create a valid FFT plan to perform the transform.")); psFree(out); return NULL; @@ -179,5 +179,5 @@ PS_TYPE_NAME(typeStr,type); psError(PS_ERR_BAD_PARAMETER_TYPE, true, - PS_ERRORTEXT_psImage_IMAGE_TYPE_UNSUPPORTED, + _("Specified psImage type, %s, is not supported."), typeStr); @@ -241,5 +241,5 @@ PS_TYPE_NAME(typeStr,type); psError(PS_ERR_BAD_PARAMETER_TYPE, true, - PS_ERRORTEXT_psImage_IMAGE_TYPE_UNSUPPORTED, + _("Specified psImage type, %s, is not supported."), typeStr); psFree(out); @@ -271,5 +271,5 @@ PS_TYPE_NAME(typeStrImag,imag->type.type); psError(PS_ERR_BAD_PARAMETER_TYPE, true, - PS_ERRORTEXT_psImageFFT_REAL_IMAG_TYPE_MISMATCH, + _("Real psImage type (%s) and imaginary psImage type (%s) must be the same."), typeStrReal,typeStrImag); psFree(out); @@ -279,5 +279,5 @@ if (imag->numCols != numCols || imag->numRows != numRows) { psError(PS_ERR_BAD_PARAMETER_VALUE, true, - PS_ERRORTEXT_psImageFFT_REAL_IMAG_SIZE_MISMATCH, + _("Real psImage size (%dx%d) and imaginary psImage size (%dx%d) must be the same."), numCols, numRows, imag->numCols, imag->numRows); psFree(out); @@ -320,5 +320,5 @@ PS_TYPE_NAME(typeStr,type); psError(PS_ERR_BAD_PARAMETER_TYPE, true, - PS_ERRORTEXT_psImageFFT_NONREAL_NOTSUPPORTED, + _("Input psImage type, %s, is required to be either psF32 or psF64."), typeStr); psFree(out); @@ -380,5 +380,5 @@ PS_TYPE_NAME(typeStr,type); psError(PS_ERR_BAD_PARAMETER_TYPE, true, - PS_ERRORTEXT_psImageFFT_NONCOMPLEX_NOTSUPPORTED, + _("Input psImage type, %s, is required to be either psC32 or psC64."), typeStr); psFree(out); @@ -446,5 +446,5 @@ PS_TYPE_NAME(typeStr,type); psError(PS_ERR_BAD_PARAMETER_TYPE, true, - PS_ERRORTEXT_psImageFFT_NONCOMPLEX_NOTSUPPORTED, + _("Input psImage type, %s, is required to be either psC32 or psC64."), typeStr); psFree(out); Index: trunk/psLib/src/fft/psVectorFFT.c =================================================================== --- trunk/psLib/src/fft/psVectorFFT.c (revision 8231) +++ trunk/psLib/src/fft/psVectorFFT.c (revision 8232) @@ -5,6 +5,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.33 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-07-12 19:12:01 $ + * @version $Revision: 1.34 $ $Name: not supported by cvs2svn $ + * @date $Date: 2006-08-08 23:32:23 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -22,5 +22,5 @@ #include "psLogMsg.h" -#include "psErrorText.h" + #define P_FFTW_PLAN_RIGOR FFTW_ESTIMATE @@ -63,5 +63,5 @@ } else { psError(PS_ERR_BAD_PARAMETER_VALUE, true, - PS_ERRORTEXT_psVectorFFT_DIRECTION_NOTSET); + _("Must specify the direction as either PS_FFT_FORWARD or PS_FFT_REVERSE.")); psFree(out); return NULL; @@ -71,5 +71,5 @@ if (plan == NULL) { psError(PS_ERR_BAD_PARAMETER_TYPE, true, - PS_ERRORTEXT_psVectorFFT_FFTW_PLAN_NULL); + _("Could not create a valid FFT plan to perform the transform.")); psFree(out); return NULL; @@ -142,5 +142,5 @@ PS_TYPE_NAME(typeStr,type); psError(PS_ERR_BAD_PARAMETER_TYPE, true, - PS_ERRORTEXT_psVectorFFT_TYPE_UNSUPPORTED, + _("Specified psVector type, %s, is not supported."), typeStr); psFree(out); @@ -201,5 +201,5 @@ PS_TYPE_NAME(typeStr,type); psError(PS_ERR_BAD_PARAMETER_TYPE, true, - PS_ERRORTEXT_psVectorFFT_TYPE_UNSUPPORTED, + _("Specified psVector type, %s, is not supported."), typeStr); psFree(out); @@ -233,5 +233,5 @@ PS_TYPE_NAME(typeStrImag,imag->type.type); psError(PS_ERR_BAD_PARAMETER_TYPE, true, - PS_ERRORTEXT_psVectorFFT_REAL_IMAG_TYPE_MISMATCH, + _("Real psVector type, %s, and imaginary psVector type, %s, must be the same."), typeStrReal,typeStrImag); psFree(out); @@ -267,5 +267,5 @@ PS_TYPE_NAME(typeStr,type); psError(PS_ERR_BAD_PARAMETER_TYPE, true, - PS_ERRORTEXT_psVectorFFT_NONREAL_NOTSUPPORTED, + _("Input psVector type, %s, is required to be either psF32 or psF64."), typeStr); psFree(out); @@ -327,5 +327,5 @@ PS_TYPE_NAME(typeStr,type); psError(PS_ERR_BAD_PARAMETER_TYPE, true, - PS_ERRORTEXT_psVectorFFT_NONCOMPLEX_NOTSUPPORTED, + _("Input psVector type, %s, is required to be either psC32 or psC64."), typeStr); psFree(out); @@ -407,5 +407,5 @@ PS_TYPE_NAME(typeStr,type); psError(PS_ERR_BAD_PARAMETER_TYPE, true, - PS_ERRORTEXT_psVectorFFT_NONCOMPLEX_NOTSUPPORTED, + _("Input psVector type, %s, is required to be either psC32 or psC64."), typeStr); psFree(out); Index: trunk/psLib/src/fits/psFits.c =================================================================== --- trunk/psLib/src/fits/psFits.c (revision 8231) +++ trunk/psLib/src/fits/psFits.c (revision 8232) @@ -7,6 +7,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.57 $ $Name: not supported by cvs2svn $ - * @date $Date: 2006-07-15 02:57:12 $ + * @version $Revision: 1.58 $ $Name: not supported by cvs2svn $ + * @date $Date: 2006-08-08 23:32:23 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -18,5 +18,5 @@ #include "string.h" #include "psError.h" -#include "psErrorText.h" + #include "psImageStructManip.h" #include "psMemory.h" @@ -73,5 +73,5 @@ if (fits == NULL) { psError(PS_ERR_BAD_PARAMETER_NULL, true, - PS_ERRORTEXT_psFits_NULL); + _("The input psFits object can not NULL.")); return false; } @@ -91,5 +91,5 @@ if (name == NULL) { psError(PS_ERR_BAD_PARAMETER_NULL, true, - PS_ERRORTEXT_psFits_FILENAME_NULL); + _("Specified filename can not be NULL.")); return NULL; } @@ -139,5 +139,5 @@ fits_get_errstatus(status, fitsErr); psError(PS_ERR_IO, true, - PS_ERRORTEXT_psFits_FILENAME_CREATE_FAILED, + _("Could not create file,'%s'. CFITSIO Error: %s"), name, fitsErr); return NULL; @@ -158,5 +158,5 @@ fits_get_errstatus(status, fitsErr); psError(PS_ERR_BAD_PARAMETER_VALUE, true, - PS_ERRORTEXT_psFits_FILENAME_INVALID, + _("Could not open file,'%s'. CFITSIO Error: %s"), name, fitsErr); return NULL; @@ -188,5 +188,5 @@ if (fits == NULL) { psError(PS_ERR_BAD_PARAMETER_NULL, true, - PS_ERRORTEXT_psFits_NULL); + _("The input psFits object can not NULL.")); return false; } @@ -194,5 +194,5 @@ if (extname == NULL) { psError(PS_ERR_BAD_PARAMETER_NULL, true, - PS_ERRORTEXT_psFits_EXTNAME_NULL); + _("Specified extension name can not be NULL.")); return false; } @@ -203,5 +203,5 @@ fits_get_errstatus(status, fitsErr); psError(PS_ERR_LOCATION_INVALID, true, - PS_ERRORTEXT_psFits_EXTNAME_INVALID, + _("Could not find HDU '%s'. CFITSIO Error: %s"), extname, fitsErr); return false; @@ -217,5 +217,5 @@ if (fits == NULL) { psError(PS_ERR_BAD_PARAMETER_NULL, true, - PS_ERRORTEXT_psFits_NULL); + _("The input psFits object can not NULL.")); return false; } @@ -230,5 +230,5 @@ fits_get_errstatus(status, fitsErr); psError(PS_ERR_LOCATION_INVALID, true, - PS_ERRORTEXT_psFits_EXTNUM_REL_MOVE_FAILED, + _("Could not move %d HDUs from current position. CFITSIO Error: %s"), extnum, fitsErr); return false; @@ -240,5 +240,5 @@ fits_get_errstatus(status, fitsErr); psError(PS_ERR_LOCATION_INVALID, true, - PS_ERRORTEXT_psFits_EXTNUM_ABS_MOVE_FAILED, + _("Could not move to specified HDU #%d. CFITSIO Error: %s"), extnum, fitsErr); return false; @@ -253,5 +253,5 @@ if (fits == NULL) { psError(PS_ERR_BAD_PARAMETER_NULL, true, - PS_ERRORTEXT_psFits_NULL); + _("The input psFits object can not NULL.")); return false; } @@ -270,5 +270,5 @@ if (fits == NULL) { psError(PS_ERR_BAD_PARAMETER_NULL, true, - PS_ERRORTEXT_psFits_NULL); + _("The input psFits object can not NULL.")); return PS_FITS_TYPE_NONE; } @@ -282,5 +282,5 @@ if (fits == NULL) { psError(PS_ERR_BAD_PARAMETER_NULL, true, - PS_ERRORTEXT_psFits_NULL); + _("The input psFits object can not NULL.")); return NULL; } @@ -303,5 +303,5 @@ if (fits == NULL) { psError(PS_ERR_BAD_PARAMETER_NULL, true, - PS_ERRORTEXT_psFits_NULL); + _("The input psFits object can not NULL.")); return false; } @@ -309,5 +309,5 @@ if (name == NULL) { psError(PS_ERR_BAD_PARAMETER_NULL, true, - PS_ERRORTEXT_psFits_EXTNAME_NULL); + _("Specified extension name can not be NULL.")); return false; } @@ -319,5 +319,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); return false; @@ -333,5 +333,5 @@ if (fits == NULL) { psError(PS_ERR_BAD_PARAMETER_NULL, true, - PS_ERRORTEXT_psFits_NULL); + _("The input psFits object can not NULL.")); return false; } @@ -339,5 +339,5 @@ if (! fits->writable) { psError(PS_ERR_IO, true, - PS_ERRORTEXT_psFits_NOT_WRITABLE); + _("The psFits object is not writable.")); return false; } @@ -358,5 +358,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); return false; @@ -371,5 +371,5 @@ if (fits == NULL) { psError(PS_ERR_BAD_PARAMETER_NULL, true, - PS_ERRORTEXT_psFits_NULL); + _("The input psFits object can not NULL.")); return false; } @@ -377,5 +377,5 @@ if (! fits->writable) { psError(PS_ERR_IO, true, - PS_ERRORTEXT_psFits_NOT_WRITABLE); + _("The psFits object is not writable.")); return false; } @@ -397,5 +397,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); return false; @@ -409,5 +409,5 @@ if (fits == NULL) { psError(PS_ERR_BAD_PARAMETER_NULL, true, - PS_ERRORTEXT_psFits_NULL); + _("The input psFits object can not NULL.")); return 0; } @@ -420,5 +420,5 @@ fits_get_errstatus(status, fitsErr); psError(PS_ERR_LOCATION_INVALID, true, - PS_ERRORTEXT_psFits_GETNUMHDUS_FAILED, + _("Failed to determine the number of HDUs. CFITSIO Error: %s"), fitsErr); return 0; @@ -432,5 +432,5 @@ if (fits == NULL) { psError(PS_ERR_BAD_PARAMETER_NULL, true, - PS_ERRORTEXT_psFits_NULL); + _("The input psFits object can not NULL.")); return PS_FITS_TYPE_NONE; } @@ -443,5 +443,5 @@ fits_get_errstatus(status, fitsErr); psError(PS_ERR_LOCATION_INVALID, true, - PS_ERRORTEXT_psFits_GETHDUTYPE_FAILED, + _("Failed to determine an HDU type. CFITSIO Error: %s"), fitsErr); return PS_FITS_TYPE_NONE; @@ -461,5 +461,5 @@ if (fits == NULL) { psError(PS_ERR_BAD_PARAMETER_NULL, true, - PS_ERRORTEXT_psFits_NULL); + _("The input psFits object can not NULL.")); return PS_FITS_TYPE_NONE; } @@ -467,5 +467,5 @@ if (! fits->writable) { psError(PS_ERR_IO, true, - PS_ERRORTEXT_psFits_NOT_WRITABLE); + _("The psFits object is not writable.")); return PS_FITS_TYPE_NONE; } @@ -601,5 +601,5 @@ PS_TYPE_NAME(typeStr,type); psError(PS_ERR_BAD_PARAMETER_TYPE, true, - PS_ERRORTEXT_psFits_TYPE_UNSUPPORTED, + _("Specified type, %s, is not supported."), typeStr); return false; Index: trunk/psLib/src/fits/psFitsHeader.c =================================================================== --- trunk/psLib/src/fits/psFitsHeader.c (revision 8231) +++ trunk/psLib/src/fits/psFitsHeader.c (revision 8232) @@ -7,6 +7,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.24 $ $Name: not supported by cvs2svn $ - * @date $Date: 2006-07-06 01:13:11 $ + * @version $Revision: 1.25 $ $Name: not supported by cvs2svn $ + * @date $Date: 2006-08-08 23:32:23 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -19,5 +19,5 @@ #include "strings.h" #include "psError.h" -#include "psErrorText.h" + #include "psImageStructManip.h" #include "psMemory.h" @@ -48,5 +48,5 @@ if (fits == NULL) { psError(PS_ERR_BAD_PARAMETER_NULL, true, - PS_ERRORTEXT_psFits_NULL); + _("The input psFits object can not NULL.")); return NULL; } @@ -181,10 +181,10 @@ } default: - psError(PS_ERR_IO, true, PS_ERRORTEXT_psFits_METATYPE_INVALID, keyType); + psError(PS_ERR_IO, true, _("Specified FITS metadata type, %c, is not supported."), keyType); return out; } if (!success) { - psError(PS_ERR_UNKNOWN, false, PS_ERRORTEXT_psFits_METADATA_ADD_FAILED, keyName); + psError(PS_ERR_UNKNOWN, false, _("Failed to add metadata item, %s."), keyName); return out; } @@ -195,5 +195,5 @@ char fitsErr[MAX_STRING_LENGTH]; (void)fits_get_errstatus(status, fitsErr); - psError(PS_ERR_IO, true, PS_ERRORTEXT_psFits_METADATA_ADD_FAILED, fitsErr); + psError(PS_ERR_IO, true, _("Failed to add metadata item, %s."), fitsErr); return false; } @@ -205,5 +205,5 @@ { if (fits == NULL) { - psError(PS_ERR_BAD_PARAMETER_NULL, true, PS_ERRORTEXT_psFits_NULL); + psError(PS_ERR_BAD_PARAMETER_NULL, true, _("The input psFits object can not NULL.")); psFree(out); return NULL; @@ -385,5 +385,5 @@ char fitsErr[MAX_STRING_LENGTH]; (void)fits_get_errstatus(status, fitsErr); - psError(PS_ERR_IO, true, PS_ERRORTEXT_psFits_WRITE_FAILED, fitsErr); + psError(PS_ERR_IO, true, _("Could not write data to file. CFITSIO Error: %s"), fitsErr); return false; } @@ -400,10 +400,10 @@ { if (!fits) { - psError(PS_ERR_BAD_PARAMETER_NULL, true, PS_ERRORTEXT_psFits_NULL); + psError(PS_ERR_BAD_PARAMETER_NULL, true, _("The input psFits object can not NULL.")); return false; } if (!output) { - psError(PS_ERR_BAD_PARAMETER_NULL, true, PS_ERRORTEXT_psFits_METADATA_NULL); + psError(PS_ERR_BAD_PARAMETER_NULL, true, _("The input psMetadata was NULL. Need a non-NULL psMetadata for operation to be performed.")); return false; } @@ -417,5 +417,5 @@ { if (!fits) { - psError(PS_ERR_BAD_PARAMETER_NULL, true, PS_ERRORTEXT_psFits_NULL); + psError(PS_ERR_BAD_PARAMETER_NULL, true, _("The input psFits object can not NULL.")); return false; } @@ -443,5 +443,5 @@ { if (header == NULL) { - psError(PS_ERR_BAD_PARAMETER_NULL, true, PS_ERRORTEXT_psFits_METADATA_NULL); + psError(PS_ERR_BAD_PARAMETER_NULL, true, _("The input psMetadata was NULL. Need a non-NULL psMetadata for operation to be performed.")); return false; } Index: trunk/psLib/src/fits/psFitsImage.c =================================================================== --- trunk/psLib/src/fits/psFitsImage.c (revision 8231) +++ trunk/psLib/src/fits/psFitsImage.c (revision 8232) @@ -7,6 +7,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.11 $ $Name: not supported by cvs2svn $ - * @date $Date: 2006-07-08 03:06:40 $ + * @version $Revision: 1.12 $ $Name: not supported by cvs2svn $ + * @date $Date: 2006-08-08 23:32:23 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -19,5 +19,5 @@ #include "string.h" #include "psError.h" -#include "psErrorText.h" + #include "psImageStructManip.h" #include "psMemory.h" @@ -49,5 +49,5 @@ if (fits == NULL) { psError(PS_ERR_BAD_PARAMETER_NULL, true, - PS_ERRORTEXT_psFits_NULL); + _("The input psFits object can not NULL.")); return NULL; } @@ -59,5 +59,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; @@ -65,5 +65,5 @@ if (hdutype != IMAGE_HDU) { psError(PS_ERR_IO, true, - PS_ERRORTEXT_psFits_NOT_IMAGE_TYPE); + _("Current FITS HDU type must be an image.")); return NULL; } @@ -73,5 +73,5 @@ fits_get_errstatus(status, fitsErr); psError(PS_ERR_IO, true, - PS_ERRORTEXT_psFits_DATATYPE_UNKNOWN, + _("Could not determine image data type. CFITSIO Error: %s"), fitsErr); return NULL; @@ -82,5 +82,5 @@ (void)fits_get_errstatus(status, fitsErr); psError(PS_ERR_IO, true, - PS_ERRORTEXT_psFits_IMAGE_DIM_UNKNOWN, + _("Could not determine image dimensions. CFITSIO Error: %s"), fitsErr); return NULL; @@ -90,5 +90,5 @@ if ((nAxis < 2) || (nAxis > 3)) { psError(PS_ERR_IO, true, - PS_ERRORTEXT_psFits_IMAGE_DIMENSION_UNSUPPORTED, + _("Image number of dimensions, %d, is not valid. Only two or three dimensions supported for FITS I/O."), nAxis); return NULL; @@ -99,5 +99,5 @@ (void)fits_get_errstatus(status, fitsErr); psError(PS_ERR_IO, true, - PS_ERRORTEXT_psFits_IMAGE_SIZE_UNKNOWN, + _("Could not determine image size. CFITSIO Error: %s"), fitsErr); return NULL; @@ -163,5 +163,5 @@ default: psError(PS_ERR_IO, true, - PS_ERRORTEXT_psFits_FITS_TYPE_UNSUPPORTED, + _("FITS image type, BITPIX=%d, is not supported."), bitPix); return NULL; @@ -178,5 +178,5 @@ (void)fits_get_errstatus(status, fitsErr); psError(PS_ERR_IO, true, - PS_ERRORTEXT_psFits_READ_FAILED, + _("Reading FITS file failed. CFITSIO Error: %s"), fitsErr); return NULL; @@ -208,10 +208,10 @@ if (!fits) { - psError(PS_ERR_BAD_PARAMETER_NULL, true, PS_ERRORTEXT_psFits_NULL); + psError(PS_ERR_BAD_PARAMETER_NULL, true, _("The input psFits object can not NULL.")); return false; } if (!input) { - psError(PS_ERR_BAD_PARAMETER_NULL, true, PS_ERRORTEXT_psFits_IMAGE_NULL); + psError(PS_ERR_BAD_PARAMETER_NULL, true, _("The input psImage was NULL. Need a non-NULL psImage for operation to be performed.")); return false; } @@ -299,5 +299,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); return false; @@ -318,5 +318,5 @@ if (fits == NULL) { psError(PS_ERR_BAD_PARAMETER_NULL, true, - PS_ERRORTEXT_psFits_NULL); + _("The input psFits object can not NULL.")); return false; } @@ -324,5 +324,5 @@ if (input == 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; } @@ -334,5 +334,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; @@ -340,5 +340,5 @@ if (hdutype != IMAGE_HDU) { psError(PS_ERR_IO, true, - PS_ERRORTEXT_psFits_NOT_IMAGE_TYPE); + _("Current FITS HDU type must be an image.")); return NULL; } @@ -369,5 +369,5 @@ PS_TYPE_NAME(imageTypeStr,input->type.type); psError(PS_ERR_IO, true, - PS_ERRORTEXT_psFits_IMAGE_UPDATE_TYPE_MISMATCH, + _("Can not update a %s image given a %s image."), fitsTypeStr, imageTypeStr); return false; @@ -377,5 +377,5 @@ if (z >= nAxes[2]) { psError(PS_ERR_BAD_PARAMETER_SIZE, true, - PS_ERRORTEXT_psFits_FITS_Z_SMALL, + _("Current FITS HDU has %d z-planes, but z-plane %d was specified."), nAxes[2],z); return false; @@ -412,5 +412,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); return false; @@ -429,5 +429,5 @@ if (fits == NULL) { psError(PS_ERR_BAD_PARAMETER_NULL, true, - PS_ERRORTEXT_psFits_NULL); + _("The input psFits object can not NULL.")); return NULL; } @@ -439,5 +439,5 @@ (void)fits_get_errstatus(status, fitsErr); psError(PS_ERR_IO, true, - PS_ERRORTEXT_psFits_IMAGE_DIM_UNKNOWN, + _("Could not determine image dimensions. CFITSIO Error: %s"), fitsErr); return NULL; @@ -454,5 +454,5 @@ (void)fits_get_errstatus(status, fitsErr); psError(PS_ERR_IO, true, - PS_ERRORTEXT_psFits_IMAGE_SIZE_UNKNOWN, + _("Could not determine image size. CFITSIO Error: %s"), fitsErr); return NULL; @@ -469,5 +469,5 @@ // Bad dimensionality - psError(PS_ERR_IO, true, PS_ERRORTEXT_psFits_IMAGE_DIMENSION_UNSUPPORTED, nAxis); + psError(PS_ERR_IO, true, _("Image number of dimensions, %d, is not valid. Only two or three dimensions supported for FITS I/O."), nAxis); return NULL; } @@ -477,5 +477,5 @@ if (fits == NULL) { psError(PS_ERR_BAD_PARAMETER_NULL, true, - PS_ERRORTEXT_psFits_NULL); + _("The input psFits object can not NULL.")); return false; } @@ -483,10 +483,10 @@ if (input == 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; } if (input->n == 0) { - psError(PS_ERR_BAD_PARAMETER_SIZE, true, PS_ERRORTEXT_psFits_ARRAY_EMPTY); + psError(PS_ERR_BAD_PARAMETER_SIZE, true, _("The input array was empty.")); return false; } @@ -504,5 +504,5 @@ testImage = input->data[i]; if (testImage->numCols != numCols || testImage->numRows != numRows) { - psError(PS_ERR_BAD_PARAMETER_SIZE, true, PS_ERRORTEXT_psFits_ARRAY_SIZE_DIFFER); + psError(PS_ERR_BAD_PARAMETER_SIZE, true, _("The sizes of images in the array differ.")); return false; } @@ -522,5 +522,5 @@ input->n); if (! update) { - psError(PS_ERR_UNKNOWN, false, PS_ERRORTEXT_psFits_METADATA_ADD_FAILED, + psError(PS_ERR_UNKNOWN, false, _("Failed to add metadata item, %s."), "NAXIS, NAXIS1, NAXIS2, NAXIS3"); psFree(headerCopy); @@ -532,5 +532,5 @@ // The next are psFitsImageUpdate to write into the extension. if (! psFitsWriteImage(fits, headerCopy, input->data[0], input->n, extname)) { - psError(PS_ERR_UNKNOWN, false, PS_ERRORTEXT_psFits_WRITE_PLANE_FAILED, 0); + psError(PS_ERR_UNKNOWN, false, _("Could not write image plane %d."), 0); psFree(headerCopy); return false; @@ -540,5 +540,5 @@ for (int i = 1; i < input->n; i++) { if (! psFitsUpdateImage(fits, input->data[i], 0, 0, i)) { - psError(PS_ERR_UNKNOWN, false, PS_ERRORTEXT_psFits_WRITE_PLANE_FAILED, i); + psError(PS_ERR_UNKNOWN, false, _("Could not write image plane %d."), i); return false; } @@ -552,5 +552,5 @@ if (fits == NULL) { psError(PS_ERR_BAD_PARAMETER_NULL, true, - PS_ERRORTEXT_psFits_NULL); + _("The input psFits object can not NULL.")); return false; } @@ -558,10 +558,10 @@ if (input == 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; } if (input->n == 0) { - psError(PS_ERR_BAD_PARAMETER_SIZE, true, PS_ERRORTEXT_psFits_ARRAY_EMPTY); + psError(PS_ERR_BAD_PARAMETER_SIZE, true, _("The input array was empty.")); return false; } @@ -569,5 +569,5 @@ for (int i = 0; i < input->n; i++) { if (! psFitsUpdateImage(fits, input->data[i], x0, y0, i)) { - psError(PS_ERR_UNKNOWN, false, PS_ERRORTEXT_psFits_UPDATE_PLANE_FAILED, i); + psError(PS_ERR_UNKNOWN, false, _("Could not update image plane %d."), i); return false; } Index: trunk/psLib/src/fits/psFitsTable.c =================================================================== --- trunk/psLib/src/fits/psFitsTable.c (revision 8231) +++ 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); Index: trunk/psLib/src/imageops/psImageConvolve.c =================================================================== --- trunk/psLib/src/imageops/psImageConvolve.c (revision 8231) +++ trunk/psLib/src/imageops/psImageConvolve.c (revision 8232) @@ -5,6 +5,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.37 $ $Name: not supported by cvs2svn $ - * @date $Date: 2006-07-15 02:57:12 $ + * @version $Revision: 1.38 $ $Name: not supported by cvs2svn $ + * @date $Date: 2006-08-08 23:32:23 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -21,5 +21,5 @@ #include "psError.h" -#include "psErrorText.h" + #define FOURIER_PADDING 32 /* padding amount in every side of the image for fourier convolution */ @@ -120,5 +120,5 @@ if (tShifts == NULL || xShifts == NULL || yShifts == NULL) { psError(PS_ERR_BAD_PARAMETER_NULL, true, - PS_ERRORTEXT_psImageConvolve_SHIFT_NULL); + _("Specified shift vectors can not be NULL.")); return NULL; } @@ -134,5 +134,5 @@ PS_TYPE_NAME(typeTStr,tShifts->type.type); psError(PS_ERR_BAD_PARAMETER_TYPE, true, - PS_ERRORTEXT_psImageConvolve_SHIFT_TYPE_MISMATCH, + _("Input t-, x-, and y-shift vector types (%s/%s/%s) must match."), typeTStr, typeXStr, typeYStr); return NULL; @@ -257,5 +257,5 @@ PS_TYPE_NAME(typeStr,xShifts->type.type); psError(PS_ERR_BAD_PARAMETER_TYPE, true, - PS_ERRORTEXT_psImage_IMAGE_TYPE_UNSUPPORTED, + _("Specified psImage type, %s, is not supported."), typeStr); } @@ -280,5 +280,5 @@ PS_TYPE_NAME(typeStr,xShifts->type.type); psError(PS_ERR_BAD_PARAMETER_TYPE, true, - PS_ERRORTEXT_psImage_IMAGE_TYPE_UNSUPPORTED, + _("Specified psImage type, %s, is not supported."), typeStr); } @@ -301,5 +301,5 @@ if (kernel == NULL) { psError(PS_ERR_BAD_PARAMETER_NULL, true, - PS_ERRORTEXT_psImageConvolve_KERNEL_NULL); + _("Specified psKernel can not be NULL.")); psFree(out); return NULL; @@ -361,5 +361,5 @@ PS_TYPE_NAME(typeStr,in->type.type); psError(PS_ERR_BAD_PARAMETER_TYPE, true, - PS_ERRORTEXT_psImage_IMAGE_TYPE_UNSUPPORTED, + _("Specified psImage type, %s, is not supported."), typeStr); psFree(out); @@ -380,5 +380,5 @@ if (kRows >= numRows || kCols >= numCols) { psError(PS_ERR_BAD_PARAMETER_SIZE, true, - PS_ERRORTEXT_psImageConvolve_KERNEL_TOO_LARGE, + _("Specified psKernel size, %dx%d, can not be larger than input psImage size, %dx%d."), kCols,kRows, numCols, numRows); @@ -434,5 +434,5 @@ if (kernelFourier == NULL) { psError(PS_ERR_UNKNOWN, false, - PS_ERRORTEXT_psImageConvolve_KERNEL_FFT_FAILED); + _("Failed to perform a fourier transform of kernel.")); psFree(out); return NULL; @@ -442,5 +442,5 @@ if (inFourier == NULL) { psError(PS_ERR_UNKNOWN, false, - PS_ERRORTEXT_psImageConvolve_FFT_FAILED); + _("Failed to perform a fourier transform of input image.")); psFree(out); return NULL; @@ -460,5 +460,5 @@ if (complexOut == NULL) { psError(PS_ERR_UNKNOWN, false, - PS_ERRORTEXT_psImageConvolve_FFT_FAILED); + _("Failed to perform a fourier transform of input image.")); psFree(out); return NULL; @@ -665,5 +665,5 @@ PS_TYPE_NAME(typeStr,image->type.type); psError(PS_ERR_BAD_PARAMETER_TYPE, true, - PS_ERRORTEXT_psImage_IMAGE_TYPE_UNSUPPORTED, + _("Specified psImage type, %s, is not supported."), typeStr); return false; Index: trunk/psLib/src/imageops/psImageGeomManip.c =================================================================== --- trunk/psLib/src/imageops/psImageGeomManip.c (revision 8231) +++ trunk/psLib/src/imageops/psImageGeomManip.c (revision 8232) @@ -10,6 +10,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.27 $ $Name: not supported by cvs2svn $ - * @date $Date: 2006-07-28 00:44:05 $ + * @version $Revision: 1.28 $ $Name: not supported by cvs2svn $ + * @date $Date: 2006-08-08 23:32:23 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -30,5 +30,5 @@ #include "psMemory.h" #include "psAssert.h" -#include "psErrorText.h" + #include "psCoord.h" @@ -51,5 +51,5 @@ if (in == NULL) { psError(PS_ERR_BAD_PARAMETER_NULL, true, - PS_ERRORTEXT_psImage_IMAGE_NULL); + _("Can not operate on a NULL psImage.")); psFree(out); return NULL; @@ -58,5 +58,5 @@ if (scale < 1) { psError(PS_ERR_BAD_PARAMETER_VALUE, true, - PS_ERRORTEXT_psImageManip_SCALE_NOT_POSITIVE, + _("Specified scale value, %d, must be a positive value."), scale); psFree(out); @@ -66,5 +66,5 @@ if (stats == NULL) { psError(PS_ERR_BAD_PARAMETER_NULL, true, - PS_ERRORTEXT_psImage_STAT_NULL); + _("Specified statistic can not be NULL.")); psFree(out); return NULL; @@ -74,5 +74,5 @@ if (statistic == 0) { psError(PS_ERR_BAD_PARAMETER_VALUE, true, - PS_ERRORTEXT_psImage_BAD_STAT, + _("Specified statistic option, %d, is not valid. Must specify one and only one statistic type."), stats->options); psFree(out); @@ -87,5 +87,5 @@ PS_TYPE_NAME(typeStr,mask->type.type); psError(PS_ERR_BAD_PARAMETER_TYPE, true, - PS_ERRORTEXT_psImage_IMAGE_MASK_TYPE, + _("Input psImage mask type, %s, is not the supported mask datatype of %s."), typeStr, PS_TYPE_MASK_NAME); psFree(out); @@ -159,5 +159,5 @@ PS_TYPE_NAME(typeStr,in->type.type); psError(PS_ERR_BAD_PARAMETER_TYPE, true, - PS_ERRORTEXT_psImage_IMAGE_TYPE_UNSUPPORTED, + _("Specified psImage type, %s, is not supported."), typeStr); psFree(out); @@ -184,5 +184,5 @@ if (in == NULL) { psError(PS_ERR_BAD_PARAMETER_NULL, true, - PS_ERRORTEXT_psImage_IMAGE_NULL); + _("Can not operate on a NULL psImage.")); psFree(out); return NULL; @@ -191,5 +191,5 @@ if (scale < 1) { psError(PS_ERR_BAD_PARAMETER_VALUE, true, - PS_ERRORTEXT_psImageManip_SCALE_NOT_POSITIVE, + _("Specified scale value, %d, must be a positive value."), scale); psFree(out); @@ -199,5 +199,5 @@ if (mode > PS_INTERPOLATE_LANCZOS4_VARIANCE ) { psError(PS_ERR_BAD_PARAMETER_VALUE, true, - PS_ERRORTEXT_psImageManip_INTERPOLATION_MODE_UNSUPPORTED, + _("Specified interpolation mode, %d, is unsupported."), mode); psFree(out); @@ -241,5 +241,5 @@ PS_TYPE_NAME(typeStr,in->type.type); psError(PS_ERR_BAD_PARAMETER_TYPE, true, - PS_ERRORTEXT_psImage_IMAGE_TYPE_UNSUPPORTED, + _("Specified psImage type, %s, is not supported."), typeStr); psFree(out); @@ -262,5 +262,5 @@ if (input == NULL) { psError(PS_ERR_BAD_PARAMETER_NULL, true, - PS_ERRORTEXT_psImage_IMAGE_NULL); + _("Can not operate on a NULL psImage.")); psFree(out); return NULL; @@ -311,5 +311,5 @@ if (input == NULL) { psError(PS_ERR_BAD_PARAMETER_NULL, true, - PS_ERRORTEXT_psImage_IMAGE_NULL); + _("Can not operate on a NULL psImage.")); psFree(out); return NULL; @@ -357,5 +357,5 @@ PS_TYPE_NAME(typeStr,type); psError(PS_ERR_BAD_PARAMETER_TYPE, true, - PS_ERRORTEXT_psImage_IMAGE_TYPE_UNSUPPORTED, + _("Specified psImage type, %s, is not supported."), typeStr); psFree(out); @@ -403,5 +403,5 @@ PS_TYPE_NAME(typeStr,type); psError(PS_ERR_BAD_PARAMETER_TYPE, true, - PS_ERRORTEXT_psImage_IMAGE_TYPE_UNSUPPORTED, + _("Specified psImage type, %s, is not supported."), typeStr); psFree(out); @@ -448,5 +448,5 @@ PS_TYPE_NAME(typeStr,type); psError(PS_ERR_BAD_PARAMETER_TYPE, true, - PS_ERRORTEXT_psImage_IMAGE_TYPE_UNSUPPORTED, + _("Specified psImage type, %s, is not supported."), typeStr); psFree(out); @@ -503,5 +503,5 @@ cimag(exposed) > PS_MAX_##TYPE) { \ psError(PS_ERR_BAD_PARAMETER_VALUE, true, \ - PS_ERRORTEXT_psImageManip_CLIP_VALUE_INVALID, \ + _("Specified %s value, %g%+gi, is not the the range of input psImage's valid pixel values (%s), i.e. [%g:%g]."), \ "exposed", \ creal(exposed),cimag(exposed), \ @@ -570,5 +570,5 @@ PS_TYPE_NAME(typeStr,type); \ psError(PS_ERR_BAD_PARAMETER_TYPE, true, \ - PS_ERRORTEXT_psImage_IMAGE_TYPE_UNSUPPORTED, \ + _("Specified psImage type, %s, is not supported."), \ typeStr); \ psFree(out); \ @@ -584,5 +584,5 @@ default: psError(PS_ERR_BAD_PARAMETER_VALUE, true, - PS_ERRORTEXT_psImageManip_INTERPOLATION_MODE_UNSUPPORTED, + _("Specified interpolation mode, %d, is unsupported."), mode); psFree(out); @@ -608,5 +608,5 @@ if (input == NULL) { psError(PS_ERR_BAD_PARAMETER_NULL, true, - PS_ERRORTEXT_psImage_IMAGE_NULL); + _("Can not operate on a NULL psImage.")); psFree(out); return NULL; @@ -627,5 +627,5 @@ cimag(exposed) > PS_MAX_##TYPE) { \ psError(PS_ERR_BAD_PARAMETER_VALUE, true, \ - PS_ERRORTEXT_psImageManip_CLIP_VALUE_INVALID, \ + _("Specified %s value, %g%+gi, is not the the range of input psImage's valid pixel values (%s), i.e. [%g:%g]."), \ "exposed", \ creal(exposed),cimag(exposed), \ @@ -666,5 +666,5 @@ PS_TYPE_NAME(typeStr,type); \ psError(PS_ERR_BAD_PARAMETER_TYPE, true, \ - PS_ERRORTEXT_psImage_IMAGE_TYPE_UNSUPPORTED, \ + _("Specified psImage type, %s, is not supported."), \ typeStr); \ psFree(out); \ @@ -680,5 +680,5 @@ default: psError(PS_ERR_BAD_PARAMETER_VALUE, true, - PS_ERRORTEXT_psImageManip_INTERPOLATION_MODE_UNSUPPORTED, + _("Specified interpolation mode, %d, is unsupported."), mode); psFree(out); @@ -702,5 +702,5 @@ if (input == NULL) { psError(PS_ERR_BAD_PARAMETER_NULL, true, - PS_ERRORTEXT_psImage_IMAGE_NULL); + _("Can not operate on a NULL psImage.")); psFree(output); return NULL; @@ -715,5 +715,5 @@ if (input->numRows != inputMask->numRows || input->numCols != inputMask->numCols) { psError(PS_ERR_BAD_PARAMETER_SIZE, true, - PS_ERRORTEXT_psImage_IMAGE_MASK_SIZE, + _("Input psImage mask size, %dx%d, does not match psImage input size, %dx%d."), input->numCols, input->numRows, inputMask->numCols, inputMask->numRows ); @@ -725,5 +725,5 @@ PS_TYPE_NAME(typeStr,inputMask->type.type); psError(PS_ERR_BAD_PARAMETER_TYPE, true, - PS_ERRORTEXT_psImage_IMAGE_MASK_TYPE, + _("Input psImage mask type, %s, is not the supported mask datatype of %s."), typeStr, PS_TYPE_MASK_NAME); psFree(output); @@ -734,5 +734,5 @@ if (outToIn == NULL) { psError(PS_ERR_BAD_PARAMETER_NULL, true, - PS_ERRORTEXT_psImageManip_TRANSFORM_NULL); + _("Specified input transform can not be NULL.")); return NULL; } @@ -853,5 +853,5 @@ PS_TYPE_NAME(typeStr,type); \ psError(PS_ERR_BAD_PARAMETER_TYPE, true, \ - PS_ERRORTEXT_psImage_IMAGE_TYPE_UNSUPPORTED, \ + _("Specified psImage type, %s, is not supported."), \ typeStr); \ psFree(output); \ @@ -867,5 +867,5 @@ default: psError(PS_ERR_BAD_PARAMETER_VALUE, true, - PS_ERRORTEXT_psImageManip_INTERPOLATION_MODE_UNSUPPORTED, + _("Specified interpolation mode, %d, is unsupported."), mode); psFree(output); Index: trunk/psLib/src/imageops/psImageMaskOps.c =================================================================== --- trunk/psLib/src/imageops/psImageMaskOps.c (revision 8231) +++ trunk/psLib/src/imageops/psImageMaskOps.c (revision 8232) @@ -8,6 +8,6 @@ * @author David Robbins, MHPCC * - * @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ - * @date $Date: 2006-06-30 02:20:06 $ + * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ + * @date $Date: 2006-08-08 23:32:23 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -26,5 +26,5 @@ #include "psMemory.h" #include "psAssert.h" -#include "psErrorText.h" + #include "psCoord.h" Index: trunk/psLib/src/imageops/psImagePixelExtract.c =================================================================== --- trunk/psLib/src/imageops/psImagePixelExtract.c (revision 8231) +++ trunk/psLib/src/imageops/psImagePixelExtract.c (revision 8232) @@ -8,6 +8,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.25 $ $Name: not supported by cvs2svn $ - * @date $Date: 2006-07-28 00:44:05 $ + * @version $Revision: 1.26 $ $Name: not supported by cvs2svn $ + * @date $Date: 2006-08-08 23:32:23 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -21,5 +21,5 @@ #include "psError.h" -#include "psErrorText.h" + #define VECTOR_STORE_ROW_CASE(TYPE) \ @@ -34,5 +34,5 @@ if (input == NULL || input->data.V == NULL) { psError(PS_ERR_BAD_PARAMETER_NULL, true, - PS_ERRORTEXT_psImage_IMAGE_NULL); + _("Can not operate on a NULL psImage.")); psFree(out); return NULL; @@ -124,5 +124,5 @@ if (input == NULL || input->data.V == NULL) { psError(PS_ERR_BAD_PARAMETER_NULL, true, - PS_ERRORTEXT_psImage_IMAGE_NULL); + _("Can not operate on a NULL psImage.")); psFree(out); return NULL; @@ -223,5 +223,5 @@ if (input == NULL || input->data.V == NULL) { psError(PS_ERR_BAD_PARAMETER_NULL, true, - PS_ERRORTEXT_psImage_IMAGE_NULL); + _("Can not operate on a NULL psImage.")); psFree(out); return NULL; @@ -350,5 +350,5 @@ if (inRows != mask->numRows || inCols != mask->numCols) { psError(PS_ERR_BAD_PARAMETER_VALUE, true, - PS_ERRORTEXT_psImage_IMAGE_MASK_SIZE, + _("Input psImage mask size, %dx%d, does not match psImage input size, %dx%d."), mask->numCols,mask->numRows, inCols, inRows); @@ -360,5 +360,5 @@ PS_TYPE_NAME(typeStr,mask->type.type); psError(PS_ERR_BAD_PARAMETER_TYPE, true, - PS_ERRORTEXT_psImage_IMAGE_MASK_TYPE, + _("Input psImage mask type, %s, is not the supported mask datatype of %s."), typeStr, PS_TYPE_MASK_NAME); psFree(out); @@ -369,5 +369,5 @@ if (stats == NULL) { psError(PS_ERR_BAD_PARAMETER_NULL, true, - PS_ERRORTEXT_psImage_STAT_NULL); + _("Specified statistic can not be NULL.")); psFree(out); return NULL; @@ -378,5 +378,5 @@ if (statistic == 0) { psError(PS_ERR_BAD_PARAMETER_VALUE, false, - PS_ERRORTEXT_psImage_BAD_STAT,stats->options); + _("Specified statistic option, %d, is not valid. Must specify one and only one statistic type."),stats->options); psFree(out); return NULL; @@ -466,5 +466,5 @@ PS_TYPE_NAME(typeStr,type); psError(PS_ERR_BAD_PARAMETER_TYPE, true, - PS_ERRORTEXT_psImage_IMAGE_TYPE_UNSUPPORTED, + _("Specified psImage type, %s, is not supported."), typeStr); psFree(out); @@ -531,5 +531,5 @@ } else { // don't know what the direction flag is psError(PS_ERR_BAD_PARAMETER_VALUE, true, - PS_ERRORTEXT_psImage_SLICE_DIRECTION_INVALID, + _("Specified slice direction, %d, is invalid."), direction); psFree(out); @@ -555,5 +555,5 @@ if (input == NULL || input->data.V == NULL) { psError(PS_ERR_BAD_PARAMETER_NULL, true, - PS_ERRORTEXT_psImage_IMAGE_NULL); + _("Can not operate on a NULL psImage.")); psFree(out); return NULL; @@ -588,5 +588,5 @@ if (nSamples < 2) { psError(PS_ERR_BAD_PARAMETER_VALUE, true, - PS_ERRORTEXT_psImage_nSamples_TOOSMALL, + _("Specified number of samples, %d, must be greater than 1 to make a line."), nSamples); psFree(out); @@ -639,5 +639,5 @@ if (mode < PS_INTERPOLATE_FLAT ) { psError(PS_ERR_BAD_PARAMETER_VALUE, true, - PS_ERRORTEXT_psImageManip_INTERPOLATION_MODE_UNSUPPORTED, + _("Specified interpolation mode, %d, is unsupported."), mode); psFree(out); @@ -648,5 +648,5 @@ if (numRows != mask->numRows || numCols != mask->numCols) { psError(PS_ERR_BAD_PARAMETER_VALUE, true, - PS_ERRORTEXT_psImage_IMAGE_MASK_SIZE, + _("Input psImage mask size, %dx%d, does not match psImage input size, %dx%d."), mask->numCols,mask->numRows, numCols-1, numRows); @@ -658,5 +658,5 @@ PS_TYPE_NAME(typeStr,mask->type.type); psError(PS_ERR_BAD_PARAMETER_TYPE, true, - PS_ERRORTEXT_psImage_IMAGE_MASK_TYPE, + _("Input psImage mask type, %s, is not the supported mask datatype of %s."), typeStr, PS_TYPE_MASK_NAME); psFree(out); @@ -719,5 +719,5 @@ PS_TYPE_NAME(typeStr,input->type.type); psError(PS_ERR_BAD_PARAMETER_TYPE, true, - PS_ERRORTEXT_psImage_IMAGE_TYPE_UNSUPPORTED, + _("Specified psImage type, %s, is not supported."), typeStr); psFree(out); @@ -742,5 +742,5 @@ if (input == NULL || input->data.V == NULL) { psError(PS_ERR_BAD_PARAMETER_NULL, true, - PS_ERRORTEXT_psImage_IMAGE_NULL); + _("Can not operate on a NULL psImage.")); psFree(out); return NULL; @@ -752,5 +752,5 @@ if (numRows != mask->numRows || numCols != mask->numCols) { psError(PS_ERR_BAD_PARAMETER_SIZE, true, - PS_ERRORTEXT_psImage_IMAGE_MASK_SIZE, + _("Input psImage mask size, %dx%d, does not match psImage input size, %dx%d."), mask->numCols,mask->numRows, numCols, numRows); @@ -762,5 +762,5 @@ PS_TYPE_NAME(typeStr,mask->type.type); psError(PS_ERR_BAD_PARAMETER_TYPE, true, - PS_ERRORTEXT_psImage_IMAGE_MASK_TYPE, + _("Input psImage mask type, %s, is not the supported mask datatype of %s."), typeStr, PS_TYPE_MASK_NAME); psFree(out); @@ -774,5 +774,5 @@ y < input->row0 || y >= (input->row0 + numRows) ) { psError(PS_ERR_BAD_PARAMETER_VALUE, true, - PS_ERRORTEXT_psImage_CENTER_NOT_IN_IMAGE, + _("Specified center, (%g,%g), is outside of the psImage boundaries, [0:%d,0:%d]."), x, y, numCols-1, numRows-1); @@ -783,5 +783,5 @@ if (radii == NULL) { psError(PS_ERR_BAD_PARAMETER_NULL, true, - PS_ERRORTEXT_psImage_RADII_VECTOR_NULL); + _("Specified radii vector can not be NULL.")); psFree(out); return NULL; @@ -790,5 +790,5 @@ if (radii->n < 2) { psError(PS_ERR_BAD_PARAMETER_SIZE, true, - PS_ERRORTEXT_psImage_RADII_VECTOR_TOOSMALL, + _("Input radii vector size, %d, can not be less than 2."), radii->n); psFree(out); @@ -798,5 +798,5 @@ if (stats == NULL) { psError(PS_ERR_BAD_PARAMETER_NULL, true, - PS_ERRORTEXT_psImage_STAT_NULL); + _("Specified statistic can not be NULL.")); psFree(out); return NULL; @@ -807,5 +807,5 @@ if (statistic == 0) { psError(PS_ERR_BAD_PARAMETER_VALUE, false, - PS_ERRORTEXT_psImage_BAD_STAT, + _("Specified statistic option, %d, is not valid. Must specify one and only one statistic type."), stats->options); psFree(out); Index: trunk/psLib/src/imageops/psImagePixelManip.c =================================================================== --- trunk/psLib/src/imageops/psImagePixelManip.c (revision 8231) +++ trunk/psLib/src/imageops/psImagePixelManip.c (revision 8232) @@ -10,6 +10,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.19 $ $Name: not supported by cvs2svn $ - * @date $Date: 2006-06-30 02:20:06 $ + * @version $Revision: 1.20 $ $Name: not supported by cvs2svn $ + * @date $Date: 2006-08-08 23:32:23 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -28,5 +28,5 @@ #include "psMemory.h" #include "psAssert.h" -#include "psErrorText.h" + #include "psCoord.h" @@ -47,5 +47,5 @@ if (max < min) { psError(PS_ERR_BAD_PARAMETER_VALUE, true, - PS_ERRORTEXT_psImageManip_MAXMIN, + _("Specified min value, %g, can not be greater than the specified max value, %g."), (double)min,(double)max); return 0; @@ -61,5 +61,5 @@ if (vmin < PS_MIN_##type || vmin > PS_MAX_##type) { \ psError(PS_ERR_BAD_PARAMETER_VALUE, true, \ - PS_ERRORTEXT_psImage_PARAMETER_OUTOF_TYPERANGE, \ + _("Specified %s value, %g, is outside of psImage type's range (%s: %g to %g)."), \ "vmin",vmin, PS_TYPE_##type##_NAME, \ (psF64)PS_MIN_##type,(psF64)PS_MAX_##type); \ @@ -67,5 +67,5 @@ if (vmax > PS_MAX_##type || vmax < PS_MIN_##type) { \ psError(PS_ERR_BAD_PARAMETER_VALUE, true, \ - PS_ERRORTEXT_psImage_PARAMETER_OUTOF_TYPERANGE, \ + _("Specified %s value, %g, is outside of psImage type's range (%s: %g to %g)."), \ "vmax",vmax, PS_TYPE_##type##_NAME, \ (psF64)PS_MIN_##type,(psF64)PS_MAX_##type); \ @@ -90,5 +90,5 @@ if (vmin < PS_MIN_##type || vmin > PS_MAX_##type) { \ psError(PS_ERR_BAD_PARAMETER_VALUE, true, \ - PS_ERRORTEXT_psImage_PARAMETER_OUTOF_TYPERANGE, \ + _("Specified %s value, %g, is outside of psImage type's range (%s: %g to %g)."), \ "vmin",vmin, PS_TYPE_##type##_NAME, \ (psF64)PS_MIN_##type,(psF64)PS_MAX_##type); \ @@ -96,5 +96,5 @@ if (vmax > PS_MAX_##type || vmax < PS_MIN_##type) { \ psError(PS_ERR_BAD_PARAMETER_VALUE, true, \ - PS_ERRORTEXT_psImage_PARAMETER_OUTOF_TYPERANGE, \ + _("Specified %s value, %g, is outside of psImage type's range (%s: %g to %g)."), \ "vmax",vmax, PS_TYPE_##type##_NAME, \ (psF64)PS_MIN_##type,(psF64)PS_MAX_##type); \ @@ -132,5 +132,5 @@ PS_TYPE_NAME(typeStr,input->type.type); psError(PS_ERR_BAD_PARAMETER_TYPE, true, - PS_ERRORTEXT_psImage_IMAGE_TYPE_UNSUPPORTED, + _("Specified psImage type, %s, is not supported."), typeStr); } @@ -177,5 +177,5 @@ PS_TYPE_NAME(typeStr,input->type.type); psError(PS_ERR_BAD_PARAMETER_TYPE, true, - PS_ERRORTEXT_psImage_IMAGE_TYPE_UNSUPPORTED, + _("Specified psImage type, %s, is not supported."), typeStr); } @@ -202,5 +202,5 @@ if (image == NULL || overlay == NULL) { psError(PS_ERR_BAD_PARAMETER_NULL, true, - PS_ERRORTEXT_psImage_IMAGE_NULL); + _("Can not operate on a NULL psImage.")); return pixelsOverlaid; } @@ -208,5 +208,5 @@ if (op == NULL) { psError(PS_ERR_BAD_PARAMETER_NULL, true, - PS_ERRORTEXT_psImageManip_OPERATION_NULL); + _("Operation can not be NULL.")); return pixelsOverlaid; } @@ -220,5 +220,5 @@ PS_TYPE_NAME(typeStrOverlay,overlay->type.type); psError(PS_ERR_BAD_PARAMETER_TYPE, true, - PS_ERRORTEXT_psImageManip_OVERLAY_TYPE_MISMATCH, + _("Input overlay psImage type, %s, must match input psImage type, %s."), typeStrOverlay, typeStr); return pixelsOverlaid; @@ -239,5 +239,5 @@ psError(PS_ERR_BAD_PARAMETER_VALUE, true, - PS_ERRORTEXT_psImage_SUBSET_RANGE_INVALID, + _("Specified subset range, [%d:%d,%d:%d], is invalid or outside input psImage's boundaries, [0:%d,0:%d]."), x0, imageColLimit, y0, imageRowLimit, imageNumCols, imageNumRows); @@ -295,5 +295,5 @@ default: \ psError(PS_ERR_BAD_PARAMETER_VALUE, true, \ - PS_ERRORTEXT_psImageManip_OVERLAY_OPERATOR_INVALID, \ + _("Specified operation, '%s', is not supported."), \ op); \ return pixelsOverlaid; \ @@ -319,5 +319,5 @@ PS_TYPE_NAME(typeStr,type); psError(PS_ERR_BAD_PARAMETER_TYPE, true, - PS_ERRORTEXT_psImage_IMAGE_TYPE_UNSUPPORTED, + _("Specified psImage type, %s, is not supported."), typeStr); return pixelsOverlaid; @@ -344,5 +344,5 @@ if (input == NULL) { psError(PS_ERR_BAD_PARAMETER_NULL, true, - PS_ERRORTEXT_psImage_IMAGE_NULL); + _("Can not operate on a NULL psImage.")); return 0; } @@ -350,5 +350,5 @@ if (realMax < realMin) { psError(PS_ERR_BAD_PARAMETER_VALUE, true, - PS_ERRORTEXT_psImageManip_MAXMIN_REAL, + _("Specified real-portion of min value, %g, can not be greater than the real-portion of max value, %g."), (double)realMin, (double)realMax); return 0; @@ -356,5 +356,5 @@ if (imagMax < imagMin) { psError(PS_ERR_BAD_PARAMETER_VALUE, true, - PS_ERRORTEXT_psImageManip_MAXMIN_IMAG, + _("Specified imaginary-portion of min value, %g, can not be greater than the imaginary-portion of max value, %g."), (double)imagMin, (double)imagMax); return 0; @@ -369,5 +369,5 @@ realfcn(vmin) > PS_MAX_##type || imagfcn(vmin) > PS_MAX_##type ) { \ psError(PS_ERR_BAD_PARAMETER_VALUE, true, \ - PS_ERRORTEXT_psImageManip_CLIP_VALUE_INVALID, \ + _("Specified %s value, %g%+gi, is not the the range of input psImage's valid pixel values (%s), i.e. [%g:%g]."), \ "vmin", creal(vmin), cimag(vmin), \ PS_TYPE_##type##_NAME, PS_MIN_##type, PS_MAX_##type); \ @@ -377,5 +377,5 @@ realfcn(vmax) < PS_MIN_##type || imagfcn(vmax) < PS_MIN_##type ) { \ psError(PS_ERR_BAD_PARAMETER_VALUE, true, \ - PS_ERRORTEXT_psImageManip_CLIP_VALUE_INVALID, \ + _("Specified %s value, %g%+gi, is not the the range of input psImage's valid pixel values (%s), i.e. [%g:%g]."), \ "vmax", creal(vmax), cimag(vmax), \ PS_TYPE_##type##_NAME, PS_MIN_##type, PS_MAX_##type); \ @@ -406,5 +406,5 @@ PS_TYPE_NAME(typeStr,input->type.type); psError(PS_ERR_BAD_PARAMETER_TYPE, true, - PS_ERRORTEXT_psImage_IMAGE_TYPE_UNSUPPORTED, + _("Specified psImage type, %s, is not supported."), typeStr); } Index: trunk/psLib/src/imageops/psImageStats.c =================================================================== --- trunk/psLib/src/imageops/psImageStats.c (revision 8231) +++ trunk/psLib/src/imageops/psImageStats.c (revision 8232) @@ -9,6 +9,6 @@ * @author GLG, MHPCC * - * @version $Revision: 1.98 $ $Name: not supported by cvs2svn $ - * @date $Date: 2006-06-30 02:20:06 $ + * @version $Revision: 1.99 $ $Name: not supported by cvs2svn $ + * @date $Date: 2006-08-08 23:32:23 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -30,5 +30,5 @@ #include "psImageStats.h" #include "psAssert.h" -#include "psErrorText.h" + #include "psRegion.h" #include "psRegionForImage.h" @@ -497,5 +497,5 @@ if (mask == NULL) { psError(PS_ERR_BAD_PARAMETER_NULL, true, - PS_ERRORTEXT_psImage_IMAGE_NULL); + _("Can not operate on a NULL psImage.")); return -1; } @@ -592,9 +592,9 @@ return -1; }/* else if (col0 == col1 && row0 == row1) { - psError(PS_ERR_BAD_PARAMETER_VALUE, true, - "Invalid psRegion specified. Region contains only 1 pixel.\n"); - return -1; - } - */ + psError(PS_ERR_BAD_PARAMETER_VALUE, true, + "Invalid psRegion specified. Region contains only 1 pixel.\n"); + return -1; + } + */ x0 = col0; x1 = col1; @@ -632,5 +632,5 @@ default: psError(PS_ERR_BAD_PARAMETER_TYPE, true, - PS_ERRORTEXT_psImage_IMAGE_MASK_TYPE, type, PS_TYPE_U8); + _("Input psImage mask type, %s, is not the supported mask datatype of %s."), type, PS_TYPE_U8); return -1; } Index: trunk/psLib/src/imageops/psImageStructManip.c =================================================================== --- trunk/psLib/src/imageops/psImageStructManip.c (revision 8231) +++ trunk/psLib/src/imageops/psImageStructManip.c (revision 8232) @@ -8,6 +8,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.10 $ $Name: not supported by cvs2svn $ - * @date $Date: 2006-06-12 20:44:04 $ + * @version $Revision: 1.11 $ $Name: not supported by cvs2svn $ + * @date $Date: 2006-08-08 23:32:23 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -21,5 +21,5 @@ #include "psError.h" -#include "psErrorText.h" + static psImage* imageSubset(psImage* out, @@ -35,5 +35,5 @@ if (image == NULL || image->data.V == NULL) { psError(PS_ERR_BAD_PARAMETER_NULL, true, - PS_ERRORTEXT_psImage_IMAGE_NULL); + _("Can not operate on a NULL psImage.")); return NULL; } @@ -41,7 +41,7 @@ if ( col0 < image->col0 || row0 < image->row0 ) { // psError(PS_ERR_BAD_PARAMETER_VALUE, true, - // PS_ERRORTEXT_psImage_SUBSET_RANGE_INVALID); + // _("Specified subset range, [%d:%d,%d:%d], is invalid or outside input psImage's boundaries, [0:%d,0:%d].")); psError(PS_ERR_BAD_PARAMETER_VALUE, true, - PS_ERRORTEXT_psImage_SUBSET_RANGE_INVALID, + _("Specified subset range, [%d:%d,%d:%d], is invalid or outside input psImage's boundaries, [0:%d,0:%d]."), col0, col1-1, row0, row1-1, image->numCols-1, image->numRows-1); @@ -51,5 +51,5 @@ if (image->type.dimen != PS_DIMEN_IMAGE) { psError(PS_ERR_BAD_PARAMETER_TYPE, true, - PS_ERRORTEXT_psImage_NOT_AN_IMAGE); + _("The input psImage must have a PS_DIMEN_IMAGE dimension type.")); return NULL; } @@ -69,5 +69,5 @@ row1 > image->row0 + image->numRows ) { psError(PS_ERR_BAD_PARAMETER_VALUE, true, - PS_ERRORTEXT_psImage_SUBSET_RANGE_INVALID, + _("Specified subset range, [%d:%d,%d:%d], is invalid or outside input psImage's boundaries, [0:%d,0:%d]."), col0, col1-1, row0, row1-1, image->numCols-1, image->numRows-1); @@ -153,5 +153,5 @@ if (input == NULL || input->data.V == NULL) { psError(PS_ERR_BAD_PARAMETER_NULL, true, - PS_ERRORTEXT_psImage_IMAGE_NULL); + _("Can not operate on a NULL psImage.")); psFree(output); return NULL; @@ -160,5 +160,5 @@ if (input == output) { psError(PS_ERR_BAD_PARAMETER_NULL, true, - PS_ERRORTEXT_psImage_INPLACE_NOTSUPPORTED); + _("Specified input and output psImage can not reference the same psImage.")); psFree(output); return NULL; @@ -167,5 +167,5 @@ if (input->type.dimen != PS_DIMEN_IMAGE) { psError(PS_ERR_BAD_PARAMETER_TYPE, true, - PS_ERRORTEXT_psImage_NOT_AN_IMAGE); + _("The input psImage must have a PS_DIMEN_IMAGE dimension type.")); psFree(output); return NULL; @@ -287,5 +287,5 @@ PS_TYPE_NAME(typeStr,type); psError(PS_ERR_BAD_PARAMETER_TYPE, true, - PS_ERRORTEXT_psImage_IMAGE_TYPE_UNSUPPORTED, + _("Specified psImage type, %s, is not supported."), typeStr); psFree(output); @@ -302,5 +302,5 @@ if (image == NULL || image->data.V == NULL) { psError(PS_ERR_BAD_PARAMETER_NULL, true, - PS_ERRORTEXT_psImage_IMAGE_NULL); + _("Can not operate on a NULL psImage.")); return NULL; } @@ -335,5 +335,5 @@ row0 >= row1 ) { psError(PS_ERR_BAD_PARAMETER_VALUE, true, - PS_ERRORTEXT_psImage_SUBSET_RANGE_INVALID, + _("Specified subset range, [%d:%d,%d:%d], is invalid or outside input psImage's boundaries, [0:%d,0:%d]."), col0, col1-1, row0, row1-1, image->numCols-1, image->numRows-1); Index: trunk/psLib/src/math/psBinaryOp.c =================================================================== --- trunk/psLib/src/math/psBinaryOp.c (revision 8231) +++ trunk/psLib/src/math/psBinaryOp.c (revision 8232) @@ -30,6 +30,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.8 $ $Name: not supported by cvs2svn $ - * @date $Date: 2006-06-30 02:20:06 $ + * @version $Revision: 1.9 $ $Name: not supported by cvs2svn $ + * @date $Date: 2006-08-08 23:32:23 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -50,5 +50,5 @@ #include "psLogMsg.h" #include "psAssert.h" -#include "psErrorText.h" + /***************************************************************************** @@ -107,5 +107,5 @@ long n2 = ((psVector*)IN2)->n; \ if (n1 != n2) { \ - psError(PS_ERR_BAD_PARAMETER_SIZE, true, PS_ERRORTEXT_psMatrix_COUNT_DIFFERS, n1, n2); \ + psError(PS_ERR_BAD_PARAMETER_SIZE, true, _("Number of elements inconsistent, %d vs %d. Number of elements must match."), n1, n2); \ if (OUT != IN1 && OUT != IN2) { \ psFree(OUT); \ @@ -129,5 +129,5 @@ if (((psVector*)IN1)->type.dimen == PS_DIMEN_VECTOR) { /* Regular vectors */ \ if (n1 != numRows2) { \ - psError(PS_ERR_BAD_PARAMETER_SIZE, true, PS_ERRORTEXT_psMatrix_COUNT_DIFFERS, n1, numRows2); \ + psError(PS_ERR_BAD_PARAMETER_SIZE, true, _("Number of elements inconsistent, %d vs %d. Number of elements must match."), n1, numRows2); \ if (OUT != IN1 && OUT != IN2) { \ psFree(OUT); \ @@ -146,5 +146,5 @@ } else { /* Transposed vectors */ \ if (n1 != numCols2) { \ - psError(PS_ERR_BAD_PARAMETER_SIZE, true, PS_ERRORTEXT_psMatrix_COUNT_DIFFERS, n1, numCols2); \ + psError(PS_ERR_BAD_PARAMETER_SIZE, true, _("Number of elements inconsistent, %d vs %d. Number of elements must match."), n1, numCols2); \ if (OUT != IN1 && OUT != IN2) { \ psFree(OUT); \ @@ -187,5 +187,5 @@ if (((psVector*)IN2)->type.dimen == PS_DIMEN_VECTOR) { /* Regular vectors */ \ if (n2 != numRows1) { \ - psError(PS_ERR_BAD_PARAMETER_SIZE, true, PS_ERRORTEXT_psMatrix_COUNT_DIFFERS, n2, numRows1); \ + psError(PS_ERR_BAD_PARAMETER_SIZE, true, _("Number of elements inconsistent, %d vs %d. Number of elements must match."), n2, numRows1); \ if (OUT != IN1 && OUT != IN2) { \ psFree(OUT); \ @@ -204,5 +204,5 @@ } else { /* Transposed vectors */ \ if (n2 != numCols1) { \ - psError(PS_ERR_BAD_PARAMETER_SIZE, true, PS_ERRORTEXT_psMatrix_COUNT_DIFFERS, n2, numCols1); \ + psError(PS_ERR_BAD_PARAMETER_SIZE, true, _("Number of elements inconsistent, %d vs %d. Number of elements must match."), n2, numCols1); \ if (OUT != IN1) { \ psFree(OUT); \ @@ -229,5 +229,5 @@ long numCols2 = ((psImage*)IN2)->numCols; \ if (numRows1 != numRows2 || numCols1 != numCols2) { \ - psError(PS_ERR_BAD_PARAMETER_SIZE, true, PS_ERRORTEXT_psMatrix_IMAGE_SIZE_DIFFERS, \ + psError(PS_ERR_BAD_PARAMETER_SIZE, true, _("Specified psImage dimensions differed, %dx%d vs %dx%d."), \ numCols1, numRows1, numCols2, numRows2); \ if (OUT != IN1 && OUT != IN2) { \ @@ -278,5 +278,5 @@ PS_TYPE_NAME(strType,IN1->type); \ psError(PS_ERR_BAD_PARAMETER_TYPE, true, \ - PS_ERRORTEXT_psMatrix_TYPE_MISMATCH, \ + _("Specified data type, %s, is not supported."), \ strType); */ \ if (OUT != IN1 && OUT != IN2) { \ @@ -329,5 +329,5 @@ PS_TYPE_NAME(strType,IN1->type); \ psError(PS_ERR_BAD_PARAMETER_TYPE, true, \ - PS_ERRORTEXT_psMatrix_TYPE_MISMATCH, \ + _("Specified data type, %s, is not supported."), \ strType); */ \ if (OUT != IN1 && OUT != IN2) { \ @@ -372,5 +372,5 @@ if (PS_IS_PSELEMTYPE_COMPLEX(IN1->type)) { \ psError(PS_ERR_BAD_PARAMETER_VALUE, true, \ - PS_ERRORTEXT_psMatrix_MIN_COMPLEX_SUPPORT); \ + _("The minimum operation is not supported with complex data.")); \ if (OUT != IN1 && OUT != IN2) { \ psFree(OUT); \ @@ -383,5 +383,5 @@ if (PS_IS_PSELEMTYPE_COMPLEX(IN1->type)) { \ psError(PS_ERR_BAD_PARAMETER_VALUE, true, \ - PS_ERRORTEXT_psMatrix_MAX_COMPLEX_SUPPORT); \ + _("The maximum operation is not supported with complex data.")); \ if (OUT != IN1 && OUT != IN2) { \ psFree(OUT); \ @@ -393,5 +393,5 @@ } else { \ psError(PS_ERR_BAD_PARAMETER_VALUE, true, \ - PS_ERRORTEXT_psMatrix_OPERATION_UNSUPPORTED, \ + _("Specified operation, %s, is not supported."), \ OP); \ if (OUT != IN1 && OUT != IN2) { \ @@ -469,5 +469,5 @@ if (out == NULL) { psError(PS_ERR_UNKNOWN, false, - PS_ERRORTEXT_psMatrix_OUTPUT_VECTOR_NOT_CREATED); + _("Couldn't create a proper output psVector.")); return NULL; } @@ -478,5 +478,5 @@ if (out == NULL) { psError(PS_ERR_UNKNOWN, false, - PS_ERRORTEXT_psMatrix_OUTPUT_IMAGE_NOT_CREATED); + _("Couldn't create a proper output psImage.")); return NULL; } @@ -484,5 +484,5 @@ } else { psError(PS_ERR_BAD_PARAMETER_TYPE, true, - PS_ERRORTEXT_psMatrix_DIMEN_INVALID, + _("Specified parameter, %s, has invalid dimensionality, %d."), "in2",dim2); psBinaryOp_EXIT; @@ -493,5 +493,5 @@ if (out == NULL) { psError(PS_ERR_UNKNOWN, false, - PS_ERRORTEXT_psMatrix_OUTPUT_VECTOR_NOT_CREATED); + _("Couldn't create a proper output psVector.")); return NULL; } @@ -502,5 +502,5 @@ if (out == NULL) { psError(PS_ERR_UNKNOWN, false, - PS_ERRORTEXT_psMatrix_OUTPUT_VECTOR_NOT_CREATED); + _("Couldn't create a proper output psVector.")); return NULL; } @@ -511,5 +511,5 @@ if (out == NULL) { psError(PS_ERR_UNKNOWN, false, - PS_ERRORTEXT_psMatrix_OUTPUT_IMAGE_NOT_CREATED); + _("Couldn't create a proper output psImage.")); return NULL; } @@ -517,5 +517,5 @@ } else { psError(PS_ERR_BAD_PARAMETER_TYPE, true, - PS_ERRORTEXT_psMatrix_DIMEN_INVALID, + _("Specified parameter, %s, has invalid dimensionality, %d."), "in2",dim2); psBinaryOp_EXIT; @@ -525,5 +525,5 @@ if (out == NULL) { psError(PS_ERR_UNKNOWN, false, - PS_ERRORTEXT_psMatrix_OUTPUT_IMAGE_NOT_CREATED); + _("Couldn't create a proper output psImage.")); return NULL; } @@ -536,5 +536,5 @@ } else { psError(PS_ERR_BAD_PARAMETER_TYPE, true, - PS_ERRORTEXT_psMatrix_DIMEN_INVALID, + _("Specified parameter, %s, has invalid dimensionality, %d."), "in2",dim2); psBinaryOp_EXIT; @@ -542,5 +542,5 @@ } else { psError(PS_ERR_BAD_PARAMETER_TYPE, true, - PS_ERRORTEXT_psMatrix_DIMEN_INVALID, + _("Specified parameter, %s, has invalid dimensionality, %d."), "in1",dim1); psBinaryOp_EXIT; Index: trunk/psLib/src/math/psMathUtils.c =================================================================== --- trunk/psLib/src/math/psMathUtils.c (revision 8231) +++ trunk/psLib/src/math/psMathUtils.c (revision 8232) @@ -3,6 +3,6 @@ * This file contains standard math routines. * - * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ - * @date $Date: 2006-06-30 02:20:06 $ + * @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ + * @date $Date: 2006-08-08 23:32:23 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -26,5 +26,5 @@ #include "psAssert.h" #include "psConstants.h" -#include "psErrorText.h" + /*****************************************************************************/ Index: trunk/psLib/src/math/psMatrix.c =================================================================== --- trunk/psLib/src/math/psMatrix.c (revision 8231) +++ trunk/psLib/src/math/psMatrix.c (revision 8232) @@ -21,6 +21,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.40 $ $Name: not supported by cvs2svn $ - * @date $Date: 2006-06-30 02:20:06 $ + * @version $Revision: 1.41 $ $Name: not supported by cvs2svn $ + * @date $Date: 2006-08-08 23:32:23 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -43,5 +43,5 @@ #include "psMatrix.h" #include "psAssert.h" -#include "psErrorText.h" + #include "psTrace.h" @@ -568,5 +568,5 @@ if(numRowsIn!=numColsOut && numRowsOut!=numColsIn) { - psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psMatrix_TRANSPOSE_MISMATCH); + psError(PS_ERR_BAD_PARAMETER_VALUE, true, _("Number of rows do not match number of columns.")); TRANSPOSE_CLEANUP; } Index: trunk/psLib/src/math/psPolynomial.c =================================================================== --- trunk/psLib/src/math/psPolynomial.c (revision 8231) +++ trunk/psLib/src/math/psPolynomial.c (revision 8232) @@ -7,6 +7,6 @@ * polynomials. It also contains a Gaussian functions. * -* @version $Revision: 1.147 $ $Name: not supported by cvs2svn $ -* @date $Date: 2006-07-15 02:57:12 $ +* @version $Revision: 1.148 $ $Name: not supported by cvs2svn $ +* @date $Date: 2006-08-08 23:32:23 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -32,5 +32,5 @@ #include "psPolynomial.h" #include "psAssert.h" -#include "psErrorText.h" + /*****************************************************************************/ @@ -795,5 +795,5 @@ } else { psError(PS_ERR_BAD_PARAMETER_TYPE, true, - PS_ERRORTEXT_psPolynomial_INVALID_POLYNOMIAL_TYPE, + _("Unknown polynomial type 0x%x found. Evaluation failed."), poly->type); } @@ -845,5 +845,5 @@ } else { psError(PS_ERR_BAD_PARAMETER_TYPE, true, - PS_ERRORTEXT_psPolynomial_INVALID_POLYNOMIAL_TYPE, + _("Unknown polynomial type 0x%x found. Evaluation failed."), poly->type); } @@ -924,5 +924,5 @@ } else { psError(PS_ERR_BAD_PARAMETER_TYPE, true, - PS_ERRORTEXT_psPolynomial_INVALID_POLYNOMIAL_TYPE, + _("Unknown polynomial type 0x%x found. Evaluation failed."), poly->type); } @@ -1040,5 +1040,5 @@ } else { psError(PS_ERR_BAD_PARAMETER_TYPE, true, - PS_ERRORTEXT_psPolynomial_INVALID_POLYNOMIAL_TYPE, + _("Unknown polynomial type 0x%x found. Evaluation failed."), poly->type); } Index: trunk/psLib/src/math/psRandom.c =================================================================== --- trunk/psLib/src/math/psRandom.c (revision 8231) +++ trunk/psLib/src/math/psRandom.c (revision 8232) @@ -10,6 +10,6 @@ * @author GLG, MHPCC * -* @version $Revision: 1.12 $ $Name: not supported by cvs2svn $ -* @date $Date: 2006-06-30 02:20:06 $ +* @version $Revision: 1.13 $ $Name: not supported by cvs2svn $ +* @date $Date: 2006-08-08 23:32:23 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -31,5 +31,5 @@ #include "psLogMsg.h" #include "psAssert.h" -#include "psErrorText.h" + psU64 p_psRandomGetSystemSeed() @@ -78,5 +78,5 @@ psError(PS_ERR_UNEXPECTED_NULL, true, - PS_ERRORTEXT_psRandom_UNKNOWN_RANDFOM_NUMBER_GENERATOR_TYPE); + _("Unknown Random Number Generator Type")); break; } @@ -92,5 +92,5 @@ psError(PS_ERR_UNEXPECTED_NULL, true, - PS_ERRORTEXT_psRandom_NULL_RANDOM_VAR); + _("Random variable is NULL.")); } else { // Check seed value to see if system seed should be used @@ -109,5 +109,5 @@ psError(PS_ERR_UNEXPECTED_NULL, true, - PS_ERRORTEXT_psRandom_NULL_RANDOM_VAR); + _("Random variable is NULL.")); return(0); } else { @@ -122,5 +122,5 @@ psError(PS_ERR_UNEXPECTED_NULL, true, - PS_ERRORTEXT_psRandom_NULL_RANDOM_VAR); + _("Random variable is NULL.")); return(0); } else { @@ -136,5 +136,5 @@ psError(PS_ERR_UNEXPECTED_NULL, true, - PS_ERRORTEXT_psRandom_NULL_RANDOM_VAR); + _("Random variable is NULL.")); return(0); } else { @@ -149,5 +149,5 @@ psError(PS_ERR_UNEXPECTED_NULL, true, - PS_ERRORTEXT_psRandom_NULL_RANDOM_VAR); + _("Random variable is NULL.")); return(0); } else { Index: trunk/psLib/src/math/psRegion.c =================================================================== --- trunk/psLib/src/math/psRegion.c (revision 8231) +++ trunk/psLib/src/math/psRegion.c (revision 8232) @@ -3,5 +3,5 @@ #include "psMemory.h" #include "psError.h" -#include "psErrorText.h" + #include "psRegion.h" @@ -52,5 +52,5 @@ if (sscanf(region,"[%d:%d,%d:%d]",&col0,&col1,&row0,&row1) < 4) { psError(PS_ERR_BAD_PARAMETER_NULL, true, - PS_ERRORTEXT_psImage_SUBSECTION_INVALID, + _("Specified subsection string, '%s', can not be parsed. Must be in the form '[x1:x2,y1:y2]'."), region); return psRegionSet(NAN,NAN,NAN,NAN); @@ -64,5 +64,5 @@ if ((col1 > 0) && (col0 > col1)) { psError(PS_ERR_BAD_PARAMETER_VALUE, true, - PS_ERRORTEXT_psImage_SUBSET_RANGE_MALFORMED, + _("Specified subset range, [%d:%d,%d:%d], is invalid. Ranges must be incremental."), col0,col1,row0,row1); return psRegionSet(NAN,NAN,NAN,NAN); @@ -71,5 +71,5 @@ if ((row1 > 0) && (row0 > row1)) { psError(PS_ERR_BAD_PARAMETER_VALUE, true, - PS_ERRORTEXT_psImage_SUBSET_RANGE_MALFORMED, + _("Specified subset range, [%d:%d,%d:%d], is invalid. Ranges must be incremental."), col0,col1,row0,row1); return psRegionSet(NAN,NAN,NAN,NAN); Index: trunk/psLib/src/math/psSpline.c =================================================================== --- trunk/psLib/src/math/psSpline.c (revision 8231) +++ trunk/psLib/src/math/psSpline.c (revision 8232) @@ -6,6 +6,6 @@ * This file contains the routines that allocate, free, and evaluate splines. * -* @version $Revision: 1.150 $ $Name: not supported by cvs2svn $ -* @date $Date: 2006-07-15 02:57:12 $ +* @version $Revision: 1.151 $ $Name: not supported by cvs2svn $ +* @date $Date: 2006-08-08 23:32:23 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -28,5 +28,5 @@ #include "psSpline.h" #include "psAssert.h" -#include "psErrorText.h" + #include "psMathUtils.h" Index: trunk/psLib/src/math/psStats.c =================================================================== --- trunk/psLib/src/math/psStats.c (revision 8231) +++ trunk/psLib/src/math/psStats.c (revision 8232) @@ -16,6 +16,6 @@ * use ->min and ->max (PS_STAT_USE_RANGE) * - * @version $Revision: 1.182 $ $Name: not supported by cvs2svn $ - * @date $Date: 2006-07-28 00:44:05 $ + * @version $Revision: 1.183 $ $Name: not supported by cvs2svn $ + * @date $Date: 2006-08-08 23:32:23 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -49,5 +49,5 @@ #include "psString.h" -#include "psErrorText.h" + /*****************************************************************************/ @@ -440,5 +440,5 @@ psError(PS_ERR_UNEXPECTED_NULL, false, - PS_ERRORTEXT_psStats_STATS_SAMPLE_MEDIAN_SORT_PROBLEM); + _("Failed to sort input data.")); psTrace(__func__, 4, "---- %s(false) end ----\n", __func__); psFree(vector); @@ -924,5 +924,5 @@ ((y->data.F64[2] <= yVal) && (yVal <= y->data.F64[0]))) ) { psError(PS_ERR_BAD_PARAMETER_VALUE, true, - PS_ERRORTEXT_psStats_YVAL_OUT_OF_RANGE, + _("Specified yVal, %g, is not within y-range, %g to %g."), (psF64)yVal, y->data.F64[0], y->data.F64[2]); } @@ -946,5 +946,5 @@ if (myPoly == NULL) { psError(PS_ERR_UNEXPECTED_NULL, false, - PS_ERRORTEXT_psStats_STATS_FIT_QUADRATIC_POLYNOMIAL_1D_FIT); + _("Failed to fit a 1-dimensional polynomial to the three specified data points. Returning NAN.")); psFree(x); psFree(y); @@ -967,5 +967,5 @@ if (isnan(tmpFloat)) { psError(PS_ERR_UNEXPECTED_NULL, - false, PS_ERRORTEXT_psStats_STATS_FIT_QUADRATIC_POLY_MEDIAN); + false, _("Failed to determine the median of the fitted polynomial. Returning NAN.")); psFree(x); psFree(y); @@ -2035,5 +2035,5 @@ PS_STAT_FITTED_MEAN | PS_STAT_FITTED_STDEV)) { if (!vectorRobustStats(inF32, errorsF32, maskU8, maskVal, stats)) { - psError(PS_ERR_UNKNOWN, false, PS_ERRORTEXT_psStats_STATS_FAILED); + psError(PS_ERR_UNKNOWN, false, _("Failed to calculate the specified statistic.")); psFree(stats); psFree(inF32); Index: trunk/psLib/src/math/psUnaryOp.c =================================================================== --- trunk/psLib/src/math/psUnaryOp.c (revision 8231) +++ trunk/psLib/src/math/psUnaryOp.c (revision 8232) @@ -30,6 +30,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.8 $ $Name: not supported by cvs2svn $ - * @date $Date: 2006-06-30 02:20:06 $ + * @version $Revision: 1.9 $ $Name: not supported by cvs2svn $ + * @date $Date: 2006-08-08 23:32:23 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -51,5 +51,5 @@ #include "psLogMsg.h" #include "psAssert.h" -#include "psErrorText.h" + /***************************************************************************** @@ -78,5 +78,5 @@ long nOut = ((psVector*)OUT)->n; \ if (nIn != nOut) { \ - psError(PS_ERR_BAD_PARAMETER_SIZE, true, PS_ERRORTEXT_psMatrix_COUNT_DIFFERS, nIn, nOut); \ + psError(PS_ERR_BAD_PARAMETER_SIZE, true, _("Number of elements inconsistent, %d vs %d. Number of elements must match."), nIn, nOut); \ if (OUT != IN) { \ psFree(OUT); \ @@ -99,5 +99,5 @@ long numColsOut = ((psImage*)OUT)->numCols; \ if(numRowsIn!=numRowsOut || numColsIn!=numColsOut) { \ - psError(PS_ERR_BAD_PARAMETER_SIZE, true, PS_ERRORTEXT_psMatrix_IMAGE_SIZE_DIFFERS, \ + psError(PS_ERR_BAD_PARAMETER_SIZE, true, _("Specified psImage dimensions differed, %dx%d vs %dx%d."), \ numColsIn, numRowsIn, numColsOut, numRowsOut); \ if (OUT != IN) { \ @@ -157,5 +157,5 @@ char* strType; \ PS_TYPE_NAME(strType, IN->type); \ - psError(PS_ERR_BAD_PARAMETER_TYPE, true, PS_ERRORTEXT_psMatrix_TYPE_MISMATCH, strType); \ + psError(PS_ERR_BAD_PARAMETER_TYPE, true, _("Specified data type, %s, is not supported."), strType); \ if (OUT != IN) { \ psFree(OUT); \ @@ -275,5 +275,5 @@ } \ } else { \ - psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psMatrix_OPERATION_UNSUPPORTED, OP); \ + psError(PS_ERR_BAD_PARAMETER_VALUE, true, _("Specified operation, %s, is not supported."), OP); \ if (OUT != IN) { \ psFree(OUT); \ @@ -309,5 +309,5 @@ case PS_DIMEN_TRANSV: if (((psVector*)in)->n == 0) { - psError(PS_ERR_BAD_PARAMETER_SIZE, true, PS_ERRORTEXT_psMatrix_VECTOR_EMPTY); + psError(PS_ERR_BAD_PARAMETER_SIZE, true, _("Input psVector contains no elements. No data to perform operation with.")); psUnaryOp_EXIT; } @@ -315,5 +315,5 @@ out = psVectorRecycle(out, ((psVector*)in)->n, psTypeIn->type); if (out == NULL) { - psError(PS_ERR_UNKNOWN, false, PS_ERRORTEXT_psMatrix_OUTPUT_VECTOR_NOT_CREATED); + psError(PS_ERR_UNKNOWN, false, _("Couldn't create a proper output psVector.")); psUnaryOp_EXIT; } @@ -324,5 +324,5 @@ case PS_DIMEN_IMAGE: if (((psImage* ) in)->numCols == 0 || ((psImage* ) in)->numRows == 0) { - psError(PS_ERR_BAD_PARAMETER_SIZE, true, PS_ERRORTEXT_psMatrix_IMAGE_EMPTY); + psError(PS_ERR_BAD_PARAMETER_SIZE, true, _("Input psImage contains no pixels. No data to perform operation with.")); psUnaryOp_EXIT; } @@ -330,5 +330,5 @@ out = psImageRecycle(out, ((psImage*)in)->numCols, ((psImage*)in)->numRows, psTypeIn->type); if (out == NULL) { - psError(PS_ERR_UNKNOWN, false, PS_ERRORTEXT_psMatrix_OUTPUT_IMAGE_NOT_CREATED); + psError(PS_ERR_UNKNOWN, false, _("Couldn't create a proper output psImage.")); psUnaryOp_EXIT; } @@ -340,5 +340,5 @@ psFree(out); } - psError(PS_ERR_BAD_PARAMETER_SIZE, true, PS_ERRORTEXT_psMatrix_DIMEN_INVALID, "in", psTypeIn->dimen); + psError(PS_ERR_BAD_PARAMETER_SIZE, true, _("Specified parameter, %s, has invalid dimensionality, %d."), "in", psTypeIn->dimen); psUnaryOp_EXIT; } Index: trunk/psLib/src/mathtypes/psImage.c =================================================================== --- trunk/psLib/src/mathtypes/psImage.c (revision 8231) +++ trunk/psLib/src/mathtypes/psImage.c (revision 8232) @@ -9,6 +9,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.112 $ $Name: not supported by cvs2svn $ - * @date $Date: 2006-07-15 02:57:12 $ + * @version $Revision: 1.113 $ $Name: not supported by cvs2svn $ + * @date $Date: 2006-08-08 23:32:23 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -27,5 +27,5 @@ #include "psString.h" -#include "psErrorText.h" + #define SQUARE(x) ((x)*(x)) @@ -64,5 +64,5 @@ if (numRows < 1) { psError(PS_ERR_BAD_PARAMETER_VALUE, true, - PS_ERRORTEXT_psImage_AREA_NEGATIVE, + _("Specified number of rows (%d) or columns (%d) is invalid."), numRows, numCols); return NULL; @@ -70,5 +70,5 @@ if (numCols < 1) { psError(PS_ERR_BAD_PARAMETER_VALUE, true, - PS_ERRORTEXT_psImage_AREA_NEGATIVE, + _("Specified number of rows (%d) or columns (%d) is invalid."), numRows, numCols); return NULL; @@ -380,5 +380,5 @@ psFree(old); psError(PS_ERR_BAD_PARAMETER_TYPE, true, - PS_ERRORTEXT_psImage_NOT_AN_IMAGE); + _("The input psImage must have a PS_DIMEN_IMAGE dimension type.")); return NULL; } @@ -417,5 +417,5 @@ if (input == NULL || input->data.V == NULL) { psError(PS_ERR_BAD_PARAMETER_NULL, true, - PS_ERRORTEXT_psImage_IMAGE_NULL); + _("Can not operate on a NULL psImage.")); return false; } @@ -423,5 +423,5 @@ if (input->type.dimen != PS_DIMEN_IMAGE) { psError(PS_ERR_BAD_PARAMETER_TYPE, true, - PS_ERRORTEXT_psImage_NOT_AN_IMAGE); + _("The input psImage must have a PS_DIMEN_IMAGE dimension type.")); return false; } @@ -536,5 +536,5 @@ PS_TYPE_NAME(typeStr,type); psError(PS_ERR_BAD_PARAMETER_TYPE, true, - PS_ERRORTEXT_psImage_IMAGE_TYPE_UNSUPPORTED, + _("Specified psImage type, %s, is not supported."), typeStr); break; @@ -634,5 +634,5 @@ default: \ psError(PS_ERR_BAD_PARAMETER_VALUE,true, \ - PS_ERRORTEXT_psImage_INTERPOLATE_METHOD_INVALID, \ + _("Specified interpolation method (%d) is not supported."), \ mode); \ } \ @@ -656,5 +656,5 @@ PS_TYPE_NAME(typeStr,input->type.type); psError(PS_ERR_BAD_PARAMETER_TYPE,true, - PS_ERRORTEXT_psImage_IMAGE_TYPE_UNSUPPORTED, + _("Specified psImage type, %s, is not supported."), typeStr); } Index: trunk/psLib/src/mathtypes/psScalar.c =================================================================== --- trunk/psLib/src/mathtypes/psScalar.c (revision 8231) +++ trunk/psLib/src/mathtypes/psScalar.c (revision 8232) @@ -8,6 +8,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.23 $ $Name: not supported by cvs2svn $ - * @date $Date: 2006-07-15 02:57:12 $ + * @version $Revision: 1.24 $ $Name: not supported by cvs2svn $ + * @date $Date: 2006-08-08 23:32:23 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -20,5 +20,5 @@ #include "psAbort.h" -#include "psErrorText.h" + static void scalarFree(psScalar *scalar) @@ -76,5 +76,5 @@ default: psError(PS_ERR_BAD_PARAMETER_TYPE, true, - PS_ERRORTEXT_psScalar_UNSUPPORTED_TYPE, + _("Specified datatype (%d) is unsupported by psScalar."), type); psFree(scalar); @@ -103,5 +103,5 @@ if (value == NULL) { psError(PS_ERR_BAD_PARAMETER_NULL, true, - PS_ERRORTEXT_psScalar_COPY_NULL); + _("Can not copy a NULL psScalar.")); return NULL; } @@ -147,5 +147,5 @@ default: psError(PS_ERR_BAD_PARAMETER_TYPE, true, - PS_ERRORTEXT_psScalar_UNSUPPORTED_TYPE, + _("Specified datatype (%d) is unsupported by psScalar."), dataType); return NULL; Index: trunk/psLib/src/mathtypes/psVector.c =================================================================== --- trunk/psLib/src/mathtypes/psVector.c (revision 8231) +++ trunk/psLib/src/mathtypes/psVector.c (revision 8232) @@ -9,6 +9,6 @@ * @author Robert DeSonia, MHPCC * -* @version $Revision: 1.79 $ $Name: not supported by cvs2svn $ -* @date $Date: 2006-07-26 02:19:32 $ +* @version $Revision: 1.80 $ $Name: not supported by cvs2svn $ +* @date $Date: 2006-08-08 23:32:23 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -27,5 +27,5 @@ #include "psCompare.h" -#include "psErrorText.h" + typedef struct @@ -79,5 +79,5 @@ if (elementSize < 1) { psError(PS_ERR_BAD_PARAMETER_TYPE, true, - PS_ERRORTEXT_psVector_UNSUPPORTED_TYPE, type); + _("Input psVector is an unsupported type (0x%x)."), type); return NULL; } @@ -108,5 +108,5 @@ if (vector == NULL) { psError(PS_ERR_BAD_PARAMETER_NULL, true, - PS_ERRORTEXT_psVector_REALLOC_NULL); + _("psVectorRealloc must a given a non-NULL psVector to resize. Desired datatype unknown.")); return NULL; } else if (vector->nalloc != nalloc) { // No need to realloc to same size @@ -138,5 +138,5 @@ psFree(vector); psError(PS_ERR_BAD_PARAMETER_TYPE, true, - PS_ERRORTEXT_psVector_NOT_A_VECTOR); + _("The input psVector must have a vector dimension type.")); return NULL; } @@ -163,5 +163,5 @@ if (vector == NULL) { psError(PS_ERR_BAD_PARAMETER_NULL, true, - PS_ERRORTEXT_psVector_NULL); + _("The input psVector can not be NULL.")); return NULL; } @@ -201,5 +201,5 @@ if (input == NULL) { psError(PS_ERR_BAD_PARAMETER_NULL, true, - PS_ERRORTEXT_psVector_NULL); + _("The input psVector can not be NULL.")); psFree(output); return NULL; @@ -241,5 +241,5 @@ PS_TYPE_NAME(typeStr,type); psError(PS_ERR_BAD_PARAMETER_TYPE, true, - // PS_ERRORTEXT_psVector_UNSUPPORTED_TYPE, typeStr); + // _("Input psVector is an unsupported type (0x%x)."), typeStr); "Input psVector is an unsupported type.\n"); psFree(output); @@ -301,5 +301,5 @@ PS_TYPE_NAME(typeStr,type); \ psError(PS_ERR_BAD_PARAMETER_TYPE, true, \ - PS_ERRORTEXT_psVector_UNSUPPORTED_TYPE, \ + _("Input psVector is an unsupported type (0x%x)."), \ typeStr); \ psFree(output); \ @@ -326,5 +326,5 @@ PS_TYPE_NAME(typeStr,type); psError(PS_ERR_BAD_PARAMETER_TYPE, true, - PS_ERRORTEXT_psVector_UNSUPPORTED_TYPE, + _("Input psVector is an unsupported type (0x%x)."), typeStr); psFree(output); @@ -378,5 +378,5 @@ if (!inVector) { psError(PS_ERR_BAD_PARAMETER_NULL, true, - PS_ERRORTEXT_psVector_SORT_NULL); + _("psVectorSort can not sort a NULL psVector.")); psFree(outVector); return NULL; @@ -408,5 +408,5 @@ default: psError(PS_ERR_BAD_PARAMETER_TYPE, true, - PS_ERRORTEXT_psVector_UNSUPPORTED_TYPE, + _("Input psVector is an unsupported type (0x%x)."), inVector->type.type); psFree(outVector); @@ -455,5 +455,5 @@ if (inVector == NULL) { psError(PS_ERR_BAD_PARAMETER_NULL, true, - PS_ERRORTEXT_psVector_SORT_NULL); + _("psVectorSort can not sort a NULL psVector.")); psFree(outVector); return NULL; @@ -481,5 +481,5 @@ default: psError(PS_ERR_BAD_PARAMETER_TYPE, true, - PS_ERRORTEXT_psVector_UNSUPPORTED_TYPE, + _("Input psVector is an unsupported type (0x%x)."), inVector->type.type); psFree(outVector); @@ -896,5 +896,5 @@ { if (input == NULL) { - psError(PS_ERR_BAD_PARAMETER_NULL, true, PS_ERRORTEXT_psVector_NULL); + psError(PS_ERR_BAD_PARAMETER_NULL, true, _("The input psVector can not be NULL.")); return false; } @@ -969,5 +969,5 @@ { if (input == NULL) { - psError(PS_ERR_BAD_PARAMETER_NULL, true, PS_ERRORTEXT_psVector_NULL); + psError(PS_ERR_BAD_PARAMETER_NULL, true, _("The input psVector can not be NULL.")); return NAN; } @@ -1032,5 +1032,5 @@ long Npixels = 0; if (mask == NULL) { - psError(PS_ERR_BAD_PARAMETER_NULL, true, PS_ERRORTEXT_psVector_NULL); + psError(PS_ERR_BAD_PARAMETER_NULL, true, _("The input psVector can not be NULL.")); Npixels = -1; return Npixels; @@ -1067,5 +1067,5 @@ default: psError(PS_ERR_BAD_PARAMETER_TYPE, true, - PS_ERRORTEXT_psVector_UNSUPPORTED_TYPE, type); + _("Input psVector is an unsupported type (0x%x)."), type); return -1; } Index: trunk/psLib/src/psErrorText.h.in =================================================================== --- trunk/psLib/src/psErrorText.h.in (revision 8231) +++ (revision ) @@ -1,22 +1,0 @@ -/** @file psErrorText.h - * - * @brief Contains the error text for the psLib library - * - * @ingroup ErrorHandling - * - * @author Robert DeSonia, MHPCC - * - * @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-08-25 23:41:59 $ - * - * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii - */ - -/* !!! DO NOT EDIT psErrorText.h! Add error messages to the cooresponding .dat file !!! */ - -#ifndef PS_ERROR_TEXT_H -#define PS_ERROR_TEXT_H - -#define PS_ERRORTEXT_${ErrorCode} "${ErrorDescription}" - -#endif // #ifndef PS_ERROR_TEXT_H Index: trunk/psLib/src/psErrorText_en.dat =================================================================== --- trunk/psLib/src/psErrorText_en.dat (revision 8231) +++ (revision ) @@ -1,346 +1,0 @@ -# -# This file is used to generate psErrorText.h content -# -# Format is: -# ERRORNAME(one word) ERROR_TEXT -# -# N.B. in code, the ERRORNAME appears as PS_ERRORTEXT_ERRORNAME -#################################################################### -psTime_FILE_NOT_FOUND Failed to open file %s. -psTime_FILE_TOO_MANY_ROWS Too many rows found in file %s. Max number of rows allowed is %d. -psTime_TIME_POSTDATES_TABLE Specified psTime postdates (%g) the table of %s information. -psTime_TIME_PREDATES_TABLE Specified psTime predates (%g) the table of %s information. -psTime_TIME_POSTDATES_TABLES Specified psTime postdates (%g) all tables of %s information. -psTime_TIME_PREDATES_TABLES Specified psTime predates (%g) all tables of %s information. -psTime_TABLE_DUPLICATE_ROWS The %s table was found to have two rows of the same time value. -psTime_TYPE_UNKNOWN Specified type, %d, is not supported. -psTime_TYPE_INCORRECT Specified type, %d, is incorrect. -psTime_TYPE_MISMATCH Specified psTime parameters must have same type. -psTime_GET_TOD_FAILED Failed to determine the current time from gettimeofday function. -psTime_CONVERT_TIME_TO_STRING_FAILED Failed to convert a time via strftime function. -psTime_APPEND_MSEC_FAILED Failed to append millisecond to time string with snprintf function. -psTime_USEC_INVALID The psTime usec attribute value, %u, is invalid. Must be less than 1e6. -psTime_ISOTIME_MALFORMED Specified ISO Time string, '%s', is malformed. Must be in 'YYYY-MM-DDThh:mm:ss.sss' format. -psTime_INTERPOLATION_FAILED Failed time table interpolation. -psTime_INTERPOLATION_FAILED_NAME Failed time table interpolation for '%s'. -psTime_LOOKUP_METADATA_FAILED Failed find '%s' in time metadata. -psTime_BAD_TABLE_COUNT Incorrect number of table files entered. Found: %d. Expected: %d. -psTime_BAD_VECTOR Incorrect vector size. Size: %d, Expected %d. -# -psCoord_PROJECTION_TYPE_UNDEFINED The projection type, %s, is undefined. -psCoord_PROJECTION_TYPE_UNKNOWN The projection type, %d, is unknown. -psCoord_UNITS_UNKNOWN Specified units, 0x%x, is not supported. -psCoord_OFFSET_MODE_UNKNOWN Specified offset mode, 0x%x, is not supported. -psCoord_INVALID_MJD Specified time is less than 1900. -# -psAstrometry_NONLINEAR_TRANSFORM The %s transfrom is not linear. Only linear transforms are supported. -# -psMetadata_METATYPE_INVALID Specified psDataType, %d, is not supported. -psMetadata_FORMAT_INVALID Specified print format, %%%c, is not supported. -psMetadata_METATYPE_MISMATCH Specified psDataType, %d, is incorrect. Expected %d. -psMetadata_ADD_LIST_FAILED Failed to add metadata item, %s, to items list. -psMetadata_ADD_TABLE_FAILED Failed to add metadata item, %s, to items table. -psMetadata_REMOVE_LIST_FAILED Failed to remove metadata item, %s, from metadata list. -psMetadata_REMOVE_LIST_INDEX_FAILED Failed to remove metadata item, at index %d, from metadata list. -psMetadata_REMOVE_TABLE_FAILED Failed to remove metadata item, %s, from metadata table. -psMetadata_ADD_COLLECTION_FAILED Failed to add metadata item, %s, to metadata collection list. -psMetadata_ADD_FAILED Failed to add metadata item to metadata collection list. -psMetadata_FIND_FAILED Could not find metadata item, %s. -psMetadata_FIND_INDEX_FAILED Could not find metadata item at index %d. -psMetadata_DUPLICATE_NOT_ALLOWED Duplicate metadata item name is not allowed. Use a psMetadataFlags option to allow such action. -psMetadata_REGEX_INVALID Specified regular expression is invalid. %s. -psMetadata_LOCATION_INVALID Specified location, %d, is invalid. -# -psMetadataIO_TYPE_INVALID Specified type, %d, is not supported. -psMetadataIO_EXTNUM_NOTPOSITIVE Specified extension number, %d, is invalid. Value must be positive if no extension name is given. -psMetadataIO_FITS_METATYPE_INVALID Specified FITS metadata type, %c, is not supported. -psMetadataIO_ADD_FAILED Failed to add metadata item, %s. -psMetadataIO_FILE_OPEN_FAILED Failed to open file '%s'. Check if it exists and it has the proper permissions. -psMetadataIO_FILE_MULTIPLE_CHAR More than one '%c' character not allowed. Found on line %u of %s. -psMetadataIO_FILE_ELEMENT_NULL Failed to read a metadata %s on line %u of %s. -psMetadataIO_FILE_TYPE_INVALID Metadata type '%s', found on line %u of %s, is invalid. -psMetadataIO_OVERWRITE_ITEM Duplicate Metadata item, %s, found on line %u of %s. Overwrite not allowed. -psMetadataIO_PARSE_FAILED Failed to parse the value '%s' of metadata item %s, type %s, on line %u of %s. -psMetadataIO_NO_NAME Failed to find key 'name' in table on line %u of %s. -psMetadataIO_TYPE_INVALID_LINE_FILE Specified type, %s, is not supported on line %u of %s. -psMetadataIO_TAG_MISMATCH Start tag, %s and end tag, %s do not agree. -psMetadataIO_TAG_UNKNOWN Invalid end tag name, %s. -psMetadataIO_TYPE_DUPLICATE Specified type, %s, on line %u of %s is already defined. -psMetadataIO_DUPLICATE_MULTI Duplicate MULTI specifier on line %u of %s. -# -psArray_REALLOC_NULL psArrayRealloc must be given a non-NULL psArray to resize. -psArray_ARRAY_NULL Specified psArray can not be NULL. -psArray_POSITION_BEYOND_NALLOC Specified position, %d, is greater than the allocated size of the array, %d. -# -psVector_REALLOC_NULL psVectorRealloc must a given a non-NULL psVector to resize. Desired datatype unknown. -psVector_NOT_A_VECTOR The input psVector must have a vector dimension type. -psVector_SORT_NULL psVectorSort can not sort a NULL psVector. -psVector_UNSUPPORTED_TYPE Input psVector is an unsupported type (0x%x). -psVector_NULL The input psVector can not be NULL. -psVector_EXTENDSIZE_NEG The input number of elements to extend must be non-negative. -# -psBitSet_ALLOC_NEG_SIZE The number of bit in a psBitSet (%d) must be greater than zero. -psBitSet_SET_NULL Can not operate on a NULL psBitSet. -psBitSet_BIT_OUTOFRANGE The specified bit position (%d) is invalid. Position must be between 0 and %d. -psBitSet_OPERATOR_NULL Specified operator is NULL. Must specify desired operator. -psBitSet_OPERATOR_INVALID Specified operator, %s, is invalid. Valid operators are AND, OR, and XOR. -psBitSet_FIRST_OPERAND_NULL First psBitSet operand can not be NULL. -psBitSet_SECOND_OPERAND_NULL Second psBitSet operand can not be NULL. -psBitSet_OPERANDS_SIZE_DIFFER The psBitSet operand must be the same size. -psBitSet_NOT_OP_FAILED Could not perform NOT operation. -psBitSet_OPERAND_NULL Operand can not be NULL. -# -psScalar_UNSUPPORTED_TYPE Specified datatype (%d) is unsupported by psScalar. -psScalar_COPY_NULL Can not copy a NULL psScalar. -# -psHash_KEY_NULL Input key can not be NULL. -psHash_TABLE_NULL Input psHash can not be NULL. -psHash_DATA_NULL Input data can not be NULL. -# -psList_LOCATION_INVALID Specified location, %d, is invalid. -psList_ITERATOR_INVALID Specified iterator is not valid. -psList_ITERATOR_NULL Specified iterator is NULL. -psList_ITERATOR_NONMUTABLE Specified iterator indicates list is non-mutable. -psList_LIST_NULL Specified psList reference is NULL. -psList_DATA_NULL Specified data item is NULL. -psList_DATA_NOT_FOUND Specified data item is not found in the psList. -# -psPixels_NULL Input psPixels can not be NULL. -psPixels_MASK_NULL Specified mask can not be NULL. -psPixels_MASK_TYPE Specified mask's type, %s, is invalid. Should be PS_TYPE_MASK. -psPixels_DATA_NULL Input psPixels contains no data. -psPixels_REGION_INVALID Specified psRegion, [%d:%d,%d:%d], does not specify a valid region. -psPixels_FAILED_IMAGE_CREATE Failed to create image of size %dx%d. -# -psLookupTable_FILE_NOT_FOUND Failed to open file %s. -psLookupTable_PARSE_VALUE Unable to parse string, %s on line %lld. -psLookupTable_PARSE_TYPE Unable to parse type, %s on line %lld. -psLookupTable_PARSE_GENERAL Unable to read lookup table item, %s on line %lld -psLookupTable_INTERPOLATE_HIGH High index too big, %d. -psLookupTable_INTERPOLATE_LOW Low index too small, %d. -psLookupTable_DIVIDE_BY_ZERO Divide by zero error during interpolation. -psLookupTable_INVALID_TYPE Invalid psLookupType, %d; -psLookupTable_TABLE_INVALID Lookup table is invalid. -# -psFits_NULL The input psFits object can not NULL. -psFits_NOT_WRITABLE The psFits object is not writable. -psFits_FILENAME_INVALID Could not open file,'%s'.\nCFITSIO Error: %s -psFits_FILENAME_NULL Specified filename can not be NULL. -psFits_EXTNAME_NULL Specified extension name can not be NULL. -psFits_EXTNAME_INVALID Could not find HDU '%s'.\nCFITSIO Error: %s -psFits_EXTNUM_ABS_MOVE_FAILED Could not move to specified HDU #%d.\nCFITSIO Error: %s -psFits_EXTNUM_REL_MOVE_FAILED Could not move %d HDUs from current position.\nCFITSIO Error: %s -psFits_GET_EXTNUM_FAILED Failed to determine the current HDU number in file %s.\nCFITSIO Error: %s -psFits_GETNUMHDUS_FAILED Failed to determine the number of HDUs.\nCFITSIO Error: %s -psFits_GETHDUTYPE_FAILED Failed to determine an HDU type.\nCFITSIO Error: %s -psFits_GETNUMKEYS_FAILED Failed to determine the number of header keys in file %s.\nCFITSIO Error: %s -psFits_GET_TABLE_SIZE_FAILED Failed to determine the size of the current HDU table.\nCFITSIO Error: %s -psFits_FILENAME_CREATE_FAILED Could not create file,'%s'.\nCFITSIO Error: %s -psFits_TYPE_UNSUPPORTED Specified type, %s, is not supported. -psFits_CREATE_HDU_FAILED Could not create new image HDU in file,'%s'.\nCFITSIO Error: %s -psFits_GET_HDU_TYPE_FAILED Could not determine the HDU type.\nCFITSIO Error: %s -psFits_NOT_IMAGE_TYPE Current FITS HDU type must be an image. -psFits_NOT_TABLE_TYPE Current FITS HDU type must be a table. -psFits_TABLE_EMPTY Can't create a table without any rows. -psFits_CFITSIO_ERROR CFITSIO error: %s -psFits_METATYPE_INVALID Specified FITS metadata type, %c, is not supported. -psFits_METADATA_ADD_FAILED Failed to add metadata item, %s. -psFits_WRITE_FAILED Could not write data to file.\nCFITSIO Error: %s -psFits_WRITE_PLANE_FAILED Could not write image plane %d. -psFits_UPDATE_PLANE_FAILED Could not update image plane %d. -psFits_IMAGE_NULL The input psImage was NULL. Need a non-NULL psImage for operation to be performed. -psFits_ARRAY_EMPTY The input array was empty. -psFits_ARRAY_SIZE_DIFFER The sizes of images in the array differ. -psFits_METADATA_NULL The input psMetadata was NULL. Need a non-NULL psMetadata for operation to be performed. -psFits_METADATA_PTYPE_UNSUPPORTED A metadata item's primative type, %d, is not supported. -psFits_ROW_INVALID Specified row, %d, is not valid for current table of %d rows. -psFits_GET_TABLE_ELEMENT Failed to retrieve table element (%d,%d).\nCFITSIO Error: %s -psFits_FIND_COLUMN Specified column, %s, was not found.\nCFITSIO Error: %s -psFits_GET_COLTYPE Could not determine the datatype of the table column.\nCFITSIO Error: %s -psFits_TABLE_READ_COL Failed to read table column.\nCFITSIO Error: %s -psFits_DATATYPE_UNKNOWN Could not determine image data type.\nCFITSIO Error: %s -psFits_IMAGE_DIM_UNKNOWN Could not determine image dimensions.\nCFITSIO Error: %s -psFits_IMAGE_DIMENSION_UNSUPPORTED Image number of dimensions, %d, is not valid. Only two or three dimensions supported for FITS I/O. -psFits_IMAGE_SIZE_UNKNOWN Could not determine image size.\nCFITSIO Error: %s -psFits_FITS_TYPE_UNSUPPORTED FITS image type, BITPIX=%d, is not supported. -psFits_READ_FAILED Reading FITS file failed.\nCFITSIO Error: %s -psFits_IMAGE_UPDATE_TYPE_MISMATCH Can not update a %s image given a %s image. -psFits_FITS_Z_SMALL Current FITS HDU has %d z-planes, but z-plane %d was specified. -# -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. -# -psVectorFFT_TYPE_NOT_F32_C32 Input psVector type, %s, is not supported. Valid data types are psF32 and psC32. -psVectorFFT_REVERSE_NOT_COMPLEX Input psVector (%s) is not complex. Reverse FFT operation requires a complex input. -psVectorFFT_FORWARD_NOT_REAL Input psVector (%s) is not real. Forward FFT operation requires a real input. -psVectorFFT_FFTW_PLAN_NULL Could not create a valid FFT plan to perform the transform. -psVectorFFT_TYPE_UNSUPPORTED Specified psVector type, %s, is not supported. -psVectorFFT_REAL_IMAG_TYPE_MISMATCH Real psVector type, %s, and imaginary psVector type, %s, must be the same. -psVectorFFT_REAL_IMAG_SIZE_MISMATCH Real psVector size, %d, and imaginary psVector size, %d, must be the same. -psVectorFFT_NONREAL_NOTSUPPORTED Input psVector type, %s, is required to be either psF32 or psF64. -psVectorFFT_NONCOMPLEX_NOTSUPPORTED Input psVector type, %s, is required to be either psC32 or psC64. -psVectorFFT_DIRECTION_NOTSET Must specify the direction as either PS_FFT_FORWARD or PS_FFT_REVERSE. -# -psStats_NOT_F32_F64 Invalid data type, %s. Only psF32 and psF64 data types are supported. -psStats_VECTOR_TYPE_UNSUPPORTED Input psVector type, %s, is not supported. -psStats_YVAL_OUT_OF_RANGE Specified yVal, %g, is not within y-range, %g to %g. -psStats_ROBUST_QUARTILE_BINS_FAILED Could not determine the robust lower/upper quartile bin numbers. -psStats_STATS_FAILED Failed to calculate the specified statistic. -psStats_STATS_SAMPLE_MEDIAN_SORT_PROBLEM Failed to sort input data. -psStats_STATS_VECTOR_BIN_DISECT_PROBLEM Failed to determine the bin number of a data element. -psStats_STATS_FIT_QUADRATIC_POLYNOMIAL_1D_FIT Failed to fit a 1-dimensional polynomial to the three specified data points. Returning NAN. -psStats_STATS_FIT_QUADRATIC_POLY_MEDIAN Failed to determine the median of the fitted polynomial. Returning NAN. -psStats_ROBUST_STATS_CLIPPED_STATS Failed to determine clipped statistics. -psStats_STATS_POLY_MEDIAN_OUT_OF_RANGE The requested y-value does not fall with the specified range of x-values. Returning NAN. -# -psPolynomial_INVALID_POLYNOMIAL_TYPE Unknown polynomial type 0x%x found. Evaluation failed. -psPolynomial_TYPE_NOT_SUPPORTED Input psVector type, %s, is not supported. -psPolynomial_NOT_ENOUGH_DATAPOINTS Given vector does not have enough data points for %d-order interpolation. -psSpline_INVALID_POLYNOMIAL_TYPE Unknown polynomial type 0x%x found. Evaluation failed. -psSpline_TYPE_NOT_SUPPORTED Input psVector type, %s, is not supported. -psSpline_NOT_ENOUGH_DATAPOINTS Given vector does not have enough data points for %d-order interpolation. -# -psRandom_UNKNOWN_RANDFOM_NUMBER_GENERATOR_TYPE Unknown Random Number Generator Type -psRandom_NULL_RANDOM_VAR Random variable is NULL. -# -psMatrix_COUNT_DIFFERS Number of elements inconsistent, %d vs %d. Number of elements must match. -psMatrix_IMAGE_SIZE_DIFFERS Specified psImage dimensions differed, %dx%d vs %dx%d. -psMatrix_TYPE_MISMATCH Specified data type, %s, is not supported. -psMatrix_MIN_COMPLEX_SUPPORT The minimum operation is not supported with complex data. -psMatrix_MAX_COMPLEX_SUPPORT The maximum operation is not supported with complex data. -psMatrix_OPERATION_UNSUPPORTED Specified operation, %s, is not supported. -psMatrix_DIMEN_OTHER_FOUND %s's dimensionality is PS_DIMEN_OTHER, which is not allowed. -psMatrix_OUTPUT_VECTOR_NOT_CREATED Couldn't create a proper output psVector. -psMatrix_OUTPUT_IMAGE_NOT_CREATED Couldn't create a proper output psImage. -psMatrix_DIMEN_INVALID Specified parameter, %s, has invalid dimensionality, %d. -psMatrix_VECTOR_EMPTY Input psVector contains no elements. No data to perform operation with. -psMatrix_IMAGE_EMPTY Input psImage contains no pixels. No data to perform operation with. -psMatrix_TRANSPOSE_MISMATCH Number of rows do not match number of columns. -# -psImage_AREA_NEGATIVE Specified number of rows (%d) or columns (%d) is invalid. -psImage_NOT_AN_IMAGE The input psImage must have a PS_DIMEN_IMAGE dimension type. -psImage_IMAGE_NULL Can not operate on a NULL psImage. -psImage_IMAGE_TYPE_UNSUPPORTED Specified psImage type, %s, is not supported. -psImage_INTERPOLATE_METHOD_INVALID Specified interpolation method (%d) is not supported. -psImage_REGION_NULL Specified psRegion is NULL. Operation could not be performed. -psImage_SUBSET_RANGE_INVALID Specified subset range, [%d:%d,%d:%d], is invalid or outside input psImage's boundaries, [0:%d,0:%d]. -psImage_SUBSET_RANGE_MALFORMED Specified subset range, [%d:%d,%d:%d], is invalid. Ranges must be incremental. -psImage_SUBSECTION_NULL Specified subsection string can not be NULL. -psImage_SUBSECTION_INVALID Specified subsection string, '%s', can not be parsed. Must be in the form '[x1:x2,y1:y2]'. -psImage_NOT_PARENT Specified psImage can not be a child of another psImage. -psImage_INPLACE_NOTSUPPORTED Specified input and output psImage can not reference the same psImage. -psImage_SUBSET_ZERO_SIZE Specified subset, [%d:%d,%d:%d], contains no pixel data. -psImage_IMAGE_MASK_SIZE Input psImage mask size, %dx%d, does not match psImage input size, %dx%d. -psImage_IMAGE_MASK_TYPE Input psImage mask type, %s, is not the supported mask datatype of %s. -psImage_BAD_STAT Specified statistic option, %d, is not valid. Must specify one and only one statistic type. -psImage_NO_STAT_OPTIONS Specified statistic option did not indicate any operation to perform. -psImage_STAT_NULL Specified statistic can not be NULL. -psImage_SLICE_DIRECTION_INVALID Specified slice direction, %d, is invalid. -psImage_PARAMETER_OUTOF_TYPERANGE Specified %s value, %g, is outside of psImage type's range (%s: %g to %g). -psImage_nSamples_TOOSMALL Specified number of samples, %d, must be greater than 1 to make a line. -psImage_LINE_NOT_IN_IMAGE Specified line, (%f,%f)->(%f,%f), does not entirely lie in psImage's boundaries, [0:%d,0:%d]. -psImage_RADII_VECTOR_NULL Specified radii vector can not be NULL. -psImage_CENTER_NOT_IN_IMAGE Specified center, (%g,%g), is outside of the psImage boundaries, [0:%d,0:%d]. -psImage_RADII_VECTOR_TOOSMALL Input radii vector size, %d, can not be less than 2. -# -psImageFFT_IMAGE_TYPE_UNSUPPORTED Input psImage type (%s) is not supported. Valid image types are psF32 and psC32. -psImageFFT_REVERSE_NOT_COMPLEX Input psImage (%s) is not complex. Reverse FFT operation requires a complex psImage input. -psImageFFT_FORWARD_NOT_REAL Input psImage (%s) is not real. Forward FFT operation requires a real psImage input. -psImageFFT_FFTW_PLAN_NULL Could not create a valid FFT plan to perform the transform. -psImageFFT_REAL_IMAG_TYPE_MISMATCH Real psImage type (%s) and imaginary psImage type (%s) must be the same. -psImageFFT_REAL_IMAG_SIZE_MISMATCH Real psImage size (%dx%d) and imaginary psImage size (%dx%d) must be the same. -psImageFFT_NONREAL_NOTSUPPORTED Input psImage type, %s, is required to be either psF32 or psF64. -psImageFFT_NONCOMPLEX_NOTSUPPORTED Input psImage type, %s, is required to be either psC32 or psC64. -psImageFFT_REAL_FORWARD_NOTSUPPORTED The PS_FFT_FORWARD and PS_FFT_REAL_RESULT combinition is not supported. -psImageFFT_FORWARD_REVERSE Can not specify both PS_FFT_FORWARD and PS_FFT_REVERSE options. -psImageFFT_NO_DIRECTION_OPTION Must specify either PS_FFT_FORWARD or PS_FFT_REVERSE option. -# -psImageIO_FILENAME_NULL Specified filename can not be NULL. -psImageIO_FILENAME_INVALID Could not open file,'%s'.\nCFITSIO Error: %s -psImageIO_EXTNAME_INVALID Could not find HDU with extension name '%s' in file %s.\nCFITSIO Error: %s -psImageIO_EXTNUM_INVALID Could not find HDU #%d in file %s.\nCFITSIO Error: %s -psImageIO_DATATYPE_UNKNOWN Could not determine image data type for file %s.\nCFITSIO Error: %s -psImageIO_IMAGE_DIM_UNKNOWN Could not determine image dimensions for file %s.\nCFITSIO Error: %s -psImageIO_IMAGE_SIZE_UNKNOWN Could not determine image size for file %s.\nCFITSIO Error: %s -psImageIO_IMAGE_DIMENSION_UNSUPPORTED Image number of dimensions, %d, is not valid. Only two or three dimensions supported for FITS I/O. -psImageIO_FITS_TYPE_UNSUPPORTED FITS image type, BITPIX=%d, in file %s is not supported. -psImageIO_READ_FAILED Reading from FITS file %s failed.\nCFITSIO Error: %s -psImageIO_TYPE_UNSUPPORTED Input psImage type, %s, is not supported. -psImageIO_WRITE_EXTNUM_INVALID Specified extension number, %d, must not exceed number of HDUs, %d, by more than one. -psImageIO_FILENAME_CREATE_FAILED Could not create file,'%s'.\nCFITSIO Error: %s -psImageIO_CREATE_EXTENSION_FAILED Could not create EXTNAME keyword for file,'%s'.\nCFITSIO Error: %s -psImageIO_CREATE_HDU_FAILED Could not create HDU for writing psImage in file,'%s'.\nCFITSIO Error: %s -psImageIO_WRITE_FAILED Could not write psImage data to file,'%s'.\nCFITSIO Error: %s -# -psImageManip_MAXMIN Specified min value, %g, can not be greater than the specified max value, %g. -psImageManip_MAXMIN_REAL Specified real-portion of min value, %g, can not be greater than the real-portion of max value, %g. -psImageManip_MAXMIN_IMAG Specified imaginary-portion of min value, %g, can not be greater than the imaginary-portion of max value, %g. -psImageManip_OPERATION_NULL Operation can not be NULL. -psImageManip_OVERLAY_TYPE_MISMATCH Input overlay psImage type, %s, must match input psImage type, %s. -psImageManip_CLIP_VALUE_INVALID Specified %s value, %g%+gi, is not the the range of input psImage's valid pixel values (%s), i.e. [%g:%g]. -psImageManip_OVERLAY_OPERATOR_INVALID Specified operation, '%s', is not supported. -psImageManip_SCALE_NOT_POSITIVE Specified scale value, %d, must be a positive value. -psImageManip_INTERPOLATION_MODE_UNSUPPORTED Specified interpolation mode, %d, is unsupported. -psImageConvolve_SHIFT_NULL Specified shift vectors can not be NULL. -psImageConvolve_KERNEL_NULL Specified psKernel can not be NULL. -psImageConvolve_SHIFT_TYPE_MISMATCH Input t-, x-, and y-shift vector types (%s/%s/%s) must match. -psImageConvolve_FFT_FAILED Failed to perform a fourier transform of input image. -psImageConvolve_KERNEL_FFT_FAILED Failed to perform a fourier transform of kernel. -psImageConvolve_KERNEL_TOO_LARGE Specified psKernel size, %dx%d, can not be larger than input psImage size, %dx%d. -psImage_COEFF_NULL Polynomial coefficients cannot be NULL. -psImageManip_TRANSFORM_NULL Specified input transform can not be NULL. -# -psLogMsg_DESTINATION_MALFORMED The specified destination, %s, is malformed. -psLogMsg_DEST_LOCATION_INVALID The location, %s, for protocol 'dest' is invalid. -psLogMsg_OPEN_FILE_FAILED Could not open file '%s' for output. -psLogMsg_UNSUPPORTED_PROTOCOL Do not know how to handle the protocol '%s'. -psLogMsg_UNKNOWN_KEY Unknown logging keyword %c. -# -# Error Messages from psMemory.c: -# -psMemory_NULL_BLOCK NULL memory block found. -psMemory_DEREF_BLOCK_USE Memory block %lu was freed but still being used. -psMemory_UNDERFLOW Memory block %lu is corrupted; buffer underflow detected. -psMemory_OVERFLOW Memory block %lu is corrupted; buffer overflow detected. -psMemory_MULTIPLE_FREE Block %lu, allocated at %s:%d, freed multiple times at %s:%d. -# -# Error Messages from psString.c: -# -psString_NCHAR_NEGATIVE Can not copy a negative number of characters (%d). -# -# Error Messages from psTrace.c: -# -psTrace_NULL_SUBCOMPONENT Sub-component %d of node %s in trace tree is NULL. -psTrace_NULL_TRACETREE Function %s called on a NULL trace level tree. -psTrace_ADD_NULL_COMPONENT Failed to add null component to trace tree. -psTrace_MALFORMED_COMPONENT_NAME Failed to add '%s' to the root component tree; component must start with '.'. -psTrace_FAILED_TO_ADD_COMPONENT Failed to set trace level (%d) to '%s'. -# -# Error Messages from psErrorCodes.c -# -psErrorCode_NULL_ERRORDESCRIPTION Specified psErrorDescription pointer can not be NULL. -psErrorCode_ERRORCODE_REGISTER_FAILED Failed to add input psErrorDescription at array index %d. -# -# Error Messages from psConfigure.c -# -psConfigure_INITIALIZATION_FAILED Failed to initialize %s. -psConfigure_FINALIZATION_FAILED Failed to finalize %s. -# -psXML_IO_FILE_OPEN_FAILED Failed to open file '%s'. Check if it exists and it has the proper permissions. -psXML_INVALID_CONTENT Failed to recognize XML content. Invalid syntax. -psXML_INVALID_DATATYPE Failed to recognize datatype from/for XML file. -psXML_BUFFER_TOO_SMALL Buffer to small to store XML doc. Index: trunk/psLib/src/sys/psConfigure.c =================================================================== --- trunk/psLib/src/sys/psConfigure.c (revision 8231) +++ trunk/psLib/src/sys/psConfigure.c (revision 8232) @@ -13,6 +13,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.13 $ $Name: not supported by cvs2svn $ - * @date $Date: 2006-06-23 01:59:15 $ + * @version $Revision: 1.14 $ $Name: not supported by cvs2svn $ + * @date $Date: 2006-08-08 23:32:23 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -28,5 +28,5 @@ #include "psError.h" #include "psConfigure.h" -#include "psErrorText.h" + #include "config.h" @@ -98,5 +98,5 @@ if (!p_psTimeInit(timeConfig)) { psError(PS_ERR_BAD_PARAMETER_VALUE, true, - PS_ERRORTEXT_psConfigure_INITIALIZATION_FAILED, "psTime"); + _("Failed to initialize %s."), "psTime"); return; } @@ -104,5 +104,5 @@ if (!p_psEOCInit()) { psError(PS_ERR_BAD_PARAMETER_VALUE, true, - PS_ERRORTEXT_psConfigure_INITIALIZATION_FAILED, "psEOC"); + _("Failed to initialize %s."), "psEOC"); return; } @@ -125,5 +125,5 @@ if (!p_psTimeFinalize()) { psError(PS_ERR_UNKNOWN, false, - PS_ERRORTEXT_psConfigure_FINALIZATION_FAILED, "psTime"); + _("Failed to finalize %s."), "psTime"); return; } @@ -132,5 +132,5 @@ if (!p_psEOCFinalize()) { psError(PS_ERR_UNKNOWN, false, - PS_ERRORTEXT_psConfigure_FINALIZATION_FAILED, "psEOC"); + _("Failed to finalize %s."), "psEOC"); return; } Index: trunk/psLib/src/sys/psErrorCodes.c.in =================================================================== --- trunk/psLib/src/sys/psErrorCodes.c.in (revision 8231) +++ trunk/psLib/src/sys/psErrorCodes.c.in (revision 8232) @@ -7,6 +7,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ - * @date $Date: 2006-07-25 01:27:48 $ + * @version $Revision: 1.5 $ $Name: not supported by cvs2svn $ + * @date $Date: 2006-08-08 23:32:23 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -20,5 +20,5 @@ #include "psMemory.h" -#include "psErrorText.h" + static psErrorDescription staticErrorCodes[] = { Index: trunk/psLib/src/sys/psLogMsg.c =================================================================== --- trunk/psLib/src/sys/psLogMsg.c (revision 8231) +++ trunk/psLib/src/sys/psLogMsg.c (revision 8232) @@ -11,6 +11,6 @@ * @author GLG, MHPCC * - * @version $Revision: 1.59 $ $Name: not supported by cvs2svn $ - * @date $Date: 2006-08-03 03:26:28 $ + * @version $Revision: 1.60 $ $Name: not supported by cvs2svn $ + * @date $Date: 2006-08-08 23:32:23 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -36,5 +36,5 @@ #include "psString.h" -#include "psErrorText.h" + #define MIN_LOG_LEVEL 0 @@ -165,5 +165,5 @@ default: psError(PS_ERR_BAD_PARAMETER_VALUE, true, - PS_ERRORTEXT_psLogMsg_UNKNOWN_KEY, *ptr); + _("Unknown logging keyword %c."), *ptr); return false; } @@ -210,5 +210,5 @@ if (fileD == 0) { - psError(PS_ERR_IO, true, PS_ERRORTEXT_psLogMsg_OPEN_FILE_FAILED, + psError(PS_ERR_IO, true, _("Could not open file '%s' for output."), location); psFree(protocolLocation); Index: trunk/psLib/src/sys/psMemory.c =================================================================== --- trunk/psLib/src/sys/psMemory.c (revision 8231) +++ trunk/psLib/src/sys/psMemory.c (revision 8232) @@ -8,6 +8,6 @@ * @author Robert Lupton, Princeton University * -* @version $Revision: 1.74 $ $Name: not supported by cvs2svn $ -* @date $Date: 2006-07-14 02:26:25 $ +* @version $Revision: 1.75 $ $Name: not supported by cvs2svn $ +* @date $Date: 2006-08-08 23:32:23 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -33,5 +33,5 @@ #include "psLine.h" #include "psRegion.h" -#include "psErrorText.h" + #define P_PS_MEMMAGIC (psPtr )0xdeadbeef // Magic number in psMemBlock header @@ -126,5 +126,5 @@ if (ptr->refCounter < 1) { psError(PS_ERR_MEMORY_CORRUPTION, false, - PS_ERRORTEXT_psMemory_MULTIPLE_FREE, + _("Block %lu, allocated at %s:%d, freed multiple times at %s:%d."), (unsigned long)ptr->id, ptr->file, ptr->lineno, file, lineno); } @@ -148,5 +148,5 @@ if (m == NULL) { psError(PS_ERR_MEMORY_CORRUPTION, true, - PS_ERRORTEXT_psMemory_NULL_BLOCK); + _("NULL memory block found.")); return 1; } @@ -155,5 +155,5 @@ // using an unreferenced block of memory, are you? psError(PS_ERR_MEMORY_CORRUPTION, true, - PS_ERRORTEXT_psMemory_DEREF_BLOCK_USE, + _("Memory block %lu was freed but still being used."), (unsigned long)m->id); return 1; @@ -162,5 +162,5 @@ if (m->startblock != P_PS_MEMMAGIC || m->endblock != P_PS_MEMMAGIC) { psError(PS_ERR_MEMORY_CORRUPTION, true, - PS_ERRORTEXT_psMemory_UNDERFLOW, + _("Memory block %lu is corrupted; buffer underflow detected."), (unsigned long)m->id); return 1; @@ -168,5 +168,5 @@ if (*(psPtr *)((int8_t *) (m + 1) + m->userMemorySize) != P_PS_MEMMAGIC) { psError(PS_ERR_MEMORY_CORRUPTION, true, - PS_ERRORTEXT_psMemory_OVERFLOW, + _("Memory block %lu is corrupted; buffer overflow detected."), (unsigned long)m->id); return 1; @@ -506,5 +506,5 @@ psMemBlock* ptr = ((psMemBlock* ) vptr) - 1; - psAbort(__func__,PS_ERRORTEXT_psMemory_MULTIPLE_FREE, + psAbort(__func__,_("Block %lu, allocated at %s:%d, freed multiple times at %s:%d."), (unsigned long)ptr->id, ptr->file, ptr->lineno, filename, lineno); } Index: trunk/psLib/src/sys/psString.c =================================================================== --- trunk/psLib/src/sys/psString.c (revision 8231) +++ trunk/psLib/src/sys/psString.c (revision 8232) @@ -13,6 +13,6 @@ * @author David Robbins, MHPCC * - * @version $Revision: 1.39 $ $Name: not supported by cvs2svn $ - * @date $Date: 2006-07-15 02:50:51 $ + * @version $Revision: 1.40 $ $Name: not supported by cvs2svn $ + * @date $Date: 2006-08-08 23:32:23 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -28,5 +28,5 @@ #include "psAbort.h" -#include "psErrorText.h" + static void stringFree(psString string) @@ -78,5 +78,5 @@ // Log error message and return NULL psError(PS_ERR_BAD_PARAMETER_VALUE, true, - PS_ERRORTEXT_psString_NCHAR_NEGATIVE, + _("Can not copy a negative number of characters (%d)."), nChar); return NULL; Index: trunk/psLib/src/sys/psTrace.c =================================================================== --- trunk/psLib/src/sys/psTrace.c (revision 8231) +++ trunk/psLib/src/sys/psTrace.c (revision 8232) @@ -9,6 +9,6 @@ * @author GLG, MHPCC * - * @version $Revision: 1.64 $ $Name: not supported by cvs2svn $ - * @date $Date: 2006-06-15 00:22:54 $ + * @version $Revision: 1.65 $ $Name: not supported by cvs2svn $ + * @date $Date: 2006-08-08 23:32:23 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -51,5 +51,5 @@ #include "psLogMsg.h" -#include "psErrorText.h" + static p_psComponent* cRoot = NULL; // The root of the trace component @@ -132,5 +132,5 @@ if (NULL == currentNode->subcomp[i]) { psLogMsg("p_psTraceReset", PS_LOG_WARN, - PS_ERRORTEXT_psTrace_NULL_SUBCOMPONENT, + _("Sub-component %d of node %s in trace tree is NULL."), i, currentNode->name); } else { @@ -165,5 +165,5 @@ if (strcmp("", addNodeName) == 0) { psError(PS_ERR_BAD_PARAMETER_NULL,true, - PS_ERRORTEXT_psTrace_ADD_NULL_COMPONENT); + _("Failed to add null component to trace tree.")); return false; } @@ -177,5 +177,5 @@ if (addNodeName[0] != '.') { psError(PS_ERR_BAD_PARAMETER_VALUE,true, - PS_ERRORTEXT_psTrace_MALFORMED_COMPONENT_NAME, + _("Failed to add '%s' to the root component tree; component must start with '.'."), addNodeName); return false; @@ -274,5 +274,5 @@ if ( !componentAdd(compName, level) ) { psError(PS_ERR_UNKNOWN, false, - PS_ERRORTEXT_psTrace_FAILED_TO_ADD_COMPONENT, + _("Failed to set trace level (%d) to '%s'."), level, compName); @@ -346,5 +346,5 @@ if (NULL == currentNode->subcomp[i]) { psLogMsg("p_psTraceReset", PS_LOG_WARN, - PS_ERRORTEXT_psTrace_NULL_SUBCOMPONENT, + _("Sub-component %d of node %s in trace tree is NULL."), i, currentNode->name); } @@ -504,5 +504,5 @@ if (NULL == comp) { psError(PS_ERR_BAD_PARAMETER_NULL, true, - PS_ERRORTEXT_psTrace_NULL_TRACETREE, + _("Function %s called on a NULL trace level tree."), __func__); return; @@ -705,5 +705,5 @@ default: psError(PS_ERR_BAD_PARAMETER_VALUE, true, - PS_ERRORTEXT_psLogMsg_UNKNOWN_KEY, *ptr); + _("Unknown logging keyword %c."), *ptr); return false; } Index: trunk/psLib/src/types/psArguments.c =================================================================== --- trunk/psLib/src/types/psArguments.c (revision 8231) +++ trunk/psLib/src/types/psArguments.c (revision 8232) @@ -7,6 +7,6 @@ * @author David Robbins, MHPCC * - * @version $Revision: 1.8 $ $Name: not supported by cvs2svn $ - * @date $Date: 2006-08-02 02:28:04 $ + * @version $Revision: 1.9 $ $Name: not supported by cvs2svn $ + * @date $Date: 2006-08-08 23:32:23 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -21,5 +21,5 @@ #include "psError.h" #include "psAbort.h" -#include "psErrorText.h" + #include "psLogMsg.h" #include "psTrace.h" Index: trunk/psLib/src/types/psArray.c =================================================================== --- trunk/psLib/src/types/psArray.c (revision 8231) +++ trunk/psLib/src/types/psArray.c (revision 8232) @@ -9,6 +9,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.45 $ $Name: not supported by cvs2svn $ - * @date $Date: 2006-07-15 02:57:12 $ + * @version $Revision: 1.46 $ $Name: not supported by cvs2svn $ + * @date $Date: 2006-08-08 23:32:23 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -28,5 +28,5 @@ #include "psLogMsg.h" -#include "psErrorText.h" + /***************************************************************************** @@ -79,5 +79,5 @@ { if (in == NULL) { - psError(PS_ERR_BAD_PARAMETER_NULL,true,PS_ERRORTEXT_psArray_REALLOC_NULL); + psError(PS_ERR_BAD_PARAMETER_NULL,true,_("psArrayRealloc must be given a non-NULL psArray to resize.")); return NULL; } else if (in->nalloc != nalloc) { // No need to realloc to same size @@ -132,5 +132,5 @@ if (array == NULL) { psError(PS_ERR_BAD_PARAMETER_NULL, true, - PS_ERRORTEXT_psArray_ARRAY_NULL); + _("Specified psArray can not be NULL.")); return false; } @@ -184,5 +184,5 @@ { psError(PS_ERR_BAD_PARAMETER_NULL, true, - PS_ERRORTEXT_psArray_ARRAY_NULL); + _("Specified psArray can not be NULL.")); return false; } @@ -208,5 +208,5 @@ if (position >= array->nalloc) { psError(PS_ERR_BAD_PARAMETER_NULL, true, - PS_ERRORTEXT_psArray_POSITION_BEYOND_NALLOC, + _("Specified position, %d, is greater than the allocated size of the array, %d."), position, array->nalloc); return false; @@ -226,5 +226,5 @@ if (array == NULL) { psError(PS_ERR_BAD_PARAMETER_NULL, true, - PS_ERRORTEXT_psArray_ARRAY_NULL); + _("Specified psArray can not be NULL.")); return NULL; } Index: trunk/psLib/src/types/psBitSet.c =================================================================== --- trunk/psLib/src/types/psBitSet.c (revision 8231) +++ trunk/psLib/src/types/psBitSet.c (revision 8232) @@ -11,6 +11,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.32 $ $Name: not supported by cvs2svn $ - * @date $Date: 2006-07-15 02:57:12 $ + * @version $Revision: 1.33 $ $Name: not supported by cvs2svn $ + * @date $Date: 2006-08-08 23:32:23 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -28,5 +28,5 @@ #include "psString.h" -#include "psErrorText.h" + enum { @@ -82,5 +82,5 @@ if (nalloc < 0) { psError(PS_ERR_BAD_PARAMETER_VALUE, true, - PS_ERRORTEXT_psBitSet_ALLOC_NEG_SIZE, + _("The number of bit in a psBitSet (%d) must be greater than zero."), nalloc); return NULL; @@ -108,10 +108,10 @@ if (bitSet == NULL) { psError(PS_ERR_BAD_PARAMETER_NULL, true, - PS_ERRORTEXT_psBitSet_SET_NULL); + _("Can not operate on a NULL psBitSet.")); return bitSet; } else if ( (bit < 0) || (bit > bitSet->n * 8 - 1) ) { psError(PS_ERR_BAD_PARAMETER_VALUE, true, - PS_ERRORTEXT_psBitSet_BIT_OUTOFRANGE, + _("The specified bit position (%d) is invalid. Position must be between 0 and %d."), bit,bitSet->n * 8 - 1); return bitSet; @@ -131,10 +131,10 @@ if (bitSet == NULL) { psError(PS_ERR_BAD_PARAMETER_NULL, true, - PS_ERRORTEXT_psBitSet_SET_NULL); + _("Can not operate on a NULL psBitSet.")); return bitSet; } else if ( (bit < 0) || (bit > bitSet->n * 8 - 1) ) { psError(PS_ERR_BAD_PARAMETER_VALUE, true, - PS_ERRORTEXT_psBitSet_BIT_OUTOFRANGE, + _("The specified bit position (%d) is invalid. Position must be between 0 and %d."), bit,bitSet->n * 8 - 1); return bitSet; @@ -154,10 +154,10 @@ if (bitSet == NULL) { psError(PS_ERR_BAD_PARAMETER_NULL, true, - PS_ERRORTEXT_psBitSet_SET_NULL); + _("Can not operate on a NULL psBitSet.")); return false; } else if ( (bit < 0) || (bit > bitSet->n * 8 - 1) ) { psError(PS_ERR_BAD_PARAMETER_VALUE, true, - PS_ERRORTEXT_psBitSet_BIT_OUTOFRANGE, + _("The specified bit position (%d) is invalid. Position must be between 0 and %d."), bit,bitSet->n * 8 - 1); return false; @@ -183,5 +183,5 @@ if (inBitSet1 == NULL) { psError(PS_ERR_BAD_PARAMETER_NULL, true, - PS_ERRORTEXT_psBitSet_FIRST_OPERAND_NULL); + _("First psBitSet operand can not be NULL.")); psFree(outBitSet); return NULL; @@ -191,5 +191,5 @@ if (operator == NULL) { psError(PS_ERR_BAD_PARAMETER_NULL, true, - PS_ERRORTEXT_psBitSet_OPERATOR_NULL); + _("Specified operator is NULL. Must specify desired operator.")); psFree(outBitSet); return NULL; @@ -208,5 +208,5 @@ psFree(outBitSet); psError(PS_ERR_BAD_PARAMETER_VALUE, true, - PS_ERRORTEXT_psBitSet_OPERATOR_INVALID, + _("Specified operator, %s, is invalid. Valid operators are AND, OR, and XOR."), operator); return NULL; @@ -216,5 +216,5 @@ if (inBitSet2 == NULL) { psError(PS_ERR_BAD_PARAMETER_NULL, true, - PS_ERRORTEXT_psBitSet_SECOND_OPERAND_NULL); + _("Second psBitSet operand can not be NULL.")); psFree(outBitSet); return NULL; @@ -223,5 +223,5 @@ if (inBitSet1->n != inBitSet2->n) { psError(PS_ERR_BAD_PARAMETER_SIZE, true, - PS_ERRORTEXT_psBitSet_OPERANDS_SIZE_DIFFER); + _("The psBitSet operand must be the same size.")); psFree(outBitSet); return NULL; @@ -274,5 +274,5 @@ if (inBitSet == NULL) { psError(PS_ERR_BAD_PARAMETER_NULL, true, - PS_ERRORTEXT_psBitSet_OPERAND_NULL); + _("Operand can not be NULL.")); psFree(outBitSet); return NULL; @@ -283,5 +283,5 @@ if (outBitSet == NULL) { psError(PS_ERR_UNKNOWN, false, - PS_ERRORTEXT_psBitSet_NOT_OP_FAILED); + _("Could not perform NOT operation.")); } Index: trunk/psLib/src/types/psHash.c =================================================================== --- trunk/psLib/src/types/psHash.c (revision 8231) +++ trunk/psLib/src/types/psHash.c (revision 8232) @@ -12,6 +12,6 @@ * @author GLG, MHPCC * -* @version $Revision: 1.26 $ $Name: not supported by cvs2svn $ -* @date $Date: 2006-07-15 02:57:12 $ +* @version $Revision: 1.27 $ $Name: not supported by cvs2svn $ +* @date $Date: 2006-08-08 23:32:23 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -27,5 +27,5 @@ #include "psAssert.h" -#include "psErrorText.h" + static psHashBucket* hashBucketAlloc(const char *key, psPtr data, psHashBucket* next); @@ -240,5 +240,5 @@ if ((table == NULL) || (key == NULL)) { psError(PS_ERR_BAD_PARAMETER_NULL, true, - PS_ERRORTEXT_psHash_KEY_NULL); + _("Input key can not be NULL.")); return NULL; } Index: trunk/psLib/src/types/psList.c =================================================================== --- trunk/psLib/src/types/psList.c (revision 8231) +++ trunk/psLib/src/types/psList.c (revision 8232) @@ -6,6 +6,6 @@ * @author Robert Daniel DeSonia, MHPCC * - * @version $Revision: 1.50 $ $Name: not supported by cvs2svn $ - * @date $Date: 2006-07-15 02:57:12 $ + * @version $Revision: 1.51 $ $Name: not supported by cvs2svn $ + * @date $Date: 2006-08-08 23:32:23 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -21,5 +21,5 @@ #include "psLogMsg.h" -#include "psErrorText.h" + #define ITER_INIT_HEAD ((psPtr )1) // next iteration should return head @@ -206,5 +206,5 @@ if (location < 0 || location >= (int)list->n) { psError(PS_ERR_BAD_PARAMETER_VALUE, true, - PS_ERRORTEXT_psList_LOCATION_INVALID, + _("Specified location, %d, is invalid."), location); return false; @@ -248,5 +248,5 @@ if (list == NULL) { psError(PS_ERR_BAD_PARAMETER_NULL, true, - PS_ERRORTEXT_psList_LIST_NULL); + _("Specified psList reference is NULL.")); return false; } @@ -254,5 +254,5 @@ if (data == NULL) { psError(PS_ERR_BAD_PARAMETER_NULL, true, - PS_ERRORTEXT_psList_DATA_NULL); + _("Specified data item is NULL.")); return false; } @@ -283,5 +283,5 @@ if (data == NULL) { psError(PS_ERR_BAD_PARAMETER_NULL, true, - PS_ERRORTEXT_psList_DATA_NULL); + _("Specified data item is NULL.")); return false; } @@ -289,5 +289,5 @@ if (iterator == NULL) { psError(PS_ERR_BAD_PARAMETER_NULL, true, - PS_ERRORTEXT_psList_ITERATOR_NULL); + _("Specified iterator is NULL.")); return false; } @@ -296,5 +296,5 @@ if (!iterator->mutable) { psError(PS_ERR_BAD_PARAMETER_NULL, true, - PS_ERRORTEXT_psList_ITERATOR_NONMUTABLE); + _("Specified iterator indicates list is non-mutable.")); return false; } @@ -305,5 +305,5 @@ if (cursor == NULL && list->head != NULL) { psError(PS_ERR_BAD_PARAMETER_VALUE, true, - PS_ERRORTEXT_psList_ITERATOR_INVALID); + _("Specified iterator is not valid.")); return false; } @@ -352,5 +352,5 @@ if (data == NULL) { psError(PS_ERR_BAD_PARAMETER_NULL, true, - PS_ERRORTEXT_psList_DATA_NULL); + _("Specified data item is NULL.")); return false; } @@ -358,5 +358,5 @@ if (iterator == NULL) { psError(PS_ERR_BAD_PARAMETER_NULL, true, - PS_ERRORTEXT_psList_ITERATOR_NULL); + _("Specified iterator is NULL.")); return false; } @@ -365,5 +365,5 @@ if (!iterator->mutable) { psError(PS_ERR_BAD_PARAMETER_NULL, true, - PS_ERRORTEXT_psList_ITERATOR_NONMUTABLE); + _("Specified iterator indicates list is non-mutable.")); return false; } @@ -374,5 +374,5 @@ if (cursor == NULL && list->head != NULL) { psError(PS_ERR_BAD_PARAMETER_VALUE, true, - PS_ERRORTEXT_psList_ITERATOR_INVALID); + _("Specified iterator is not valid.")); return false; } @@ -422,5 +422,5 @@ if (list == NULL) { psError(PS_ERR_BAD_PARAMETER_NULL, true, - PS_ERRORTEXT_psList_LIST_NULL); + _("Specified psList reference is NULL.")); return false; } @@ -440,5 +440,5 @@ if (list == NULL) { psError(PS_ERR_BAD_PARAMETER_NULL, true, - PS_ERRORTEXT_psList_LIST_NULL); + _("Specified psList reference is NULL.")); return false; } @@ -446,5 +446,5 @@ if (data == NULL) { psError(PS_ERR_BAD_PARAMETER_NULL, true, - PS_ERRORTEXT_psList_DATA_NULL); + _("Specified data item is NULL.")); return false; } @@ -458,5 +458,5 @@ if (elem == NULL) { psError(PS_ERR_BAD_PARAMETER_NULL, true, - PS_ERRORTEXT_psList_DATA_NOT_FOUND); + _("Specified data item is not found in the psList.")); return false; } @@ -473,5 +473,5 @@ if (list == NULL) { psError(PS_ERR_BAD_PARAMETER_NULL, true, - PS_ERRORTEXT_psList_LIST_NULL); + _("Specified psList reference is NULL.")); return NULL; } @@ -485,5 +485,5 @@ if (! psListIteratorSet(iterator,location)) { psError(PS_ERR_BAD_PARAMETER_VALUE, true, - PS_ERRORTEXT_psList_LOCATION_INVALID, + _("Specified location, %d, is invalid."), location); return NULL; Index: trunk/psLib/src/types/psLookupTable.c =================================================================== --- trunk/psLib/src/types/psLookupTable.c (revision 8231) +++ trunk/psLib/src/types/psLookupTable.c (revision 8232) @@ -7,6 +7,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.34 $ $Name: not supported by cvs2svn $ -* @date $Date: 2006-07-20 13:00:10 $ +* @version $Revision: 1.35 $ $Name: not supported by cvs2svn $ +* @date $Date: 2006-08-08 23:32:23 $ * * Copyright 2004-2005 Maui High Performance Computing Center, Univ. of Hawaii @@ -25,5 +25,5 @@ #include "psError.h" #include "psLookupTable.h" -#include "psErrorText.h" + #include "psAssert.h" @@ -487,5 +487,5 @@ // Open specified file if((fp=fopen(filename, "r")) == NULL) { - psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psLookupTable_FILE_NOT_FOUND, + psError(PS_ERR_BAD_PARAMETER_VALUE, true, _("Failed to open file %s."), filename); psFree(outputArray); @@ -813,5 +813,5 @@ if(hiIdx >= numRows) { psError(PS_ERR_BAD_PARAMETER_VALUE, true, - PS_ERRORTEXT_psLookupTable_INTERPOLATE_HIGH, hiIdx); + _("High index too big, %d."), hiIdx); return NAN; } @@ -823,5 +823,5 @@ if(loIdx < 0) { psError(PS_ERR_BAD_PARAMETER_VALUE, true, - PS_ERRORTEXT_psLookupTable_INTERPOLATE_LOW, loIdx); + _("Low index too small, %d."), loIdx); return NAN; } @@ -832,5 +832,5 @@ denom -= convertVal; if(fabs(denom) < FLT_EPSILON) { - psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psLookupTable_DIVIDE_BY_ZERO); + psError(PS_ERR_BAD_PARAMETER_VALUE, true, _("Divide by zero error during interpolation.")); return NAN; } else { Index: trunk/psLib/src/types/psMetadata.c =================================================================== --- trunk/psLib/src/types/psMetadata.c (revision 8231) +++ trunk/psLib/src/types/psMetadata.c (revision 8232) @@ -12,6 +12,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.120 $ $Name: not supported by cvs2svn $ - * @date $Date: 2006-07-19 03:43:14 $ + * @version $Revision: 1.121 $ $Name: not supported by cvs2svn $ + * @date $Date: 2006-08-08 23:32:23 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -36,5 +36,5 @@ #include "psLookupTable.h" #include "psString.h" -#include "psErrorText.h" + #include "psAssert.h" #include "psLogMsg.h" @@ -319,5 +319,5 @@ break; default: - psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psMetadata_METATYPE_INVALID, type); + psError(PS_ERR_BAD_PARAMETER_VALUE, true, _("Specified psDataType, %d, is not supported."), type); psFree(metadataItem); metadataItem = NULL; @@ -554,5 +554,5 @@ // add to the hash's list of duplicate entries if (! psListAdd(existingEntry->data.list, PS_LIST_TAIL, (psPtr)item) ) { - psError(PS_ERR_UNKNOWN,false,PS_ERRORTEXT_psMetadata_ADD_COLLECTION_FAILED,key); + psError(PS_ERR_UNKNOWN,false,_("Failed to add metadata item, %s, to metadata collection list."),key); return false; } @@ -565,5 +565,5 @@ // treat as if new (added to list below) if(!psHashAdd(mdTable, key, (psPtr)item)) { - psError(PS_ERR_UNKNOWN,false,PS_ERRORTEXT_psMetadata_ADD_TABLE_FAILED,key); + psError(PS_ERR_UNKNOWN,false,_("Failed to add metadata item, %s, to items table."),key); return false; } @@ -578,5 +578,5 @@ } psError(PS_ERR_BAD_PARAMETER_VALUE, true, - PS_ERRORTEXT_psMetadata_DUPLICATE_NOT_ALLOWED); + _("Duplicate metadata item name is not allowed. Use a psMetadataFlags option to allow such action.")); return false; } @@ -586,5 +586,5 @@ // Node doesn't exist - Add new metadata item to metadata collection's hash if(!psHashAdd(mdTable, key, (psPtr)item)) { - psError(PS_ERR_UNKNOWN,false,PS_ERRORTEXT_psMetadata_ADD_TABLE_FAILED,key); + psError(PS_ERR_UNKNOWN,false,_("Failed to add metadata item, %s, to items table."),key); return false; } @@ -597,5 +597,5 @@ if(!psListAdd(mdList, location, (psPtr)item)) { - psError(PS_ERR_UNKNOWN,false,PS_ERRORTEXT_psMetadata_ADD_COLLECTION_FAILED,key); + psError(PS_ERR_UNKNOWN,false,_("Failed to add metadata item, %s, to metadata collection list."),key); return false; } @@ -635,5 +635,5 @@ if (!psMetadataAddItem(md, metadataItem, location, format & PS_METADATA_FLAGS_MASK)) { - psError(PS_ERR_UNKNOWN,false,PS_ERRORTEXT_psMetadata_ADD_FAILED); + psError(PS_ERR_UNKNOWN,false,_("Failed to add metadata item to metadata collection list.")); psFree(metadataItem); return false; @@ -717,5 +717,5 @@ psMetadataItem* entry = psHashLookup(mdTable,key); if (entry == NULL) { - psError(PS_ERR_UNKNOWN, false, PS_ERRORTEXT_psMetadata_REMOVE_TABLE_FAILED, key); + psError(PS_ERR_UNKNOWN, false, _("Failed to remove metadata item, %s, from metadata table."), key); return false; } @@ -739,5 +739,5 @@ psMetadataItem* entry = psListGet(mdList, where); if (entry == NULL) { - psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psMetadata_FIND_INDEX_FAILED, where); + psError(PS_ERR_BAD_PARAMETER_VALUE, true, _("Could not find metadata item at index %d."), where); return false; } @@ -745,5 +745,5 @@ if (key == NULL) { - psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psMetadata_REMOVE_LIST_INDEX_FAILED, where); + psError(PS_ERR_BAD_PARAMETER_VALUE, true, _("Failed to remove metadata item, at index %d, from metadata list."), where); return false; } @@ -751,5 +751,5 @@ psMetadataItem* tableItem = psHashLookup(mdTable, key); if (tableItem == NULL) { - psError(PS_ERR_UNKNOWN, false, PS_ERRORTEXT_psMetadata_REMOVE_TABLE_FAILED, key); + psError(PS_ERR_UNKNOWN, false, _("Failed to remove metadata item, %s, from metadata table."), key); return false; } @@ -760,5 +760,5 @@ } else { if (!psHashRemove(mdTable, key)) { - psError(PS_ERR_UNKNOWN, false, PS_ERRORTEXT_psMetadata_REMOVE_TABLE_FAILED, key); + psError(PS_ERR_UNKNOWN, false, _("Failed to remove metadata item, %s, from metadata table."), key); return false; } @@ -828,5 +828,5 @@ } psError(PS_ERR_BAD_PARAMETER_VALUE, true, - PS_ERRORTEXT_psMetadata_METATYPE_INVALID, + _("Specified psDataType, %d, is not supported."), metadataItem->type); return NULL; @@ -928,5 +928,5 @@ entry = (psMetadataItem*) psListGet(md->list, location); if (entry == NULL) { - psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psMetadata_FIND_INDEX_FAILED, location); + psError(PS_ERR_BAD_PARAMETER_VALUE, true, _("Could not find metadata item at index %d."), location); return NULL; } @@ -954,5 +954,5 @@ regerror(regRtn, newIter->regex, errMsg, 256); psError(PS_ERR_BAD_PARAMETER_VALUE, true, - PS_ERRORTEXT_psMetadata_REGEX_INVALID, + _("Specified regular expression is invalid. %s."), errMsg); psFree(newIter); @@ -1333,5 +1333,5 @@ default: psError(PS_ERR_BAD_PARAMETER_VALUE, true, - PS_ERRORTEXT_psMetadata_METATYPE_INVALID, vector->type.type); + _("Specified psDataType, %d, is not supported."), vector->type.type); return false; } Index: trunk/psLib/src/types/psMetadataConfig.c =================================================================== --- trunk/psLib/src/types/psMetadataConfig.c (revision 8231) +++ trunk/psLib/src/types/psMetadataConfig.c (revision 8232) @@ -10,6 +10,6 @@ * @author Eric Van Alst, MHPCC * -* @version $Revision: 1.69 $ $Name: not supported by cvs2svn $ -* @date $Date: 2006-08-04 22:58:58 $ +* @version $Revision: 1.70 $ $Name: not supported by cvs2svn $ +* @date $Date: 2006-08-08 23:32:23 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -32,5 +32,5 @@ #include "psMetadataConfig.h" #include "psAssert.h" -#include "psErrorText.h" + /******************************************************************************/ @@ -399,5 +399,5 @@ *status = 1; psError(PS_ERR_BAD_PARAMETER_VALUE,true, - PS_ERRORTEXT_psMetadataIO_TYPE_INVALID, + _("Specified type, %d, is not supported."), elemType); } @@ -510,5 +510,5 @@ default: \ psError(PS_ERR_BAD_PARAMETER_TYPE,true, \ - PS_ERRORTEXT_psMetadata_METATYPE_INVALID, (int)type); \ + _("Specified psDataType, %d, is not supported."), (int)type); \ success = false; \ } \ @@ -542,5 +542,5 @@ } else { psError(PS_ERR_BAD_PARAMETER_TYPE,true, - PS_ERRORTEXT_psMetadata_METATYPE_INVALID, (int)type); + _("Specified psDataType, %d, is not supported."), (int)type); success = false; } @@ -551,5 +551,5 @@ default: psError(PS_ERR_BAD_PARAMETER_TYPE, true, - PS_ERRORTEXT_psMetadata_FORMAT_INVALID, *fType); + _("Specified print format, %%%c, is not supported."), *fType); break; } @@ -709,5 +709,5 @@ // Check for no type if(strType==NULL) { - psError(PS_ERR_IO, true, PS_ERRORTEXT_psMetadataIO_FILE_ELEMENT_NULL, "type",lineCount, + psError(PS_ERR_IO, true, _("Failed to read a metadata %s on line %u of %s."), "type",lineCount, fileName); returnValue = false; @@ -741,5 +741,5 @@ vectorType = PS_TYPE_F64; } else { - psError(PS_ERR_IO, true, PS_ERRORTEXT_psMetadataIO_PARSE_FAILED, "", keyName, + psError(PS_ERR_IO, true, _("Failed to parse the value '%s' of metadata item %s, type %s, on line %u of %s."), "", keyName, strType, lineCount, fileName); psFree(strType); @@ -786,5 +786,5 @@ // Check for add failure if (! addStatus) { - psError(PS_ERR_IO, true, PS_ERRORTEXT_psMetadataIO_OVERWRITE_ITEM, + psError(PS_ERR_IO, true, _("Duplicate Metadata item, %s, found on line %u of %s. Overwrite not allowed."), keyName, lineCount, fileName); psFree(strType); @@ -795,5 +795,5 @@ } else { // Metadata type read error - psError(PS_ERR_IO,true,PS_ERRORTEXT_psMetadataIO_FILE_ELEMENT_NULL, + psError(PS_ERR_IO,true,_("Failed to read a metadata %s on line %u of %s."), keyName,lineCount,fileName); psFree(strType); @@ -805,5 +805,5 @@ } if(!typeFound) { - psError(PS_ERR_IO, true, PS_ERRORTEXT_psMetadataIO_FILE_TYPE_INVALID, + psError(PS_ERR_IO, true, _("Metadata type '%s', found on line %u of %s, is invalid."), strType, lineCount,fileName); psFree(strType); @@ -822,5 +822,5 @@ strValue = getToken(&linePtr, "#", &status,true); if(status) { - psError(PS_ERR_IO, true, PS_ERRORTEXT_psMetadataIO_FILE_ELEMENT_NULL, "value", lineCount, + psError(PS_ERR_IO, true, _("Failed to read a metadata %s on line %u of %s."), "value", lineCount, fileName); psFree(strType); @@ -829,5 +829,5 @@ } if(strValue==NULL) { - psError(PS_ERR_IO, true, PS_ERRORTEXT_psMetadataIO_FILE_ELEMENT_NULL, "value", lineCount, + psError(PS_ERR_IO, true, _("Failed to read a metadata %s on line %u of %s."), "value", lineCount, fileName); psFree(strType); @@ -839,5 +839,5 @@ strComment = getToken(&linePtr,"~", &status,true); if(status) { - psError(PS_ERR_IO, true, PS_ERRORTEXT_psMetadataIO_FILE_ELEMENT_NULL, "comment", lineCount, + psError(PS_ERR_IO, true, _("Failed to read a metadata %s on line %u of %s."), "comment", lineCount, fileName); psFree(strType); @@ -864,5 +864,5 @@ strComment, tempBool); } else { - psError(PS_ERR_IO, true, PS_ERRORTEXT_psMetadataIO_PARSE_FAILED, strValue, keyName, + psError(PS_ERR_IO, true, _("Failed to parse the value '%s' of metadata item %s, type %s, on line %u of %s."), strValue, keyName, strType, lineCount, fileName); returnValue = false; @@ -878,5 +878,5 @@ } else { psError(PS_ERR_IO, true, - PS_ERRORTEXT_psMetadataIO_PARSE_FAILED, strValue, keyName, strType, lineCount, + _("Failed to parse the value '%s' of metadata item %s, type %s, on line %u of %s."), strValue, keyName, strType, lineCount, fileName); returnValue = false; @@ -888,5 +888,5 @@ addStatus = psMetadataAdd(md, PS_LIST_TAIL, keyName, mdType | flags, strComment, tempInt); } else { - psError(PS_ERR_IO, true, PS_ERRORTEXT_psMetadataIO_PARSE_FAILED, strValue, keyName, + psError(PS_ERR_IO, true, _("Failed to parse the value '%s' of metadata item %s, type %s, on line %u of %s."), strValue, keyName, strType, lineCount, fileName); returnValue = false; @@ -898,5 +898,5 @@ addStatus = psMetadataAdd(md, PS_LIST_TAIL, keyName, mdType | flags, strComment, tempInt); } else { - psError(PS_ERR_IO, true, PS_ERRORTEXT_psMetadataIO_PARSE_FAILED, strValue, keyName, + psError(PS_ERR_IO, true, _("Failed to parse the value '%s' of metadata item %s, type %s, on line %u of %s."), strValue, keyName, strType, lineCount, fileName); returnValue = false; @@ -908,5 +908,5 @@ addStatus = psMetadataAdd(md, PS_LIST_TAIL, keyName, mdType | flags, strComment, tempInt); } else { - psError(PS_ERR_IO, true, PS_ERRORTEXT_psMetadataIO_PARSE_FAILED, strValue, keyName, + psError(PS_ERR_IO, true, _("Failed to parse the value '%s' of metadata item %s, type %s, on line %u of %s."), strValue, keyName, strType, lineCount, fileName); returnValue = false; @@ -918,5 +918,5 @@ addStatus = psMetadataAdd(md, PS_LIST_TAIL, keyName, mdType | flags, strComment, tempUint); } else { - psError(PS_ERR_IO, true, PS_ERRORTEXT_psMetadataIO_PARSE_FAILED, strValue, keyName, + psError(PS_ERR_IO, true, _("Failed to parse the value '%s' of metadata item %s, type %s, on line %u of %s."), strValue, keyName, strType, lineCount, fileName); returnValue = false; @@ -928,5 +928,5 @@ addStatus = psMetadataAdd(md, PS_LIST_TAIL, keyName, mdType | flags, strComment, tempUint); } else { - psError(PS_ERR_IO, true, PS_ERRORTEXT_psMetadataIO_PARSE_FAILED, strValue, keyName, + psError(PS_ERR_IO, true, _("Failed to parse the value '%s' of metadata item %s, type %s, on line %u of %s."), strValue, keyName, strType, lineCount, fileName); returnValue = false; @@ -938,5 +938,5 @@ addStatus = psMetadataAdd(md, PS_LIST_TAIL, keyName, mdType | flags, strComment, tempUint); } else { - psError(PS_ERR_IO, true, PS_ERRORTEXT_psMetadataIO_PARSE_FAILED, strValue, keyName, + psError(PS_ERR_IO, true, _("Failed to parse the value '%s' of metadata item %s, type %s, on line %u of %s."), strValue, keyName, strType, lineCount, fileName); returnValue = false; @@ -958,5 +958,5 @@ strComment, mTime); } else { - psError(PS_ERR_IO, true, PS_ERRORTEXT_psMetadataIO_PARSE_FAILED, strValue, keyName, + psError(PS_ERR_IO, true, _("Failed to parse the value '%s' of metadata item %s, type %s, on line %u of %s."), strValue, keyName, strType, lineCount, fileName); returnValue = false; @@ -971,5 +971,5 @@ strComment, tempVec); } else { - psError(PS_ERR_IO, true, PS_ERRORTEXT_psMetadataIO_PARSE_FAILED, strValue, keyName, + psError(PS_ERR_IO, true, _("Failed to parse the value '%s' of metadata item %s, type %s, on line %u of %s."), strValue, keyName, strType, lineCount, fileName); returnValue = false; @@ -983,5 +983,5 @@ for(psS32 k=0; k < nonUniqueKeys->n; k++) { if(strcmp(keyName,(char*)nonUniqueKeys->data[k]) == 0) { - psError(PS_ERR_IO,true,PS_ERRORTEXT_psMetadataIO_DUPLICATE_MULTI, + psError(PS_ERR_IO,true,_("Duplicate MULTI specifier on line %u of %s."), lineCount,fileName); psFree(strType); @@ -1009,5 +1009,5 @@ break; default: - psError(PS_ERR_IO,true,PS_ERRORTEXT_psMetadataIO_FILE_TYPE_INVALID, + psError(PS_ERR_IO,true,_("Metadata type '%s', found on line %u of %s, is invalid."), lineCount,fileName); break; @@ -1057,5 +1057,5 @@ if(repeatedChars(linePtr, '@') > 1) { psError(PS_ERR_IO, true, - PS_ERRORTEXT_psMetadataIO_FILE_MULTIPLE_CHAR, '@', lineCount, fileName); + _("More than one '%c' character not allowed. Found on line %u of %s."), '@', lineCount, fileName); return false; } @@ -1065,5 +1065,5 @@ if(status) { psError(PS_ERR_IO, true, - PS_ERRORTEXT_psMetadataIO_FILE_ELEMENT_NULL, "keyName", lineCount, fileName); + _("Failed to read a metadata %s on line %u of %s."), "keyName", lineCount, fileName); psFree(keyName); return false; @@ -1075,5 +1075,5 @@ strType = getToken(&linePtr," ",&status,true); if(strType == NULL) { - psError(PS_ERR_IO,true,PS_ERRORTEXT_psMetadataIO_FILE_ELEMENT_NULL,"type",lineCount, + psError(PS_ERR_IO,true,_("Failed to read a metadata %s on line %u of %s."),"type",lineCount, fileName); psFree(keyName); @@ -1089,5 +1089,5 @@ // Compare type name with the list of current types if(strcmp(strType,(char*)typeArray->data[k]) == 0) { - psError(PS_ERR_IO,true,PS_ERRORTEXT_psMetadataIO_TYPE_DUPLICATE, + psError(PS_ERR_IO,true,_("Specified type, %s, on line %u of %s is already defined."), strType,lineCount,fileName); psFree(tempTemplate); @@ -1104,5 +1104,5 @@ psFree(tempTemplate); } else { - psError(PS_ERR_IO,true,PS_ERRORTEXT_psMetadataIO_FILE_TYPE_INVALID, + psError(PS_ERR_IO,true,_("Metadata type '%s', found on line %u of %s, is invalid."), strType,lineCount,fileName); psFree(keyName); @@ -1187,5 +1187,5 @@ // Attempt to open specified file if((fp=fopen(filename, "r")) == NULL) { - psError(PS_ERR_IO, true, PS_ERRORTEXT_psMetadataIO_FILE_OPEN_FAILED, filename); + psError(PS_ERR_IO, true, _("Failed to open file '%s'. Check if it exists and it has the proper permissions."), filename); return NULL; } @@ -1246,5 +1246,5 @@ // XXX : this is probably not the right error value psError(PS_ERR_BAD_PARAMETER_VALUE, true, - PS_ERRORTEXT_psMetadata_METATYPE_INVALID, PS_DATA_UNKNOWN); + _("Specified psDataType, %d, is not supported."), PS_DATA_UNKNOWN); psFree(keys); psFree(format); @@ -1385,5 +1385,5 @@ psStringAppend(&content, "PS_TIME_TT "); else { - psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psMetadata_METATYPE_INVALID, time->type); + psError(PS_ERR_BAD_PARAMETER_VALUE, true, _("Specified psDataType, %d, is not supported."), time->type); psFree(content); return NULL; @@ -1469,5 +1469,5 @@ default: psError(PS_ERR_BAD_PARAMETER_VALUE, true, - PS_ERRORTEXT_psMetadata_METATYPE_INVALID, vector->type.type); + _("Specified psDataType, %d, is not supported."), vector->type.type); psFree(content); return NULL; @@ -1481,5 +1481,5 @@ default: psError(PS_ERR_BAD_PARAMETER_VALUE, true, - PS_ERRORTEXT_psMetadata_METATYPE_INVALID, item->type); + _("Specified psDataType, %d, is not supported."), item->type); psFree(content); return NULL; Index: trunk/psLib/src/types/psPixels.c =================================================================== --- trunk/psLib/src/types/psPixels.c (revision 8231) +++ trunk/psLib/src/types/psPixels.c (revision 8232) @@ -7,6 +7,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.24 $ $Name: not supported by cvs2svn $ - * @date $Date: 2006-07-15 02:57:12 $ + * @version $Revision: 1.25 $ $Name: not supported by cvs2svn $ + * @date $Date: 2006-08-08 23:32:23 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -20,5 +20,5 @@ #include "psError.h" -#include "psErrorText.h" + typedef int(*qsortCompareFcn)(const void *, const void *); @@ -133,5 +133,5 @@ { if (pixels == NULL) { - psError(PS_ERR_BAD_PARAMETER_NULL,true,PS_ERRORTEXT_psPixels_NULL); + psError(PS_ERR_BAD_PARAMETER_NULL,true,_("Input psPixels can not be NULL.")); psFree(out); return NULL; @@ -154,5 +154,5 @@ if (pixels == NULL) { psError(PS_ERR_BAD_PARAMETER_NULL, true, - PS_ERRORTEXT_psPixels_NULL); + _("Input psPixels can not be NULL.")); psFree(out); return NULL; @@ -161,5 +161,5 @@ if (data == NULL) { psError(PS_ERR_BAD_PARAMETER_SIZE, true, - PS_ERRORTEXT_psPixels_DATA_NULL); + _("Input psPixels contains no data.")); psFree(out); return NULL; @@ -173,5 +173,5 @@ if ( (x0 < 0 || x1 < 0) || (y0 < 0 || y1 < 0) ) { psError(PS_ERR_BAD_PARAMETER_VALUE, true, - PS_ERRORTEXT_psPixels_REGION_INVALID, + _("Specified psRegion, [%d:%d,%d:%d], does not specify a valid region."), (int)y0,(int)y1,(int)x0,(int)x1); psFree(out); @@ -186,5 +186,5 @@ if (numRows < 1 || numCols < 1) { psError(PS_ERR_BAD_PARAMETER_VALUE, true, - PS_ERRORTEXT_psPixels_REGION_INVALID, + _("Specified psRegion, [%d:%d,%d:%d], does not specify a valid region."), (int)y0,(int)y1,(int)x0,(int)x1); psFree(out); @@ -196,5 +196,5 @@ if (out == NULL) { psError(PS_ERR_UNKNOWN, false, - PS_ERRORTEXT_psPixels_FAILED_IMAGE_CREATE, + _("Failed to create image of size %dx%d."), numCols, numRows); return NULL; @@ -232,5 +232,5 @@ if (mask == NULL) { psError(PS_ERR_BAD_PARAMETER_NULL, true, - PS_ERRORTEXT_psPixels_MASK_NULL); + _("Specified mask can not be NULL.")); psFree(out); return NULL; @@ -240,5 +240,5 @@ PS_TYPE_NAME(typeStr,mask->type.type); psError(PS_ERR_BAD_PARAMETER_TYPE, true, - PS_ERRORTEXT_psPixels_MASK_TYPE, + _("Specified mask's type, %s, is invalid. Should be PS_TYPE_MASK."), typeStr); psFree(out); @@ -295,5 +295,5 @@ if (pixels == NULL) { psError(PS_ERR_BAD_PARAMETER_NULL, true, - PS_ERRORTEXT_psPixels_NULL); + _("Input psPixels can not be NULL.")); return NULL; } @@ -363,5 +363,5 @@ { if (pixels == NULL) { - psError(PS_ERR_BAD_PARAMETER_NULL, true, PS_ERRORTEXT_psPixels_NULL); + psError(PS_ERR_BAD_PARAMETER_NULL, true, _("Input psPixels can not be NULL.")); return false; } @@ -397,5 +397,5 @@ psPixelCoord out; if (pixels == NULL) { - psError(PS_ERR_BAD_PARAMETER_NULL, true, PS_ERRORTEXT_psPixels_NULL); + psError(PS_ERR_BAD_PARAMETER_NULL, true, _("Input psPixels can not be NULL.")); out.x = 0; //XXX: should be NAN when changed to float out.y = 0; //XXX: should be NAN when changed to float Index: trunk/psLib/src/xml/psXML.c =================================================================== --- trunk/psLib/src/xml/psXML.c (revision 8231) +++ trunk/psLib/src/xml/psXML.c (revision 8232) @@ -10,6 +10,6 @@ * @author David Robbins, MHPCC * -* @version $Revision: 1.45 $ $Name: not supported by cvs2svn $ -* @date $Date: 2006-06-30 02:20:06 $ +* @version $Revision: 1.46 $ $Name: not supported by cvs2svn $ +* @date $Date: 2006-08-08 23:32:23 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -133,5 +133,5 @@ else { psError(PS_ERR_BAD_PARAMETER_VALUE, true, - PS_ERRORTEXT_psXML_INVALID_CONTENT); + _("Failed to recognize XML content. Invalid syntax.")); return NULL; } @@ -188,5 +188,5 @@ default: psError(PS_ERR_BAD_PARAMETER_VALUE, true, - PS_ERRORTEXT_psXML_INVALID_DATATYPE); + _("Failed to recognize datatype from/for XML file.")); psFree(XML); psFree(iter); @@ -198,5 +198,5 @@ default: psError(PS_ERR_BAD_PARAMETER_VALUE, true, - PS_ERRORTEXT_psXML_INVALID_DATATYPE); + _("Failed to recognize datatype from/for XML file.")); psFree(XML); psFree(iter); @@ -283,5 +283,5 @@ default: psError(PS_ERR_BAD_PARAMETER_VALUE, true, - PS_ERRORTEXT_psXML_INVALID_DATATYPE); + _("Failed to recognize datatype from/for XML file.")); } } @@ -299,5 +299,5 @@ else psError(PS_ERR_BAD_PARAMETER_VALUE, true, - PS_ERRORTEXT_psXML_INVALID_CONTENT); + _("Failed to recognize XML content. Invalid syntax.")); in = endp; nsec = (unsigned int)strtol(in, &endp, 10); @@ -307,5 +307,5 @@ else psError(PS_ERR_BAD_PARAMETER_VALUE, true, - PS_ERRORTEXT_psXML_INVALID_CONTENT); + _("Failed to recognize XML content. Invalid syntax.")); in = endp; if ( !strncmp(in, "false", 10) || !strncmp(in, "f", 10) || @@ -317,5 +317,5 @@ else { psError(PS_ERR_BAD_PARAMETER_VALUE, true, - PS_ERRORTEXT_psXML_INVALID_CONTENT); + _("Failed to recognize XML content. Invalid syntax.")); } } @@ -335,5 +335,5 @@ } else { psError(PS_ERR_BAD_PARAMETER_VALUE, true, - PS_ERRORTEXT_psXML_INVALID_CONTENT); + _("Failed to recognize XML content. Invalid syntax.")); return(PS_DATA_UNKNOWN); } @@ -348,5 +348,5 @@ } else { psError(PS_ERR_BAD_PARAMETER_VALUE, true, - PS_ERRORTEXT_psXML_INVALID_CONTENT); + _("Failed to recognize XML content. Invalid syntax.")); return(PS_DATA_UNKNOWN); } @@ -360,5 +360,5 @@ } else { psError(PS_ERR_BAD_PARAMETER_VALUE, true, - PS_ERRORTEXT_psXML_INVALID_CONTENT); + _("Failed to recognize XML content. Invalid syntax.")); return(PS_DATA_UNKNOWN); } @@ -370,5 +370,5 @@ } else { psError(PS_ERR_BAD_PARAMETER_VALUE, true, - PS_ERRORTEXT_psXML_INVALID_CONTENT); + _("Failed to recognize XML content. Invalid syntax.")); return(PS_DATA_UNKNOWN); } @@ -398,5 +398,5 @@ if ( nodeNum == 0 && strncmp((const char*)cur_node->name, "metadata", MAXSTR) ) { psError(PS_ERR_BAD_PARAMETER_VALUE, true, - PS_ERRORTEXT_psXML_INVALID_CONTENT); + _("Failed to recognize XML content. Invalid syntax.")); psFree(meta); return NULL; @@ -440,5 +440,5 @@ || elemType == PS_DATA_BOOL) { psError(PS_ERR_BAD_PARAMETER_VALUE, true, - PS_ERRORTEXT_psXML_INVALID_DATATYPE); + _("Failed to recognize datatype from/for XML file.")); psFree(meta); return NULL; @@ -467,5 +467,5 @@ else { psError(PS_ERR_BAD_PARAMETER_VALUE, true, - PS_ERRORTEXT_psXML_INVALID_CONTENT); + _("Failed to recognize XML content. Invalid syntax.")); psFree(meta); return NULL; @@ -501,5 +501,5 @@ } else { psError(PS_ERR_BAD_PARAMETER_VALUE, true, - PS_ERRORTEXT_psXML_INVALID_CONTENT); + _("Failed to recognize XML content. Invalid syntax.")); psFree(meta); return NULL; @@ -509,5 +509,5 @@ default: psError(PS_ERR_BAD_PARAMETER_VALUE, true, - PS_ERRORTEXT_psXML_INVALID_DATATYPE); + _("Failed to recognize datatype from/for XML file.")); psFree(meta); //XXX: Do I really need this? return NULL; @@ -558,5 +558,5 @@ FILE *file; if( (file = fopen(filename, "w")) == NULL ) { - psError(PS_ERR_IO, true, PS_ERRORTEXT_psXML_IO_FILE_OPEN_FAILED, filename); + psError(PS_ERR_IO, true, _("Failed to open file '%s'. Check if it exists and it has the proper permissions."), filename); return false; } @@ -592,5 +592,5 @@ xmlDocDumpMemory(*doc, &buff, &bufferSize); if ( MAXVEC < strlen((char *)buff) ) { - psError(PS_ERR_LOCATION_INVALID, true, PS_ERRORTEXT_psXML_BUFFER_TOO_SMALL); + psError(PS_ERR_LOCATION_INVALID, true, _("Buffer to small to store XML doc.")); // xmlFree(buff); return false; @@ -628,5 +628,5 @@ write(fd, buf, n); } else { - psError(PS_ERR_LOCATION_INVALID, true, PS_ERRORTEXT_psXML_BUFFER_TOO_SMALL); + psError(PS_ERR_LOCATION_INVALID, true, _("Buffer to small to store XML doc.")); return false; } Index: trunk/psLib/src/xml/psXML.h =================================================================== --- trunk/psLib/src/xml/psXML.h (revision 8231) +++ trunk/psLib/src/xml/psXML.h (revision 8232) @@ -10,6 +10,6 @@ * @author David Robbins, MHPCC * - * @version $Revision: 1.19 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-09-12 21:36:54 $ + * @version $Revision: 1.20 $ $Name: not supported by cvs2svn $ + * @date $Date: 2006-08-08 23:32:23 $ * * Copyright 2005 Maui High Performance Computing Center, University of Hawaii @@ -32,5 +32,5 @@ #include "psConstants.h" #include "psTime.h" -#include "psErrorText.h" +