Changeset 4891 for trunk/psLib/src/db/psDB.c

Timestamp:

Aug 26, 2005, 3:33:41 PM (21 years ago)

Author:

drobbin

Message:

psMetadataAddWhatever fxns now accept an int format parameter (bug504)

File:

• trunk/psLib/src/db/psDB.c (modified) (3 diffs)

trunk/psLib/src/db/psDB.c

@@ -12 +12 @@
  *  @author Joshua Hoblitt
  *
- *  @version $Revision: 1.41 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-07-26 20:00:57 $
+ *  @version $Revision: 1.42 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-08-27 01:33:40 $
  *
  *  Copyright 2005 Joshua Hoblitt, University of Hawaii
@@ -502 +502 @@
             // copy field data and convert NULLs to the appropriate NaN value
             if (pType == PS_META_STR) {
-                psMetadataAddStr(md, PS_LIST_TAIL, field[i].name, "", data);
+                psMetadataAddStr(md, PS_LIST_TAIL, field[i].name, 0, "", data);
             } else if (pType == PS_META_S32) {
-                psMetadataAddS32(md, PS_LIST_TAIL, field[i].name, "", atoll(data));
+                psMetadataAddS32(md, PS_LIST_TAIL, field[i].name, 0, "", atoll(data));
             } else if (pType == PS_META_F32) {
-                psMetadataAddF32(md, PS_LIST_TAIL, field[i].name, "", atof(data));
+                psMetadataAddF32(md, PS_LIST_TAIL, field[i].name, 0, "", atof(data));
             } else if (pType == PS_META_F64) {
-                psMetadataAddF64(md, PS_LIST_TAIL, field[i].name, "", atof(data));
+                psMetadataAddF64(md, PS_LIST_TAIL, field[i].name, 0, "", atof(data));
             } else if (pType == PS_META_BOOL) {
                 psMetadataAdd(md, PS_LIST_TAIL, field[i].name, pType, "", atoi(data));
             } else {
                 // XXX: assume binary string ...
-                psMetadataAddStr(md, PS_LIST_TAIL, field[i].name, "", data);
+                psMetadataAddStr(md, PS_LIST_TAIL, field[i].name, 0, "", data);
             }
 
@@ -713 +713 @@
             // PS_META_UNKNOWN -> PS_META_ARRAY ?
             column = psDBSelectColumn(dbh, tableName, field[i].name, 0);
-            psMetadataAddArray(table, PS_LIST_TAIL, field[i].name, "", column);
+            psMetadataAddArray(table, PS_LIST_TAIL, field[i].name, 0, "", column);
             //            psMetadataAddStr(table, PS_LIST_TAIL, field[i].name, "", column);
             psFree(column);
         } else {
             column = psDBSelectColumnNum(dbh, tableName, field[i].name, pType, 0);
-            psMetadataAddVector(table, PS_LIST_TAIL, field[i].name, "", column);
+            psMetadataAddVector(table, PS_LIST_TAIL, field[i].name, 0, "", column);
             psFree(column);
         }