Index: trunk/psLib/test/astronomy/tst_psMetadata_01.c =================================================================== --- trunk/psLib/test/astronomy/tst_psMetadata_01.c (revision 2204) +++ trunk/psLib/test/astronomy/tst_psMetadata_01.c (revision 2273) @@ -17,6 +17,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.13 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-10-27 00:57:33 $ +* @version $Revision: 1.14 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-11-04 01:05:00 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -227,5 +227,5 @@ metadata1 = psMetadataReadHeader(metadata1, NULL, 22, "header_2.fits"); if (metadata1 != NULL ) { - psError(__func__,"psMetadataReadHeader did not return null when invalid ext given."); + psError(PS_ERR_UNKNOWN, true,"psMetadataReadHeader did not return null when invalid ext given."); return 10; } @@ -238,5 +238,5 @@ metadata1 = psMetadataReadHeader(NULL, "AARGH", -1, "header_2.fits"); if (metadata1 != NULL ) { - psError(__func__,"psMetadataReadHeader did not return null invalid extname give."); + psError(PS_ERR_UNKNOWN, true,"psMetadataReadHeader did not return null invalid extname give."); return 11; } @@ -249,5 +249,5 @@ metadata1 = psMetadataReadHeader(NULL, "MY_DATA_2", 0, "header_2.fits"); if (metadata1 != NULL ) { - psError(__func__,"psMetadataReadHeader did not return null w/ valid extname, invalid extnum"); + psError(PS_ERR_UNKNOWN, true,"psMetadataReadHeader did not return null w/ valid extname, invalid extnum"); return 12; } Index: trunk/psLib/test/astronomy/tst_psMetadata_02.c =================================================================== --- trunk/psLib/test/astronomy/tst_psMetadata_02.c (revision 2204) +++ trunk/psLib/test/astronomy/tst_psMetadata_02.c (revision 2273) @@ -14,6 +14,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-10-27 00:57:33 $ +* @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-11-04 01:05:00 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -92,5 +92,5 @@ badItem = psMetadataItemAlloc(NULL, PS_META_STR, "I am a string", "HELLO WORLD"); if (badItem != NULL) { - psError(__func__,"psMetadataItemAlloc did not return null with null name item."); + psError(PS_ERR_UNKNOWN, true,"psMetadataItemAlloc did not return null with null name item."); return 10; } Index: trunk/psLib/test/astronomy/tst_psMetadata_03.c =================================================================== --- trunk/psLib/test/astronomy/tst_psMetadata_03.c (revision 2204) +++ trunk/psLib/test/astronomy/tst_psMetadata_03.c (revision 2273) @@ -14,6 +14,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.8 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-10-27 00:57:33 $ +* @version $Revision: 1.9 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-11-04 01:05:00 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -91,17 +91,17 @@ printPositiveTestHeader(stdout, "psMetadata", "Test B - Remove items from metadata by name"); if( ! psMetadataAddItem(metadata, item1, PS_LIST_HEAD) ) { - psError(__func__,"psMetadataAddItem did not return true when adding by name."); + psError(PS_ERR_UNKNOWN, true,"psMetadataAddItem did not return true when adding by name."); return 10; } if( ! psMetadataAdd(metadata,PS_LIST_HEAD,"myItem2",PS_META_S32,"I am S32 integer",77) ) { - psError(__func__,"psMetadataAddItem did not return true when adding by name."); + psError(PS_ERR_UNKNOWN, true,"psMetadataAddItem did not return true when adding by name."); return 11; } if ( ! psMetadataRemove(metadata, 0, "myItem1" ) ) { - psError(__func__,"psMetadataRemove did not return true when removing by name."); + psError(PS_ERR_UNKNOWN, true,"psMetadataRemove did not return true when removing by name."); return 12; } if ( ! psMetadataRemove(metadata, 0, "myItem2" ) ) { - psError(__func__,"psMetadataRemove did not return true when removing by name."); + psError(PS_ERR_UNKNOWN, true,"psMetadataRemove did not return true when removing by name."); return 13; } @@ -112,17 +112,17 @@ printPositiveTestHeader(stdout, "psMetadata", "Test C - Remove items from metadata by index"); if ( ! psMetadataAddItem(metadata, item3, PS_LIST_HEAD) ) { - psError(__func__,"psMetadataAddItem did not return true when adding by index."); + psError(PS_ERR_UNKNOWN, true,"psMetadataAddItem did not return true when adding by index."); return 14; } if ( ! psMetadataAdd(metadata,PS_LIST_HEAD,"myItem4",PS_META_S32,"I am S32 integer",88) ) { - psError(__func__,"psMetadataAddItem did not return true when adding by index."); + psError(PS_ERR_UNKNOWN, true,"psMetadataAddItem did not return true when adding by index."); return 15; } if( ! psMetadataRemove(metadata, 0, NULL) ) { - psError(__func__,"psMetadataRemove did not return true when removing by index."); + psError(PS_ERR_UNKNOWN, true,"psMetadataRemove did not return true when removing by index."); return 16; } if ( ! psMetadataRemove(metadata, 0, NULL ) ) { - psError(__func__,"psMetadataRemove did not return true when removing by index."); + psError(PS_ERR_UNKNOWN, true,"psMetadataRemove did not return true when removing by index."); return 17; } @@ -134,5 +134,5 @@ "Null metadata collection not allowed", 0); if ( psMetadataRemove(NULL, 0, NULL) ) { - psError(__func__,"psMetadataRemove did not return false when removing from null metadata."); + psError(PS_ERR_UNKNOWN, true,"psMetadataRemove did not return false when removing from null metadata."); return 18; } @@ -144,5 +144,5 @@ "Couldn't find metadata item. Name: AARGH", 0); if( psMetadataRemove(metadata, 0, "AARGH") ) { - psError(__func__,"psMetadataRemove did not return false when removing non-existant item."); + psError(PS_ERR_UNKNOWN, true,"psMetadataRemove did not return false when removing non-existant item."); return 19; } @@ -154,5 +154,5 @@ "Couldn't find metadata item in list. Index: 22", 0); if( psMetadataRemove(metadata, 22, NULL) ) { - psError(__func__,"psMetadataRemove did not return false when removing non-existant item."); + psError(PS_ERR_UNKNOWN, true,"psMetadataRemove did not return false when removing non-existant item."); return 20; } @@ -167,9 +167,9 @@ errMetadata->table = NULL; if ( psMetadataAddItem(errMetadata, item3, PS_LIST_HEAD) ) { - psError(__func__,"psMetadataAddItem did not return false w/ invalid metadata struct w/o hash table."); + psError(PS_ERR_UNKNOWN, true,"psMetadataAddItem did not return false w/ invalid metadata struct w/o hash table."); return 21; } if ( psMetadataRemove(errMetadata, PS_LIST_HEAD, "errItem") ) { - psError(__func__,"psMetadataRemove did not return false w/ invalid metadata struct w/o hash table."); + psError(PS_ERR_UNKNOWN, true,"psMetadataRemove did not return false w/ invalid metadata struct w/o hash table."); return 31; } @@ -183,9 +183,9 @@ errMetadata->list = NULL; if ( psMetadataAddItem(errMetadata, item3, PS_LIST_HEAD) ) { - psError(__func__,"psMetadataAddItem did not return false w/ invalid metadata struct w/o link list."); + psError(PS_ERR_UNKNOWN, true,"psMetadataAddItem did not return false w/ invalid metadata struct w/o link list."); return 22; } if ( psMetadataRemove(errMetadata, PS_LIST_HEAD, "errItem") ) { - psError(__func__,"psMetadataRemove did not return false w/ invalid metadata struct w/o link list."); + psError(PS_ERR_UNKNOWN, true,"psMetadataRemove did not return false w/ invalid metadata struct w/o link list."); return 32; } @@ -199,5 +199,5 @@ errItem->name = NULL; if ( psMetadataAddItem(errMetadata, errItem, PS_LIST_HEAD) ) { - psError(__func__,"psMetadataAddItem did not return false with item with null name."); + psError(PS_ERR_UNKNOWN, true,"psMetadataAddItem did not return false with item with null name."); return 23; } @@ -211,5 +211,5 @@ errMetadata->table = NULL; if ( psMetadataAdd(errMetadata, PS_LIST_HEAD, "errItem", PS_META_S32,"Integer",22) ) { - psError(__func__,"psMetadataAddItem did not return false w/ invalid metadata struct w/o hash table."); + psError(PS_ERR_UNKNOWN, true,"psMetadataAddItem did not return false w/ invalid metadata struct w/o hash table."); return 24; } @@ -227,5 +227,5 @@ psFree(errMetadata); if( psMemCheckLeaks(0, NULL, stdout) != 0 ) { - psError(__func__,"Memory leaks detected."); + psError(PS_ERR_UNKNOWN, true,"Memory leaks detected."); return 25; } Index: trunk/psLib/test/astronomy/tst_psMetadata_04.c =================================================================== --- trunk/psLib/test/astronomy/tst_psMetadata_04.c (revision 2204) +++ trunk/psLib/test/astronomy/tst_psMetadata_04.c (revision 2273) @@ -18,6 +18,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-10-27 00:57:33 $ +* @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-11-04 01:05:00 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -108,5 +108,5 @@ "Null metadata collection not allowed", 0); if ( psMetadataLookup(NULL, "myItem2") != NULL ) { - psError(__func__,"psMetadataLookup did not return NULL with null metadata."); + psError(PS_ERR_UNKNOWN, true,"psMetadataLookup did not return NULL with null metadata."); return 11; } @@ -118,5 +118,5 @@ "Null key name not allowed", 0); if ( psMetadataLookup(metadata, NULL) != NULL ) { - psError(__func__,"psMetadata did not return NULL with null key."); + psError(PS_ERR_UNKNOWN, true,"psMetadata did not return NULL with null key."); return 12; } @@ -128,5 +128,5 @@ "Couldn't find metadata item. Name: AARGH", 0); if ( psMetadataLookup(metadata, "AARGH") != NULL ) { - psError(__func__,"psMetadata did not return NULL with a non-existant item."); + psError(PS_ERR_UNKNOWN, true,"psMetadata did not return NULL with a non-existant item."); return 13; } @@ -150,5 +150,5 @@ item = psMetadataGet(NULL, 0); if ( item != NULL ) { - psError(__func__,"psMetadataGet did not return NULL with null metadata structure."); + psError(PS_ERR_UNKNOWN, true,"psMetadataGet did not return NULL with null metadata structure."); return 15; } @@ -160,5 +160,5 @@ "Couldn't find metadata item with given index. Index: 22", 0); if ( psMetadataGet(metadata, 22) != NULL ) { - psError(__func__,"psMetadataGet did not return NULL with non-existant metadata item."); + psError(PS_ERR_UNKNOWN, true,"psMetadataGet did not return NULL with non-existant metadata item."); return 16; } @@ -171,5 +171,5 @@ metadata->table = NULL; if ( psMetadataLookup(metadata,"myItem2") != NULL ) { - psError(__func__,"psMetadataLookup did not return null for invalid metadata object."); + psError(PS_ERR_UNKNOWN, true,"psMetadataLookup did not return null for invalid metadata object."); return 20; } @@ -183,5 +183,5 @@ metadata->list = NULL; if ( psMetadataGet(metadata,0) != NULL ) { - psError(__func__,"psMetadataLookup did not return null for invalid metadata object."); + psError(PS_ERR_UNKNOWN, true,"psMetadataLookup did not return null for invalid metadata object."); return 20; } @@ -197,5 +197,5 @@ psFree(item4); if ( psMemCheckLeaks(0, NULL, stdout) != 0 ) { - psError(__func__,"memory leaks detected."); + psError(PS_ERR_UNKNOWN, true,"memory leaks detected."); return 20; } Index: trunk/psLib/test/astronomy/tst_psMetadata_05.c =================================================================== --- trunk/psLib/test/astronomy/tst_psMetadata_05.c (revision 2204) +++ trunk/psLib/test/astronomy/tst_psMetadata_05.c (revision 2273) @@ -22,6 +22,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.8 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-10-27 00:57:33 $ +* @version $Revision: 1.9 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-11-04 01:05:00 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -145,5 +145,5 @@ } if( psMetadataGetPrevious(metadata,"myItem3",1) == NULL) { - psError(__func__,"psMetadataGetPrevious did not return an item from metadata."); + psError(PS_ERR_UNKNOWN, true,"psMetadataGetPrevious did not return an item from metadata."); return 45; } @@ -151,5 +151,5 @@ metadata->list = NULL; if ( psMetadataGetPrevious(metadata,NULL,1) != NULL) { - psError(__func__,"psMetadataGetPrevious did not return null for invalid metadata."); + psError(PS_ERR_UNKNOWN, true,"psMetadataGetPrevious did not return null for invalid metadata."); return 50; } @@ -213,5 +213,5 @@ "Null metadata collection not allowed", 0); if( psMetadataGetNext(NULL, "myItem2", 0) != NULL ) { - psError(__func__,"psMetadataGetNext did not return null for null metadata."); + psError(PS_ERR_UNKNOWN, true,"psMetadataGetNext did not return null for null metadata."); return 40; } @@ -219,5 +219,5 @@ metadata->list = NULL; if ( psMetadataGetNext(metadata, "myItem2", 0) != NULL ) { - psError(__func__,"psMetadataGetNext did not return null for invalid metadata."); + psError(PS_ERR_UNKNOWN, true,"psMetadataGetNext did not return null for invalid metadata."); return 41; } @@ -267,5 +267,5 @@ psFree(item8); if ( psMemCheckLeaks(0, NULL, stdout) != 0 ) { - psError(__func__,"Memory leaks detected."); + psError(PS_ERR_UNKNOWN, true,"Memory leaks detected."); return 50; } Index: trunk/psLib/test/astronomy/tst_psMetadata_06.c =================================================================== --- trunk/psLib/test/astronomy/tst_psMetadata_06.c (revision 2204) +++ trunk/psLib/test/astronomy/tst_psMetadata_06.c (revision 2273) @@ -13,6 +13,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-10-27 00:57:33 $ +* @version $Revision: 1.5 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-11-04 01:05:00 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -88,9 +88,9 @@ printPositiveTestHeader(stdout, "psMetadata", "Test B - Add leaf node on top of existing leaf node"); if( ! psMetadataAddItem(metadata, item1a, PS_LIST_HEAD) ) { - psError(__func__,"psMetadataAddItem returned false for adding a node top."); + psError(PS_ERR_UNKNOWN, true,"psMetadataAddItem returned false for adding a node top."); return 20; } if ( ! psMetadataAddItem(metadata, item1b, PS_LIST_HEAD) ) { - psError(__func__,"psMetadataAddItem returned false for adding a node top."); + psError(PS_ERR_UNKNOWN, true,"psMetadataAddItem returned false for adding a node top."); return 21; } @@ -102,5 +102,5 @@ printPositiveTestHeader(stdout, "psMetadata", "Test C - Add leaf node to existing folder node"); if ( ! psMetadataAddItem(metadata, item1c, PS_LIST_HEAD) ) { - psError(__func__,"psMetadataAddItem return false for adding a not to existing node."); + psError(PS_ERR_UNKNOWN, true,"psMetadataAddItem return false for adding a not to existing node."); return 22; } @@ -111,9 +111,9 @@ printPositiveTestHeader(stdout, "psMetadata", "Test D - Add folder node on top of existing leaf node"); if ( ! psMetadataAddItem(metadata, item2a, PS_LIST_HEAD) ) { - psError(__func__,"psMetadataAddItem returned false for adding a node to existing leaf node."); + psError(PS_ERR_UNKNOWN, true,"psMetadataAddItem returned false for adding a node to existing leaf node."); return 23; } if ( ! psMetadataAddItem(metadata, item2b, PS_LIST_HEAD) ) { - psError(__func__,"psMetadataAddItem returned false for adding a nod to existing leaf node."); + psError(PS_ERR_UNKNOWN, true,"psMetadataAddItem returned false for adding a nod to existing leaf node."); return 24; } @@ -130,5 +130,5 @@ psFree(metadata); if ( psMemCheckLeaks(0, NULL, stdout) != 0 ) { - psError(__func__,"Memory leaks detected."); + psError(PS_ERR_UNKNOWN, true,"Memory leaks detected."); return 25; }