Changeset 4393

Timestamp:

Jun 24, 2005, 4:44:14 PM (21 years ago)

Author:

evanalst

Message:

Fix psDBSelectRows and psDBDumpCols field ordering. Bug #448.

Location:

trunk/psLib/src

Files:

• dataIO/psDB.c (modified) (4 diffs)
• db/psDB.c (modified) (4 diffs)

trunk/psLib/src/dataIO/psDB.c

@@ -12 +12 @@
  *  @author Joshua Hoblitt
  *
- *  @version $Revision: 1.34 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-25 01:16:50 $
+ *  @version $Revision: 1.35 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-25 02:44:14 $
  *
  *  Copyright 2005 Joshua Hoblitt, University of Hawaii
@@ -419 +419 @@
     psPtr           data;               // copy of result field
 
+    // Create select row query
     query = psDBGenerateSelectRowSQL(tableName, NULL, where, limit);
     if (!query) {
         psError(PS_ERR_UNEXPECTED_NULL, false, "Query generation failed.");
-
-        return NULL;
-    }
-
+        return NULL;
+    }
+
+    // Run SQL query
     if (!p_psDBRunQuery(dbh, query)) {
         psError(PS_ERR_UNKNOWN, false, "Query execution failed.");
-
         psFree(query);
-
-        return NULL;
-    }
-
+        return NULL;
+    }
     psFree(query);
 
@@ -482 +480 @@
             // 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);
             }
 
@@ -687 +685 @@
             // PS_META_UNKNOWN -> PS_META_ARRAY ?
             column = psDBSelectColumn(dbh, tableName, field[i].name, 0);
-            psMetadataAddArray(table, 0, field[i].name, "", column);
-            //            psMetadataAddStr(table, 0, field[i].name, "", column);
+            psMetadataAddArray(table, PS_LIST_TAIL, 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);
         }

trunk/psLib/src/db/psDB.c

@@ -12 +12 @@
  *  @author Joshua Hoblitt
  *
- *  @version $Revision: 1.34 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-25 01:16:50 $
+ *  @version $Revision: 1.35 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-25 02:44:14 $
  *
  *  Copyright 2005 Joshua Hoblitt, University of Hawaii
@@ -419 +419 @@
     psPtr           data;               // copy of result field
 
+    // Create select row query
     query = psDBGenerateSelectRowSQL(tableName, NULL, where, limit);
     if (!query) {
         psError(PS_ERR_UNEXPECTED_NULL, false, "Query generation failed.");
-
-        return NULL;
-    }
-
+        return NULL;
+    }
+
+    // Run SQL query
     if (!p_psDBRunQuery(dbh, query)) {
         psError(PS_ERR_UNKNOWN, false, "Query execution failed.");
-
         psFree(query);
-
-        return NULL;
-    }
-
+        return NULL;
+    }
     psFree(query);
 
@@ -482 +480 @@
             // 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);
             }
 
@@ -687 +685 @@
             // PS_META_UNKNOWN -> PS_META_ARRAY ?
             column = psDBSelectColumn(dbh, tableName, field[i].name, 0);
-            psMetadataAddArray(table, 0, field[i].name, "", column);
-            //            psMetadataAddStr(table, 0, field[i].name, "", column);
+            psMetadataAddArray(table, PS_LIST_TAIL, 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);
         }