IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Aug 8, 2006, 1:32:23 PM (20 years ago)
Author:
jhoblitt
Message:

bug #790 - remove psErrorText.h and inline all error codes. all newly inlined error codes are wrapped with the _() macro from future gettextification

Location:
trunk/psLib/src
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/psLib/src

    • Property svn:ignore

      •  

        old new  
        1010libpslib.la.temp
        1111config.h.in
        12 psErrorText.h
        1312*.bb
        1413*.bbg

  • trunk/psLib/src/astro/psTime.c

    r7961 r8232  
    1010 *  @author Ross Harman, MHPCC
    1111 *
    12  *  @version $Revision: 1.92 $ $Name: not supported by cvs2svn $
    13  *  @date $Date: 2006-07-25 01:16:04 $
     12 *  @version $Revision: 1.93 $ $Name: not supported by cvs2svn $
     13 *  @date $Date: 2006-08-08 23:32:22 $
    1414 *
    1515 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    3333#include "psLookupTable.h"
    3434#include "psAssert.h"
    35 #include "psErrorText.h"
     35
    3636
    3737#include "config.h"
    … …  
    205205        // Check if table not a metadata item
    206206        if(tableMetadataItem == NULL) {
    207             psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psTime_LOOKUP_METADATA_FAILED,
     207            psError(PS_ERR_BAD_PARAMETER_VALUE, true, _("Failed find '%s' in time metadata."),
    208208                    tableName);
    209209            *status = PS_LOOKUP_ERROR;
    … …  
    282282    if(metadataItem == NULL) {
    283283        p_psMemAllocatePersistent(initialPersistence);
    284         psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psTime_LOOKUP_METADATA_FAILED,
     284        psError(PS_ERR_BAD_PARAMETER_VALUE, true, _("Failed find '%s' in time metadata."),
    285285                "psLib.time.tables.n");
    286286        return false;
    … …  
    292292    if(metadataItem == NULL) {
    293293        p_psMemAllocatePersistent(initialPersistence);
    294         psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psTime_LOOKUP_METADATA_FAILED,
     294        psError(PS_ERR_BAD_PARAMETER_VALUE, true, _("Failed find '%s' in time metadata."),
    295295                "psLib.time.tables.from");
    296296        return false;
    … …  
    299299    if(tablesFrom->n != numTables) {
    300300        p_psMemAllocatePersistent(initialPersistence);
    301         psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psTime_BAD_VECTOR, tablesFrom->n, numTables);
     301        psError(PS_ERR_BAD_PARAMETER_VALUE, true, _("Incorrect vector size. Size: %d, Expected %d."), tablesFrom->n, numTables);
    302302        psFree(tablesFrom);
    303303        return false;
    … …  
    308308    if(metadataItem == NULL) {
    309309        p_psMemAllocatePersistent(initialPersistence);
    310         psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psTime_LOOKUP_METADATA_FAILED,
     310        psError(PS_ERR_BAD_PARAMETER_VALUE, true, _("Failed find '%s' in time metadata."),
    311311                "psLib.time.tables.to");
    312312        psFree(tablesFrom);
    … …  
    316316    if(tablesTo->n != numTables) {
    317317        p_psMemAllocatePersistent(initialPersistence);
    318         psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psTime_BAD_VECTOR, tablesTo->n, numTables);
     318        psError(PS_ERR_BAD_PARAMETER_VALUE, true, _("Incorrect vector size. Size: %d, Expected %d."), tablesTo->n, numTables);
    319319        psFree(tablesFrom);
    320320        psFree(tablesTo);
    … …  
    326326    if(metadataItem == NULL) {
    327327        p_psMemAllocatePersistent(initialPersistence);
    328         psError(PS_ERR_BAD_PARAMETER_VALUE,true,PS_ERRORTEXT_psTime_LOOKUP_METADATA_FAILED,
     328        psError(PS_ERR_BAD_PARAMETER_VALUE,true,_("Failed find '%s' in time metadata."),
    329329                "psLib.time.tables.index");
    330330        psFree(tablesFrom);
    … …  
    335335    if(tablesIndex->n != numTables) {
    336336        p_psMemAllocatePersistent(initialPersistence);
    337         psError(PS_ERR_BAD_PARAMETER_VALUE,true,PS_ERRORTEXT_psTime_BAD_VECTOR,tablesIndex->n,numTables);
     337        psError(PS_ERR_BAD_PARAMETER_VALUE,true,_("Incorrect vector size. Size: %d, Expected %d."),tablesIndex->n,numTables);
    338338        psFree(tablesFrom);
    339339        psFree(tablesTo);
    … …  
    346346    if(metadataItem == NULL) {
    347347        p_psMemAllocatePersistent(initialPersistence);
    348         psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psTime_LOOKUP_METADATA_FAILED,
     348        psError(PS_ERR_BAD_PARAMETER_VALUE, true, _("Failed find '%s' in time metadata."),
    349349                "psLib.time.tables.dir");
    350350        psFree(tablesFrom);
    … …  
    359359    if(metadataItem == NULL) {
    360360        p_psMemAllocatePersistent(initialPersistence);
    361         psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psTime_LOOKUP_METADATA_FAILED,
     361        psError(PS_ERR_BAD_PARAMETER_VALUE, true, _("Failed find '%s' in time metadata."),
    362362                "psLib.time.tables.files");
    363363
    … …  
    374374    if(metadataItem == NULL) {
    375375        p_psMemAllocatePersistent(initialPersistence);
    376         psError(PS_ERR_BAD_PARAMETER_VALUE,true, PS_ERRORTEXT_psTime_LOOKUP_METADATA_FAILED,
     376        psError(PS_ERR_BAD_PARAMETER_VALUE,true, _("Failed find '%s' in time metadata."),
    377377                "psLib.time.tables.format");
    378378        psFree(tablesFrom);
    … …  
    404404        tableFormat = getToken(&formatPtr,",",&status);
    405405        if(tableFormat == NULL) {
    406             psError(PS_ERR_BAD_PARAMETER_VALUE,no_problem,PS_ERRORTEXT_psTime_LOOKUP_METADATA_FAILED,
     406            psError(PS_ERR_BAD_PARAMETER_VALUE,no_problem,_("Failed find '%s' in time metadata."),
    407407                    "psLib.time.tables.format");
    408408            no_problem = false;
    … …  
    415415        } else {
    416416            psError(PS_ERR_BAD_PARAMETER_VALUE, no_problem,
    417                     PS_ERRORTEXT_psTime_BAD_TABLE_COUNT, i+1, numTables);
     417                    _("Incorrect number of table files entered. Found: %d. Expected: %d."), i+1, numTables);
    418418            no_problem = false;
    419419        }
    … …  
    429429            } else if(foundTable==false && j==numTables-1) {
    430430                psError(PS_ERR_BAD_PARAMETER_VALUE, no_problem,
    431                         PS_ERRORTEXT_psTime_BAD_TABLE_COUNT, j, numTables);
     431                        _("Incorrect number of table files entered. Found: %d. Expected: %d."), j, numTables);
    432432                no_problem = false;
    433433            }
    … …  
    444444
    445445    if(numTables != i) {
    446         psError(PS_ERR_BAD_PARAMETER_VALUE, no_problem, PS_ERRORTEXT_psTime_BAD_TABLE_COUNT, i, numTables);
     446        psError(PS_ERR_BAD_PARAMETER_VALUE, no_problem, _("Incorrect number of table files entered. Found: %d. Expected: %d."), i, numTables);
    447447    }
    448448
    … …  
    480480            type!=PS_TIME_TT) {
    481481        psError(PS_ERR_BAD_PARAMETER_VALUE, true,
    482                 PS_ERRORTEXT_psTime_TYPE_UNKNOWN,
     482                _("Specified type, %d, is not supported."),
    483483                type);
    484484        return NULL;
    … …  
    521521    if (gettimeofday(&now, 0) == -1) {
    522522        psError(PS_ERR_OS_CALL_FAILED, true,
    523                 PS_ERRORTEXT_psTime_GET_TOD_FAILED);
     523                _("Failed to determine the current time from gettimeofday function."));
    524524        return NULL;
    525525    }
    … …  
    728728            // Convert from TAI to unknown time type
    729729        } else {
    730             psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psTime_TYPE_UNKNOWN, type);
     730            psError(PS_ERR_BAD_PARAMETER_VALUE, true, _("Specified type, %d, is not supported."), type);
    731731            return NULL;
    732732        }
    … …  
    753753            // Convert from TT to unknown time type
    754754        } else {
    755             psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psTime_TYPE_UNKNOWN, type);
     755            psError(PS_ERR_BAD_PARAMETER_VALUE, true, _("Specified type, %d, is not supported."), type);
    756756            return NULL;
    757757        }
    … …  
    772772            // Convert UTC to unknown time type
    773773        } else {
    774             psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psTime_TYPE_UNKNOWN, type);
     774            psError(PS_ERR_BAD_PARAMETER_VALUE, true, _("Specified type, %d, is not supported."), type);
    775775            return NULL;
    776776        }
    777777        // Convert unknown time type
    778778    } else {
    779         psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psTime_TYPE_UNKNOWN, time->type);
     779        psError(PS_ERR_BAD_PARAMETER_VALUE, true, _("Specified type, %d, is not supported."), time->type);
    780780        return NULL;
    781781    }
    … …  
    810810    // Verify input time is not in UT1 seconds
    811811    if(time->type == PS_TIME_UT1) {
    812         psError(PS_ERR_BAD_PARAMETER_VALUE,true,PS_ERRORTEXT_psTime_TYPE_INCORRECT,time->type);
     812        psError(PS_ERR_BAD_PARAMETER_VALUE,true,_("Specified type, %d, is incorrect."),time->type);
    813813        return NAN;
    814814    }
    … …  
    897897
    898898        // Date too early for tables. Get default time delta value from metadata, and issue warning.
    899         psLogMsg(__func__,PS_LOG_WARN,PS_ERRORTEXT_psTime_TIME_PREDATES_TABLES,mjd,"UT1-UTC");
     899        psLogMsg(__func__,PS_LOG_WARN,_("Specified psTime predates (%g) all tables of %s information."),mjd,"UT1-UTC");
    900900
    901901        // Lookup value from time metadata loaded from pslib.config
    902902        tableMetadataItem = psMetadataLookup(timeMetadata, "psLib.time.before.dut");
    903903        if(tableMetadataItem == NULL) {
    904             psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psTime_LOOKUP_METADATA_FAILED,
     904            psError(PS_ERR_BAD_PARAMETER_VALUE, true, _("Failed find '%s' in time metadata."),
    905905                    "psLib.time.before.dut");
    906906            return NAN;
    … …  
    917917        */
    918918        // Generate warning of postdate information
    919         psLogMsg(__func__,PS_LOG_WARN,PS_ERRORTEXT_psTime_TIME_POSTDATES_TABLES, mjd, "UT1-UTC");
     919        psLogMsg(__func__,PS_LOG_WARN,_("Specified psTime postdates (%g) all tables of %s information."), mjd, "UT1-UTC");
    920920
    921921        // Lookup values to calculate prediction
    922922        tableMetadataItem = psMetadataLookup(timeMetadata, "psLib.time.predict.dut");
    923923        if(tableMetadataItem == NULL) {
    924             psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psTime_LOOKUP_METADATA_FAILED,
     924            psError(PS_ERR_BAD_PARAMETER_VALUE, true, _("Failed find '%s' in time metadata."),
    925925                    "psLib.time.predict.dut");
    926926            return NAN;
    … …  
    935935
    936936    } else if(status != PS_LOOKUP_SUCCESS) {
    937         psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psTime_INTERPOLATION_FAILED);
     937        psError(PS_ERR_BAD_PARAMETER_VALUE, true, _("Failed time table interpolation."));
    938938        return NAN;
    939939    }
    … …  
    10591059
    10601060    if(time->type != PS_TIME_TAI) {
    1061         psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psTime_TYPE_INCORRECT, time->type);
     1061        psError(PS_ERR_BAD_PARAMETER_VALUE, true, _("Specified type, %d, is incorrect."), time->type);
    10621062        return NULL;
    10631063    }
    … …  
    10751075        // Date too earlier for tables. Get default polar coodinate values from metadata, and issue warning.
    10761076        #if 0
    1077         psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psTime_TIME_PREDATES_TABLES, mjd, "polar motion");
     1077        psError(PS_ERR_BAD_PARAMETER_VALUE, true, _("Specified psTime predates (%g) all tables of %s information."), mjd, "polar motion");
    10781078        return NULL;
    10791079        #else
    10801080
    1081         psLogMsg(PS_FILE_LINE, PS_LOG_ERROR, PS_ERRORTEXT_psTime_TIME_PREDATES_TABLES, mjd, "polar motion");
     1081        psLogMsg(PS_FILE_LINE, PS_LOG_ERROR, _("Specified psTime predates (%g) all tables of %s information."), mjd, "polar motion");
    10821082        #endif
    10831083
    … …  
    10851085        if(tableMetadataItem == NULL) {
    10861086            psError(PS_ERR_BAD_PARAMETER_VALUE, true,
    1087                     PS_ERRORTEXT_psTime_LOOKUP_METADATA_FAILED, "psLib.time.before.xp");
     1087                    _("Failed find '%s' in time metadata."), "psLib.time.before.xp");
    10881088            return NULL;
    10891089        }
    … …  
    10921092        tableMetadataItem = psMetadataLookup(timeMetadata, "psLib.time.before.yp");
    10931093        if(tableMetadataItem == NULL) {
    1094             psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psTime_LOOKUP_METADATA_FAILED, "psLib.time.before.yp");
     1094            psError(PS_ERR_BAD_PARAMETER_VALUE, true, _("Failed find '%s' in time metadata."), "psLib.time.before.yp");
    10951095            return NULL;
    10961096        }
    … …  
    11101110        #if 0
    11111111        psError(PS_ERR_BAD_PARAMETER_VALUE, true,
    1112                 PS_ERRORTEXT_psTime_TIME_POSTDATES_TABLES, mjd, "polar motion");
     1112                _("Specified psTime postdates (%g) all tables of %s information."), mjd, "polar motion");
    11131113        return NULL;
    11141114        #else
    11151115
    11161116        psLogMsg(PS_FILE_LINE, PS_LOG_ERROR,
    1117                  PS_ERRORTEXT_psTime_TIME_POSTDATES_TABLES, mjd, "polar motion");
     1117                 _("Specified psTime postdates (%g) all tables of %s information."), mjd, "polar motion");
    11181118        #endif
    11191119
    … …  
    11211121        tableMetadataItem = psMetadataLookup(timeMetadata, "psLib.time.predict.mjd");
    11221122        if(tableMetadataItem == NULL) {
    1123             psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psTime_LOOKUP_METADATA_FAILED,
     1123            psError(PS_ERR_BAD_PARAMETER_VALUE, true, _("Failed find '%s' in time metadata."),
    11241124                    "psLib.time.predict.mjd");
    11251125            return NULL;
    … …  
    11301130        tableMetadataItem = psMetadataLookup(timeMetadata, "psLib.time.predict.xp");
    11311131        if(tableMetadataItem == NULL) {
    1132             psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psTime_LOOKUP_METADATA_FAILED, "psLib.time.predict.xp");
     1132            psError(PS_ERR_BAD_PARAMETER_VALUE, true, _("Failed find '%s' in time metadata."), "psLib.time.predict.xp");
    11331133            return NULL;
    11341134        }
    … …  
    11391139        tableMetadataItem = psMetadataLookup(timeMetadata, "psLib.time.predict.yp");
    11401140        if(tableMetadataItem == NULL) {
    1141             psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psTime_LOOKUP_METADATA_FAILED, "psLib.time.predict.yp");
     1141            psError(PS_ERR_BAD_PARAMETER_VALUE, true, _("Failed find '%s' in time metadata."), "psLib.time.predict.yp");
    11421142            return NULL;
    11431143        }
    … …  
    11631163
    11641164    } else if(xStatus!=PS_LOOKUP_SUCCESS || yStatus!=PS_LOOKUP_SUCCESS) {
    1165         psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psTime_INTERPOLATION_FAILED);
     1165        psError(PS_ERR_BAD_PARAMETER_VALUE, true, _("Failed time table interpolation."));
    11661166        return NULL;
    11671167    }
    … …  
    11931193    // Check if psTime tables are loaded/loadable
    11941194    if(!p_psTimeInit(p_psGetConfigFileName())) {
    1195         psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psTime_FILE_NOT_FOUND,
     1195        psError(PS_ERR_BAD_PARAMETER_VALUE, true, _("Failed to open file %s."),
    11961196                p_psGetConfigFileName());
    11971197        return NAN;
    … …  
    12011201    tableMetadataItem = psMetadataLookup(timeMetadata, "taiTable");
    12021202    if(tableMetadataItem == NULL) {
    1203         psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psTime_LOOKUP_METADATA_FAILED, "taiTable");
     1203        psError(PS_ERR_BAD_PARAMETER_VALUE, true, _("Failed find '%s' in time metadata."), "taiTable");
    12041204        return NAN;
    12051205    }
    … …  
    12281228    // Check for successful interpolation
    12291229    if(results == NULL) {
    1230         psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psTime_INTERPOLATION_FAILED);
     1230        psError(PS_ERR_BAD_PARAMETER_VALUE, true, _("Failed time table interpolation."));
    12311231        return NAN;
    12321232    }
    … …  
    12731273    // Verify time is UTC type
    12741274    if(utc->type != PS_TIME_UTC) {
    1275         psError(PS_ERR_BAD_PARAMETER_VALUE,true,PS_ERRORTEXT_psTime_TYPE_INCORRECT,utc->type);
     1275        psError(PS_ERR_BAD_PARAMETER_VALUE,true,_("Specified type, %d, is incorrect."),utc->type);
    12761276        return false;
    12771277    }
    … …  
    13711371    // Converts psTime to YYYY-MM-DDThh:mm:ss.sss in string form
    13721372    if (!strftime(tempString, MAX_TIME_STRING_LENGTH, "%Y-%m-%dT%H:%M:%S", tmTime)) {
    1373         psError(PS_ERR_OS_CALL_FAILED, true, PS_ERRORTEXT_psTime_CONVERT_TIME_TO_STRING_FAILED);
     1373        psError(PS_ERR_OS_CALL_FAILED, true, _("Failed to convert a time via strftime function."));
    13741374        return NULL;
    13751375    }
    … …  
    13851385    // Create string with milliseconds
    13861386    if (snprintf(timeString, MAX_TIME_STRING_LENGTH, "%s.%1dZ", tempString, ds) < 0) {
    1387         psError(PS_ERR_OS_CALL_FAILED, true, PS_ERRORTEXT_psTime_APPEND_MSEC_FAILED);
     1387        psError(PS_ERR_OS_CALL_FAILED, true, _("Failed to append millisecond to time string with snprintf function."));
    13881388        return NULL;
    13891389    }
    … …  
    15011501    if (sscanf(input, "%d-%d-%dT%d:%d:%d.%d", &tmTime.tm_year, &tmTime.tm_mon, &tmTime.tm_mday,
    15021502               &tmTime.tm_hour, &tmTime.tm_min, &tmTime.tm_sec,&millisecond) < 7) {
    1503         psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psTime_ISOTIME_MALFORMED, input);
     1503        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);
    15041504        return NULL;
    15051505    }
    … …  
    17601760    // Verify both times of the same type
    17611761    if(time1->type != time2->type) {
    1762         psError(PS_ERR_BAD_PARAMETER_VALUE,true,PS_ERRORTEXT_psTime_TYPE_INCORRECT,time1->type);
     1762        psError(PS_ERR_BAD_PARAMETER_VALUE,true,_("Specified type, %d, is incorrect."),time1->type);
    17631763        return NAN;
    17641764    }
Note: See TracChangeset for help on using the changeset viewer.