Ticket #448: pslib-0.6.0-preserve_field_order.patch

src/dataIO/psDB.c

@@ -481 +481 @@
 
             // copy field data and convert NULLs to the appropriate NaN value
             if (pType == PS_META_STR) {
-                psMetadataAddStr(md, 0, field[i].name, "", data);
+                psMetadataAddStr(md, PS_LIST_TAIL, field[i].name, "", data);
             } else if (pType == PS_META_S32) {
-                psMetadataAddS32(md, 0, field[i].name, "", atoll(data));
+                psMetadataAddS32(md, PS_LIST_TAIL, field[i].name, "", atoll(data));
             } else if (pType == PS_META_F32) {
-                psMetadataAddF32(md, 0, field[i].name, "", atof(data));
+                psMetadataAddF32(md, PS_LIST_TAIL, field[i].name, "", atof(data));
             } else if (pType == PS_META_F64) {
-                psMetadataAddF64(md, 0, field[i].name, "", atof(data));
+                psMetadataAddF64(md, PS_LIST_TAIL, field[i].name, "", atof(data));
             } else if (pType == PS_META_BOOL) {
-                psMetadataAdd(md, 0, field[i].name, pType, "", atoi(data));
+                psMetadataAdd(md, PS_LIST_TAIL, field[i].name, pType, "", atoi(data));
             } else {
                 // XXX: assume binary string ...
-                psMetadataAddStr(md, 0, field[i].name, "", data);
+                psMetadataAddStr(md, PS_LIST_TAIL, field[i].name, "", data);
             }
 
             psFree(data);
@@ -674 +674 @@
         if (pType == PS_META_STR) {
             // PS_META_UNKNOWN -> PS_META_ARRAY ?
             column = psDBSelectColumn(dbh, tableName, field[i].name, 0);
-            psMetadataAddStr(table, 0, field[i].name, "", column);
+            psMetadataAddStr(table, PS_LIST_TAIL, field[i].name, "", column);
             psFree(column);
         } else {
             column = psDBSelectColumnNum(dbh, tableName, field[i].name, pType, 0);
-            psMetadataAddVector(table, 0, field[i].name, "", column);
+            psMetadataAddVector(table, PS_LIST_TAIL, field[i].name, "", column);
             psFree(column);
         }
     }