Changeset 6184 for trunk/psLib/src/types

Timestamp:

Jan 23, 2006, 10:04:31 AM (21 years ago)

Author:

drobbin

Message:

updated PrecessMethod. Fixed MetadataAddStr to error on NULL input. Time_TideUT1Corr?

File:

• trunk/psLib/src/types/psMetadata.c (modified) (10 diffs)

trunk/psLib/src/types/psMetadata.c

@@ -12 +12 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.92 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-11-18 01:51:03 $
+ *  @version $Revision: 1.93 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-01-23 20:04:31 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -320 +320 @@
 {
     PS_ASSERT_PTR_NON_NULL(in,NULL);
+    PS_ASSERT_PTR_NON_NULL(in->list,NULL);
     if (out ==  NULL) {
         out = psMetadataAlloc();
@@ -438 +439 @@
                    ...)
 {
+    PS_ASSERT_PTR_NON_NULL(md,false);
+    PS_ASSERT_PTR_NON_NULL(md->list,false);
     va_list argPtr;
 
@@ -454 +457 @@
                     va_list list)
 {
+    PS_ASSERT_PTR_NON_NULL(md,false);
+    PS_ASSERT_PTR_NON_NULL(md->list,false);
     psMetadataItem* metadataItem = NULL;
 
@@ -480 +485 @@
 METADATA_ADD_TYPE(F64,psF64,PS_DATA_F64)
 METADATA_ADD_TYPE(List,psList*,PS_DATA_LIST)
-METADATA_ADD_TYPE(Str,const char*,PS_DATA_STRING)
+//METADATA_ADD_TYPE(Str,const char*,PS_DATA_STRING)
 METADATA_ADD_TYPE(Vector,psVector*,PS_DATA_VECTOR)
 METADATA_ADD_TYPE(Image,psImage*,PS_DATA_IMAGE)
@@ -497 +502 @@
                       psPtr value)
 {
+    PS_ASSERT_PTR_NON_NULL(md,false);
+    PS_ASSERT_PTR_NON_NULL(md->list,false);
+    PS_ASSERT_PTR_NON_NULL(value,false);
     return (psMetadataAdd(md, location, name, type, comment, value) );
+
+}
+
+bool psMetadataAddStr(psMetadata *md,
+                      long location,
+                      const char *name,
+                      int format,
+                      const char *comment,
+                      const char* value)
+{
+    PS_ASSERT_PTR_NON_NULL(md,false);
+    PS_ASSERT_PTR_NON_NULL(md->list,false);
+    PS_ASSERT_PTR_NON_NULL(value,false);
+    return (psMetadataAdd(md, location, name, format | PS_DATA_STRING, comment, value) );
 
 }
@@ -604 +626 @@
                           const char *key)
 {
+    PS_ASSERT_PTR_NON_NULL(md,NULL);
+    PS_ASSERT_PTR_NON_NULL(md->list,NULL);
     psMetadataItem *metadataItem = NULL;
 
@@ -853 +877 @@
                                const char *key)
 {
+    PS_ASSERT_PTR_NON_NULL(md,NULL);
+    PS_ASSERT_PTR_NON_NULL(md->list,NULL);
     psMetadataItem *item = psMetadataLookup((psMetadata*)md, key); // The metadata with instruments
     psMetadata *value = NULL;  // The value to return
@@ -885 +911 @@
                              const char *key)
 {
+    PS_ASSERT_PTR_NON_NULL(md,NULL);
+    PS_ASSERT_PTR_NON_NULL(md->list,NULL);
     psMetadataItem *item = psMetadataLookup((psMetadata*)md, key); // The metadata with instruments
     //    char *value = NULL;   // The value to return
@@ -917 +945 @@
                      int level)
 {
+    PS_ASSERT_PTR_NON_NULL(md,);
     psMetadataIterator *iter = psMetadataIteratorAlloc(md, PS_LIST_HEAD, NULL); // Iterator
     psMetadataItem *item = NULL; // Item from metadata