Changeset 3407 for trunk/psLib/src/collections

Timestamp:

Mar 11, 2005, 10:38:56 AM (21 years ago)

Author:

desonia

Message:

made adjustments to psMetadata and added psFitsUpdateTable.

Location:

trunk/psLib/src/collections

Files:

• psMetadata.c (modified) (5 diffs)
• psMetadata.h (modified) (3 diffs)
• psVector.c (modified) (4 diffs)
• psVector.h (modified) (2 diffs)

trunk/psLib/src/collections/psMetadata.c

@@ -12 +12 @@
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.54 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-03-07 20:58:50 $
+*  @version $Revision: 1.55 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-03-11 20:38:56 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -67 +67 @@
 /*  FUNCTION IMPLEMENTATION - LOCAL                                          */
 /*****************************************************************************/
+
+static psMetadataItem* makeMetaMulti(psHash* table, const char* key, psMetadataItem* existing)
+{
+
+    if (existing != NULL && existing->type == PS_META_MULTI) {
+        return existing;
+    }
+
+    // move any existing entry into a psList
+    psList* newList = psListAlloc(existing);
+
+    psMetadataItem* item = psMetadataItemAlloc(key,
+                           PS_META_MULTI,
+                           "",
+                           newList);
+
+    if (existing != NULL) {
+        psHashRemove(table,key); // take out the old entry
+    }
+
+    psHashAdd(table, key, item); // put in the new entry
+
+    // free local references of newly allocated items.
+    psFree(newList);
+    psFree(item);
+
+    return item;
+}
 
 static void metadataItemFree(psMetadataItem* metadataItem)
@@ -253 +281 @@
     existingEntry = (psMetadataItem*)psHashLookup(mdTable, key);
 
