Index: trunk/psLib/src/astronomy/psMetadata.c =================================================================== --- trunk/psLib/src/astronomy/psMetadata.c (revision 3241) +++ trunk/psLib/src/astronomy/psMetadata.c (revision 3246) @@ -12,6 +12,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.49 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-01-17 20:58:20 $ +* @version $Revision: 1.50 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-02-17 01:58:42 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -419,5 +419,5 @@ } -void* psMetadataLookupPtr(psMetadata *md, const char *key, psBool *status) +void* psMetadataLookupPtr(psBool *status, psMetadata *md, const char *key) { psMetadataItem *metadataItem = NULL; @@ -450,5 +450,5 @@ #define psMetadataLookupNumTYPE(TYPE) \ -ps##TYPE psMetadataLookup##TYPE(psMetadata *md, const char *key, psBool *status) \ +ps##TYPE psMetadataLookup##TYPE(psBool *status, psMetadata *md, const char *key) \ { \ psMetadataItem *metadataItem = NULL; \ Index: trunk/psLib/src/astronomy/psMetadata.h =================================================================== --- trunk/psLib/src/astronomy/psMetadata.h (revision 3241) +++ trunk/psLib/src/astronomy/psMetadata.h (revision 3246) @@ -11,6 +11,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.35 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-02-03 00:45:06 $ +* @version $Revision: 1.36 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-02-17 01:58:42 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -196,6 +196,6 @@ */ psMetadataItem* psMetadataLookup( - psMetadata * md, ///< Metadata collection to lookup metadata item. - const char * key ///< Name of metadata key. + psMetadata * md, ///< Metadata collection to lookup metadata item. + const char * key ///< Name of metadata key. ); @@ -209,7 +209,7 @@ */ psF64 psMetadataLookupF64( - psMetadata *md, ///< Metadata collection to lookup metadata item. - const char *key, ///< Name of metadata key. - psBool *status ///< Status of lookup. + psBool *status, ///< Status of lookup. + psMetadata *md, ///< Metadata collection to lookup metadata item. + const char *key ///< Name of metadata key. ); @@ -223,7 +223,7 @@ */ psF32 psMetadataLookupF32( - psMetadata *md, ///< Metadata collection to lookup metadata item. - const char *key, ///< Name of metadata key. - psBool *status ///< Status of lookup. + psBool *status, ///< Status of lookup. + psMetadata *md, ///< Metadata collection to lookup metadata item. + const char *key ///< Name of metadata key. ); @@ -237,7 +237,7 @@ */ psS32 psMetadataLookupS32( - psMetadata *md, ///< Metadata collection to lookup metadata item. - const char *key, ///< Name of metadata key. - psBool *status ///< Status of lookup. + psBool *status, ///< Status of lookup. + psMetadata *md, ///< Metadata collection to lookup metadata item. + const char *key ///< Name of metadata key. ); @@ -251,7 +251,7 @@ */ psBool psMetadataLookupBool( - psMetadata *md, ///< Metadata collection to lookup metadata item. - const char *key, ///< Name of metadata key. - psBool *status ///< Status of lookup. + psBool *status, ///< Status of lookup. + psMetadata *md, ///< Metadata collection to lookup metadata item. + const char *key ///< Name of metadata key. ); @@ -265,7 +265,7 @@ */ void* psMetadataLookupPtr( - psMetadata* md, ///< Metadata collection to lookup metadata item. - const char *key, ///< Name of metadata key. - psBool *status ///< Status of lookup. + psBool *status, ///< Status of lookup. + psMetadata* md, ///< Metadata collection to lookup metadata item. + const char *key ///< Name of metadata key. ); Index: trunk/psLib/src/collections/psMetadata.c =================================================================== --- trunk/psLib/src/collections/psMetadata.c (revision 3241) +++ trunk/psLib/src/collections/psMetadata.c (revision 3246) @@ -12,6 +12,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.49 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-01-17 20:58:20 $ +* @version $Revision: 1.50 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-02-17 01:58:42 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -419,5 +419,5 @@ } -void* psMetadataLookupPtr(psMetadata *md, const char *key, psBool *status) +void* psMetadataLookupPtr(psBool *status, psMetadata *md, const char *key) { psMetadataItem *metadataItem = NULL; @@ -450,5 +450,5 @@ #define psMetadataLookupNumTYPE(TYPE) \ -ps##TYPE psMetadataLookup##TYPE(psMetadata *md, const char *key, psBool *status) \ +ps##TYPE psMetadataLookup##TYPE(psBool *status, psMetadata *md, const char *key) \ { \ psMetadataItem *metadataItem = NULL; \ Index: trunk/psLib/src/collections/psMetadata.h =================================================================== --- trunk/psLib/src/collections/psMetadata.h (revision 3241) +++ trunk/psLib/src/collections/psMetadata.h (revision 3246) @@ -11,6 +11,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.35 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-02-03 00:45:06 $ +* @version $Revision: 1.36 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-02-17 01:58:42 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -196,6 +196,6 @@ */ psMetadataItem* psMetadataLookup( - psMetadata * md, ///< Metadata collection to lookup metadata item. - const char * key ///< Name of metadata key. + psMetadata * md, ///< Metadata collection to lookup metadata item. + const char * key ///< Name of metadata key. ); @@ -209,7 +209,7 @@ */ psF64 psMetadataLookupF64( - psMetadata *md, ///< Metadata collection to lookup metadata item. - const char *key, ///< Name of metadata key. - psBool *status ///< Status of lookup. + psBool *status, ///< Status of lookup. + psMetadata *md, ///< Metadata collection to lookup metadata item. + const char *key ///< Name of metadata key. ); @@ -223,7 +223,7 @@ */ psF32 psMetadataLookupF32( - psMetadata *md, ///< Metadata collection to lookup metadata item. - const char *key, ///< Name of metadata key. - psBool *status ///< Status of lookup. + psBool *status, ///< Status of lookup. + psMetadata *md, ///< Metadata collection to lookup metadata item. + const char *key ///< Name of metadata key. ); @@ -237,7 +237,7 @@ */ psS32 psMetadataLookupS32( - psMetadata *md, ///< Metadata collection to lookup metadata item. - const char *key, ///< Name of metadata key. - psBool *status ///< Status of lookup. + psBool *status, ///< Status of lookup. + psMetadata *md, ///< Metadata collection to lookup metadata item. + const char *key ///< Name of metadata key. ); @@ -251,7 +251,7 @@ */ psBool psMetadataLookupBool( - psMetadata *md, ///< Metadata collection to lookup metadata item. - const char *key, ///< Name of metadata key. - psBool *status ///< Status of lookup. + psBool *status, ///< Status of lookup. + psMetadata *md, ///< Metadata collection to lookup metadata item. + const char *key ///< Name of metadata key. ); @@ -265,7 +265,7 @@ */ void* psMetadataLookupPtr( - psMetadata* md, ///< Metadata collection to lookup metadata item. - const char *key, ///< Name of metadata key. - psBool *status ///< Status of lookup. + psBool *status, ///< Status of lookup. + psMetadata* md, ///< Metadata collection to lookup metadata item. + const char *key ///< Name of metadata key. ); Index: trunk/psLib/src/dataIO/psFits.c =================================================================== --- trunk/psLib/src/dataIO/psFits.c (revision 3241) +++ trunk/psLib/src/dataIO/psFits.c (revision 3246) @@ -7,6 +7,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.16 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-02-02 20:22:56 $ + * @version $Revision: 1.17 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-02-17 01:58:42 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -1546,6 +1546,7 @@ case PS_TYPE_S32: for (row = 0; row < table->n; row++) { - col->data.S32[row] = psMetadataLookupS32( - table->data[row],item->name,NULL); + col->data.S32[row] = psMetadataLookupS32(NULL, + table->data[row], + item->name); } fits_write_col_int(fits->p_fd, @@ -1559,6 +1560,7 @@ case PS_TYPE_F32: for (row = 0; row < table->n; row++) { - col->data.F32[row] = psMetadataLookupF32( - table->data[row],item->name,NULL); + col->data.F32[row] = psMetadataLookupF32(NULL, + table->data[row], + item->name); } fits_write_col_flt(fits->p_fd, @@ -1572,6 +1574,7 @@ case PS_TYPE_F64: for (row = 0; row < table->n; row++) { - col->data.F64[row] = psMetadataLookupF64( - table->data[row],item->name,NULL); + col->data.F64[row] = psMetadataLookupF64(NULL, + table->data[row], + item->name); } fits_write_col_dbl(fits->p_fd, @@ -1585,6 +1588,7 @@ case PS_TYPE_BOOL: for (row = 0; row < table->n; row++) { - col->data.S8[row] = psMetadataLookupBool( - table->data[row],item->name,NULL); + col->data.S8[row] = psMetadataLookupBool(NULL, + table->data[row], + item->name); } fits_write_col_log(fits->p_fd, Index: trunk/psLib/src/fileUtils/psFits.c =================================================================== --- trunk/psLib/src/fileUtils/psFits.c (revision 3241) +++ trunk/psLib/src/fileUtils/psFits.c (revision 3246) @@ -7,6 +7,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.16 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-02-02 20:22:56 $ + * @version $Revision: 1.17 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-02-17 01:58:42 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -1546,6 +1546,7 @@ case PS_TYPE_S32: for (row = 0; row < table->n; row++) { - col->data.S32[row] = psMetadataLookupS32( - table->data[row],item->name,NULL); + col->data.S32[row] = psMetadataLookupS32(NULL, + table->data[row], + item->name); } fits_write_col_int(fits->p_fd, @@ -1559,6 +1560,7 @@ case PS_TYPE_F32: for (row = 0; row < table->n; row++) { - col->data.F32[row] = psMetadataLookupF32( - table->data[row],item->name,NULL); + col->data.F32[row] = psMetadataLookupF32(NULL, + table->data[row], + item->name); } fits_write_col_flt(fits->p_fd, @@ -1572,6 +1574,7 @@ case PS_TYPE_F64: for (row = 0; row < table->n; row++) { - col->data.F64[row] = psMetadataLookupF64( - table->data[row],item->name,NULL); + col->data.F64[row] = psMetadataLookupF64(NULL, + table->data[row], + item->name); } fits_write_col_dbl(fits->p_fd, @@ -1585,6 +1588,7 @@ case PS_TYPE_BOOL: for (row = 0; row < table->n; row++) { - col->data.S8[row] = psMetadataLookupBool( - table->data[row],item->name,NULL); + col->data.S8[row] = psMetadataLookupBool(NULL, + table->data[row], + item->name); } fits_write_col_log(fits->p_fd, Index: trunk/psLib/src/fits/psFits.c =================================================================== --- trunk/psLib/src/fits/psFits.c (revision 3241) +++ trunk/psLib/src/fits/psFits.c (revision 3246) @@ -7,6 +7,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.16 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-02-02 20:22:56 $ + * @version $Revision: 1.17 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-02-17 01:58:42 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -1546,6 +1546,7 @@ case PS_TYPE_S32: for (row = 0; row < table->n; row++) { - col->data.S32[row] = psMetadataLookupS32( - table->data[row],item->name,NULL); + col->data.S32[row] = psMetadataLookupS32(NULL, + table->data[row], + item->name); } fits_write_col_int(fits->p_fd, @@ -1559,6 +1560,7 @@ case PS_TYPE_F32: for (row = 0; row < table->n; row++) { - col->data.F32[row] = psMetadataLookupF32( - table->data[row],item->name,NULL); + col->data.F32[row] = psMetadataLookupF32(NULL, + table->data[row], + item->name); } fits_write_col_flt(fits->p_fd, @@ -1572,6 +1574,7 @@ case PS_TYPE_F64: for (row = 0; row < table->n; row++) { - col->data.F64[row] = psMetadataLookupF64( - table->data[row],item->name,NULL); + col->data.F64[row] = psMetadataLookupF64(NULL, + table->data[row], + item->name); } fits_write_col_dbl(fits->p_fd, @@ -1585,6 +1588,7 @@ case PS_TYPE_BOOL: for (row = 0; row < table->n; row++) { - col->data.S8[row] = psMetadataLookupBool( - table->data[row],item->name,NULL); + col->data.S8[row] = psMetadataLookupBool(NULL, + table->data[row], + item->name); } fits_write_col_log(fits->p_fd, Index: trunk/psLib/src/sys/psError.c =================================================================== --- trunk/psLib/src/sys/psError.c (revision 3241) +++ trunk/psLib/src/sys/psError.c (revision 3246) @@ -10,6 +10,6 @@ * @author Eric Van Alst, MHPCC * - * @version $Revision: 1.20 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-01-13 19:50:45 $ + * @version $Revision: 1.21 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-02-17 01:58:42 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -77,7 +77,7 @@ char errMsg[2048]; psErr* err; - char msgName[256]; + char msgName[1024]; - snprintf(msgName,256,"%s (%s:%d)",func,file,lineno); + snprintf(msgName,1024,"%s (%s:%d)",func,file,lineno); va_list argPtr; // variable list arguement pointer Index: trunk/psLib/src/sys/psLogMsg.c =================================================================== --- trunk/psLib/src/sys/psLogMsg.c (revision 3241) +++ trunk/psLib/src/sys/psLogMsg.c (revision 3246) @@ -11,6 +11,6 @@ * @author George Gusciora, MHPCC * - * @version $Revision: 1.36 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-02-16 00:22:05 $ + * @version $Revision: 1.37 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-02-17 01:58:42 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -46,6 +46,5 @@ #define MAX_LOG_LEVEL 9 -#define MAX_LOG_LINE_LENGTH 128 - +#define MAX_LOG_LINE_LENGTH 256 static FILE *logDest = (FILE *) 1; // flag to initialize to stderr before using. Index: trunk/psLib/src/sysUtils/psError.c =================================================================== --- trunk/psLib/src/sysUtils/psError.c (revision 3241) +++ trunk/psLib/src/sysUtils/psError.c (revision 3246) @@ -10,6 +10,6 @@ * @author Eric Van Alst, MHPCC * - * @version $Revision: 1.20 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-01-13 19:50:45 $ + * @version $Revision: 1.21 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-02-17 01:58:42 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -77,7 +77,7 @@ char errMsg[2048]; psErr* err; - char msgName[256]; + char msgName[1024]; - snprintf(msgName,256,"%s (%s:%d)",func,file,lineno); + snprintf(msgName,1024,"%s (%s:%d)",func,file,lineno); va_list argPtr; // variable list arguement pointer Index: trunk/psLib/src/sysUtils/psLogMsg.c =================================================================== --- trunk/psLib/src/sysUtils/psLogMsg.c (revision 3241) +++ trunk/psLib/src/sysUtils/psLogMsg.c (revision 3246) @@ -11,6 +11,6 @@ * @author George Gusciora, MHPCC * - * @version $Revision: 1.36 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-02-16 00:22:05 $ + * @version $Revision: 1.37 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-02-17 01:58:42 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -46,6 +46,5 @@ #define MAX_LOG_LEVEL 9 -#define MAX_LOG_LINE_LENGTH 128 - +#define MAX_LOG_LINE_LENGTH 256 static FILE *logDest = (FILE *) 1; // flag to initialize to stderr before using. Index: trunk/psLib/src/types/psMetadata.c =================================================================== --- trunk/psLib/src/types/psMetadata.c (revision 3241) +++ trunk/psLib/src/types/psMetadata.c (revision 3246) @@ -12,6 +12,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.49 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-01-17 20:58:20 $ +* @version $Revision: 1.50 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-02-17 01:58:42 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -419,5 +419,5 @@ } -void* psMetadataLookupPtr(psMetadata *md, const char *key, psBool *status) +void* psMetadataLookupPtr(psBool *status, psMetadata *md, const char *key) { psMetadataItem *metadataItem = NULL; @@ -450,5 +450,5 @@ #define psMetadataLookupNumTYPE(TYPE) \ -ps##TYPE psMetadataLookup##TYPE(psMetadata *md, const char *key, psBool *status) \ +ps##TYPE psMetadataLookup##TYPE(psBool *status, psMetadata *md, const char *key) \ { \ psMetadataItem *metadataItem = NULL; \ Index: trunk/psLib/src/types/psMetadata.h =================================================================== --- trunk/psLib/src/types/psMetadata.h (revision 3241) +++ trunk/psLib/src/types/psMetadata.h (revision 3246) @@ -11,6 +11,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.35 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-02-03 00:45:06 $ +* @version $Revision: 1.36 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-02-17 01:58:42 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -196,6 +196,6 @@ */ psMetadataItem* psMetadataLookup( - psMetadata * md, ///< Metadata collection to lookup metadata item. - const char * key ///< Name of metadata key. + psMetadata * md, ///< Metadata collection to lookup metadata item. + const char * key ///< Name of metadata key. ); @@ -209,7 +209,7 @@ */ psF64 psMetadataLookupF64( - psMetadata *md, ///< Metadata collection to lookup metadata item. - const char *key, ///< Name of metadata key. - psBool *status ///< Status of lookup. + psBool *status, ///< Status of lookup. + psMetadata *md, ///< Metadata collection to lookup metadata item. + const char *key ///< Name of metadata key. ); @@ -223,7 +223,7 @@ */ psF32 psMetadataLookupF32( - psMetadata *md, ///< Metadata collection to lookup metadata item. - const char *key, ///< Name of metadata key. - psBool *status ///< Status of lookup. + psBool *status, ///< Status of lookup. + psMetadata *md, ///< Metadata collection to lookup metadata item. + const char *key ///< Name of metadata key. ); @@ -237,7 +237,7 @@ */ psS32 psMetadataLookupS32( - psMetadata *md, ///< Metadata collection to lookup metadata item. - const char *key, ///< Name of metadata key. - psBool *status ///< Status of lookup. + psBool *status, ///< Status of lookup. + psMetadata *md, ///< Metadata collection to lookup metadata item. + const char *key ///< Name of metadata key. ); @@ -251,7 +251,7 @@ */ psBool psMetadataLookupBool( - psMetadata *md, ///< Metadata collection to lookup metadata item. - const char *key, ///< Name of metadata key. - psBool *status ///< Status of lookup. + psBool *status, ///< Status of lookup. + psMetadata *md, ///< Metadata collection to lookup metadata item. + const char *key ///< Name of metadata key. ); @@ -265,7 +265,7 @@ */ void* psMetadataLookupPtr( - psMetadata* md, ///< Metadata collection to lookup metadata item. - const char *key, ///< Name of metadata key. - psBool *status ///< Status of lookup. + psBool *status, ///< Status of lookup. + psMetadata* md, ///< Metadata collection to lookup metadata item. + const char *key ///< Name of metadata key. );