Changeset 3224 for trunk/archive/psdb/psDB.c

Timestamp:

Feb 14, 2005, 9:57:53 PM (21 years ago)

Author:

jhoblitt

Message:

convert from psMetadataAddItem() to psMetadataAdd()

File:

• trunk/archive/psdb/psDB.c (modified) (5 diffs)

trunk/archive/psdb/psDB.c

@@ -8 +8 @@
  *  @author Joshua Hoblitt
  *
- *  @version $Revision: 1.25 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-02-15 07:28:50 $
+ *  @version $Revision: 1.26 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-02-15 07:57:53 $
  *
  *  Copyright 2005 Joshua Hoblitt, University of Hawaii
@@ -352 +352 @@
     psArray         *resultSet;         // return array
     int             i;                  // field index
-    psMetadataItem  *item;              // field of a row
     psMetadata      *md;                // a row
     psHash          *mysqlToSQLTable;   // type lookup table
@@ -448 +447 @@
 
             // add new field to row
-            item = psMetadataItemAlloc(field[i].name, pType, type, NULL, data);
-            psMetadataAddItem(md, item, i);
-            psFree(item);
+            psMetadataAdd(md, i, field[i].name, pType, type, NULL, data);
 
             psFree(data);
@@ -592 +589 @@
     psU32           fieldCount;
     psMetadata      *table;
-    psMetadataItem  *item;
     psU32           pType;
     psU32           i;
@@ -615 +611 @@
             // PS_META_UNKNOWN -> PS_META_ARRAY ?
             column = psDBSelectColumn(dbh, tableName, field[i].name, 0);
-            item = psMetadataItemAlloc(field[i].name, PS_TYPE_PTR, PS_META_UNKNOWN, "psArray", column);
-            psMetadataAddItem(table, item, 0);
+            psMetadataAdd(table, 0, field[i].name, PS_TYPE_PTR, PS_META_UNKNOWN, "psArray", column);
             // FIXME
             //psFree(column);
-            psFree(item);
         } else {
             column = psDBSelectColumnNum(dbh, tableName, field[i].name, pType, 0);
-            item = psMetadataItemAlloc(field[i].name, PS_TYPE_PTR, PS_META_VEC, "psVector", column);
-            psMetadataAddItem(table, item, 0);
+            psMetadataAdd(table, 0, field[i].name, PS_TYPE_PTR, PS_META_VEC, "psVector", column);
             // FIXME
             //psFree(column);
-            psFree(item);
         }
     }