-    // how the item is added to the hash depends on flags & prior existence
-    if(existingEntry != NULL) {
-        if ((flags & PS_META_DUPLICATE_OK) != 0) {
+    if (metadataItem->type == PS_META_MULTI) {
+        // the incoming entry is PS_META_MULTI
+
+        // force the hash entry to be PS_META_MULTI
+        existingEntry = makeMetaMulti(mdTable,key,existingEntry);
+
+        // add all the items in the incoming entry to metadata
+        psList* list = metadataItem->data.list;
+        if (list != NULL) {
+            psListIterator* iter = psListIteratorAlloc(list,PS_LIST_HEAD,true);
+            psMetadataItem* listItem;
+            while ((listItem=(psMetadataItem*)psListGetAndIncrement(iter)) != NULL) {
+                psMetadataAddItem(md,listItem,location,flags);
+            }
+            psFree(iter);
+        }
+
+        return true; // all done.
+    }
+
+    // how the item is added to the hash depends on prior existence, flags, etc.
+    if(existingEntry != NULL) { // prior existence
+        if (existingEntry->type == PS_META_MULTI || (flags & PS_META_DUPLICATE_OK) != 0) {
             // duplicate entries allowed - add another entry.
-            if (existingEntry->type != PS_META_MULTI) {
-                // first duplicate, transfer the hash's old entry into a
-                // list of entries with the type PS_META_MULTI.
-
-                // add entry to a list and dereference the local pointer
-                psList* newList = psListAlloc(existingEntry);
-
-                existingEntry = psMetadataItemAlloc(key,
-                                                    PS_META_MULTI,
-                                                    "",
-                                                    newList);
-                psHashRemove(mdTable,key); // take out the old entry
-                psHashAdd(mdTable, key, existingEntry); // put in the new entry
-
-                // free local references of newly allocated items.
-                psFree(newList);
-                psFree(existingEntry);
-
-            }
+
+            // make sure the existing entry is PS_META_MULTI
+            existingEntry = makeMetaMulti(mdTable,key,existingEntry);
 
             // add to the hash's list of duplicate entries
@@ -282 +314 @@
                 return false;
             }
-            // (added to list below)
-
         } else if ((flags & PS_META_REPLACE) != 0) {
             // replace entry instead of creating a duplicate entry.
 
             // remove the existing entry from metadata
-            psListRemoveData(mdList, existingEntry);
-            psHashRemove(mdTable, key);
+            psMetadataRemove(md,0,key);
 
             // treat as if new (added to list below)
@@ -423 +452 @@
             // multiple entries with same key, remove just the specified one
             psListRemoveData(tableItem->data.list, entry);
-            if (psListGet(tableItem->data.list,PS_LIST_HEAD) == NULL) {
-                // list is empty, so let's clear the whole entry now.
-                if (!psHashRemove(mdTable, key)) {
-                    psError(PS_ERR_UNKNOWN, false, PS_ERRORTEXT_psMetadata_REMOVE_TABLE_FAILED, key);
-                    return false;
-                }
-            }
         } else {
             if (!psHashRemove(mdTable, key)) {

trunk/psLib/src/collections/psMetadata.h

@@ -11 +11 @@
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.39 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-03-07 20:58:50 $
+*  @version $Revision: 1.40 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-03-11 20:38:56 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -37 +37 @@
  */
 typedef enum {
-    PS_META_S32,                       ///< psS32 primitive data.
-    PS_META_F32,                       ///< psF32 primitive data.
-    PS_META_F64,                       ///< psF64 primitive data.
-    PS_META_BOOL,                      ///< psBool primitive data.
-    PS_META_LIST,                      ///< List data (Stored as item.data.list).
+    PS_META_S32 = PS_TYPE_S32,         ///< psS32 primitive data.
+    PS_META_F32 = PS_TYPE_F32,         ///< psF32 primitive data.
+    PS_META_F64 = PS_TYPE_F64,         ///< psF64 primitive data.
+    PS_META_BOOL = PS_TYPE_BOOL,       ///< psBool primitive data.
+    PS_META_LIST = 0x10000,            ///< List data (Stored as item.data.list).
     PS_META_STR,                       ///< String data (Stored as item.data.V).
     PS_META_VEC,                       ///< Vector data (Stored as item.data.V).
@@ -51 +51 @@
     PS_META_ASTROM,                    ///< Astrometric coefficients (Stored as item.data.V).
     PS_META_UNKNOWN,                   ///< Other data (Stored as item.data.V).
-    PS_META_MULTI,                     ///< Used internally, do not create an metadata item of this type.
-    PS_META_NTYPE                      ///< Number of types. Must be last.
+    PS_META_MULTI                      ///< Used internally, do not create an metadata item of this type.
 } psMetadataType;
 

trunk/psLib/src/collections/psVector.c

@@ -1 @@
-
 /** @file  psVector.c
 *
@@ -10 +9 @@
 *  @author Robert DeSonia, MHPCC
 *
-*  @version $Revision: 1.34 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-02-17 19:26:23 $
+*  @version $Revision: 1.35 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-03-11 20:38:56 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -18 +17 @@
 #include <string.h>                        // for memcpy
 #include <stdlib.h>
+#include <stdio.h>
 #include <math.h>
 
@@ -407 +407 @@
     return outVector;
 }
+
+char* psVectorToString(psVector* vector, int maxLength)
+{
+
+    if (maxLength < 5) {
+        return NULL;
+    }
+
+    char* str = psAlloc(sizeof(char)*maxLength+1);
+
+    if (vector == NULL) {
+        snprintf(str,maxLength, "NULL");
+        return str;
+    }
+
+    int size = vector->n;
+
+    if (size == 0) {
+        snprintf(str,maxLength, "[]");
+        return str;
+    }
+
+    char* tempStr = psAlloc(sizeof(char)*maxLength+1);
+    *str = '\0';
+    bool full = false;
+
+    #define APPEND_ELEMENTS_CASE(TYPE, NATIVE_TYPE, FORMAT) \
+case PS_TYPE_##TYPE: \
+    for (lcv=0; lcv < size && ! full; lcv++) { \
+        snprintf(tempStr, maxLength, "%s" FORMAT, prefix, (NATIVE_TYPE) (vector->data.TYPE[lcv])); \
+        strncat(str,tempStr,maxLength); \
+        full = (strlen(str) > maxLength-2); \
+        prefix = ","; \
+    } \
+    break;
+
+    #define APPEND_ELEMENTS_CASE_COMPLEX(TYPE,CREAL,CIMAG) \
+case PS_TYPE_##TYPE: \
+    for (lcv=0; lcv < size && ! full; lcv++) { \
+        snprintf(tempStr, maxLength, "%s%g%+gi", prefix, \
+                 CREAL(vector->data.TYPE[lcv]), \
+                 CIMAG(vector->data.TYPE[lcv])); \
+        full = (strlen(str) > maxLength-2); \
+        prefix = ","; \
+    } \
+    break;
+
+    int lcv;
+    char* prefix = "[";
+    switch(vector->type.type) {
+        APPEND_ELEMENTS_CASE(S8,char,"%hd")
+        APPEND_ELEMENTS_CASE(S16,short int,"%hd")
+        APPEND_ELEMENTS_CASE(S32,int,"%d")
+        APPEND_ELEMENTS_CASE(S64,long,"%ld")
+        APPEND_ELEMENTS_CASE(U8,unsigned char,"%hu")
+        APPEND_ELEMENTS_CASE(U16,unsigned short,"%hu")
+        APPEND_ELEMENTS_CASE(U32,unsigned int, "%u")
+        APPEND_ELEMENTS_CASE(U64,unsigned long,"%lu")
+        APPEND_ELEMENTS_CASE(F32,double,"%g")
+        APPEND_ELEMENTS_CASE(F64,double,"%g")
+        APPEND_ELEMENTS_CASE_COMPLEX(C32,crealf,cimagf)
+        APPEND_ELEMENTS_CASE_COMPLEX(C64,creal,cimag)
+    default:
+        snprintf(str,maxLength,"[...]");
+        break;
+    }
+
+    if (full) {
+        // couldn't all fit in given string length
+
+        // remove elements until there is room for ",...]"
+        while (strlen(str) > maxLength - 5) {
+            char* lastComma = strrchr(str,',');
+            if (lastComma == NULL) { // no comma, must be first number
+                str[1] = '\0';
+            } else {
+                *lastComma = '\0';
+            }
+        }
+        strncat(str,",...]",maxLength);
+    } else {
+        strncat(str,"]",maxLength);
+    }
+
+    psFree(tempStr);
+
+    return str;
+}
+

trunk/psLib/src/collections/psVector.h

@@ -11 +11 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.28 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-02-17 19:26:23 $
+ *  @version $Revision: 1.29 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-03-11 20:38:56 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -144 +144 @@
 );
 
+/** Creates a string from a psVector's values in the form "[x0,x1,x2]".
+ *
+ *  @return psPtr          a newly allocated string
+ */
+char* psVectorToString(
+    psVector* vector,                  ///< vector to create a string from
+    int maxLength                      ///< the maximum length of the resulting string
+);
+
 /// @}