Index: trunk/psLib/test/dataIO/tst_psDB.c
===================================================================
--- trunk/psLib/test/dataIO/tst_psDB.c	(revision 4391)
+++ trunk/psLib/test/dataIO/tst_psDB.c	(revision 4394)
@@ -9,6 +9,6 @@
  *  @author Aaron Culliney, MHPCC
  *
- *  @version $Revision: 1.29 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-25 01:34:07 $
+ *  @version $Revision: 1.30 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-25 02:45:15 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -1612,21 +1612,28 @@
         switch(itemNum) {
         case 0:
-            if(mdItem->type != PS_META_ARRAY) {
+            if(mdItem->type != PS_META_VEC) {
                 psError(PS_ERR_UNKNOWN,true,"Column #%d type %d not as expected %d",
-                        itemNum,mdItem->type,PS_META_ARRAY);
+                        itemNum,mdItem->type,PS_META_VEC);
                 psDBDropTable(dbh,table);
                 psDBCleanup(dbh);
                 return 5*(itemNum+1);
             }
-            if(((psArray*)mdItem->data.V)->n != 3) {
+            if(((psVector*)mdItem->data.V)->type.type != PS_TYPE_S32) {
+                psError(PS_ERR_UNKNOWN,true,"Column #%d vector type %d not as expected %d",
+                        itemNum,((psVector*)mdItem->data.V)->type.type, PS_TYPE_S32);
+                psDBDropTable(dbh,table);
+                psDBCleanup(dbh);
+                return 6*(itemNum+1);
+            }
+            if(((psVector*)mdItem->data.V)->n != 3) {
                 psError(PS_ERR_UNKNOWN,true,"Column #%d vector size %d not as expected %d",
-                        itemNum,((psArray*)mdItem->data.V)->n,3);
+                        itemNum,((psVector*)mdItem->data.V)->n,3);
                 psDBDropTable(dbh,table);
                 psDBCleanup(dbh);
                 return 7*(itemNum+1);
             }
-            if(strcmp(mdItem->name,TAB_COL_0_NAME) != 0) {
+            if(strcmp(mdItem->name,TAB_COL_5_NAME) != 0) {
                 psError(PS_ERR_UNKNOWN,true,"Column #%d name %s not as expected %s",
-                        itemNum,mdItem->name,TAB_COL_0_NAME);
+                        itemNum,mdItem->name,TAB_COL_5_NAME);
                 psDBDropTable(dbh,table);
                 psDBCleanup(dbh);
@@ -1635,4 +1642,94 @@
             break;
         case 1:
+            if(mdItem->type != PS_META_VEC) {
+                psError(PS_ERR_UNKNOWN,true,"Column #%d type %d not as expected %d",
+                        itemNum,mdItem->type,PS_META_VEC);
+                psDBDropTable(dbh,table);
+                psDBCleanup(dbh);
+                return 5*(itemNum+1);
+            }
+            if(((psVector*)mdItem->data.V)->type.type != PS_TYPE_BOOL) {
+                psError(PS_ERR_UNKNOWN,true,"Column #%d vector type %d not as expected %d",
+                        itemNum,((psVector*)mdItem->data.V)->type.type, PS_TYPE_BOOL);
+                psDBDropTable(dbh,table);
+                psDBCleanup(dbh);
+                return 6*(itemNum+1);
+            }
+            if(((psVector*)mdItem->data.V)->n != 3) {
+                psError(PS_ERR_UNKNOWN,true,"Column #%d vector size %d not as expected %d",
+                        itemNum,((psVector*)mdItem->data.V)->n,3);
+                psDBDropTable(dbh,table);
+                psDBCleanup(dbh);
+                return 7*(itemNum+1);
+            }
+            if(strcmp(mdItem->name,TAB_COL_4_NAME) != 0) {
+                psError(PS_ERR_UNKNOWN,true,"Column #%d name %s not as expected %s",
+                        itemNum,mdItem->name,TAB_COL_4_NAME);
+                psDBDropTable(dbh,table);
+                psDBCleanup(dbh);
+                return 8*(itemNum+1);
+            }
+            break;
+        case 2:
+            if(mdItem->type != PS_META_VEC) {
+                psError(PS_ERR_UNKNOWN,true,"Column #%d type %d not as expected %d",
+                        itemNum,mdItem->type,PS_META_VEC);
+                psDBDropTable(dbh,table);
+                psDBCleanup(dbh);
+                return 5*(itemNum+1);
+            }
+            if(((psVector*)mdItem->data.V)->type.type != PS_TYPE_F64) {
+                psError(PS_ERR_UNKNOWN,true,"Column #%d vector type %d not as expected %d",
+                        itemNum,((psVector*)mdItem->data.V)->type.type, PS_TYPE_F64);
+                psDBDropTable(dbh,table);
+                psDBCleanup(dbh);
+                return 6*(itemNum+1);
+            }
+            if(((psVector*)mdItem->data.V)->n != 3) {
+                psError(PS_ERR_UNKNOWN,true,"Column #%d vector size %d not as expected %d",
+                        itemNum,((psVector*)mdItem->data.V)->n,3);
+                psDBDropTable(dbh,table);
+                psDBCleanup(dbh);
+                return 7*(itemNum+1);
+            }
+            if(strcmp(mdItem->name,TAB_COL_3_NAME) != 0) {
+                psError(PS_ERR_UNKNOWN,true,"Column #%d name %s not as expected %s",
+                        itemNum,mdItem->name,TAB_COL_3_NAME);
+                psDBDropTable(dbh,table);
+                psDBCleanup(dbh);
+                return 8*(itemNum+1);
+            }
+            break;
+        case 3:
+            if(mdItem->type != PS_META_VEC) {
+                psError(PS_ERR_UNKNOWN,true,"Column #%d type %d not as expected %d",
+                        itemNum,mdItem->type,PS_META_VEC);
+                psDBDropTable(dbh,table);
+                psDBCleanup(dbh);
+                return 5*(itemNum+1);
+            }
+            if(((psVector*)mdItem->data.V)->type.type != PS_TYPE_F32) {
+                psError(PS_ERR_UNKNOWN,true,"Column #%d vector type %d not as expected %d",
+                        itemNum,((psVector*)mdItem->data.V)->type.type, PS_TYPE_F32);
+                psDBDropTable(dbh,table);
+                psDBCleanup(dbh);
+                return 6*(itemNum+1);
+            }
+            if(((psVector*)mdItem->data.V)->n != 3) {
+                psError(PS_ERR_UNKNOWN,true,"Column #%d vector size %d not as expected %d",
+                        itemNum,((psVector*)mdItem->data.V)->n,3);
+                psDBDropTable(dbh,table);
+                psDBCleanup(dbh);
+                return 7*(itemNum+1);
+            }
+            if(strcmp(mdItem->name,TAB_COL_2_NAME) != 0) {
+                psError(PS_ERR_UNKNOWN,true,"Column #%d name %s not as expected %s",
+                        itemNum,mdItem->name,TAB_COL_2_NAME);
+                psDBDropTable(dbh,table);
+                psDBCleanup(dbh);
+                return 8*(itemNum+1);
+            }
+            break;
+        case 4:
             if(mdItem->type != PS_META_VEC) {
                 psError(PS_ERR_UNKNOWN,true,"Column #%d type %d not as expected %d",
@@ -1664,124 +1761,26 @@
             }
             break;
-        case 2:
-            if(mdItem->type != PS_META_VEC) {
+        case 5:
+            if(mdItem->type != PS_META_ARRAY) {
                 psError(PS_ERR_UNKNOWN,true,"Column #%d type %d not as expected %d",
-                        itemNum,mdItem->type,PS_META_VEC);
+                        itemNum,mdItem->type,PS_META_ARRAY);
                 psDBDropTable(dbh,table);
                 psDBCleanup(dbh);
                 return 5*(itemNum+1);
             }
-            if(((psVector*)mdItem->data.V)->type.type != PS_TYPE_F32) {
-                psError(PS_ERR_UNKNOWN,true,"Column #%d vector type %d not as expected %d",
-                        itemNum,((psVector*)mdItem->data.V)->type.type, PS_TYPE_F32);
-                psDBDropTable(dbh,table);
-                psDBCleanup(dbh);
-                return 6*(itemNum+1);
-            }
-            if(((psVector*)mdItem->data.V)->n != 3) {
+            if(((psArray*)mdItem->data.V)->n != 3) {
                 psError(PS_ERR_UNKNOWN,true,"Column #%d vector size %d not as expected %d",
-                        itemNum,((psVector*)mdItem->data.V)->n,3);
+                        itemNum,((psArray*)mdItem->data.V)->n,3);
                 psDBDropTable(dbh,table);
                 psDBCleanup(dbh);
                 return 7*(itemNum+1);
             }
-            if(strcmp(mdItem->name,TAB_COL_2_NAME) != 0) {
+            if(strcmp(mdItem->name,TAB_COL_0_NAME) != 0) {
                 psError(PS_ERR_UNKNOWN,true,"Column #%d name %s not as expected %s",
-                        itemNum,mdItem->name,TAB_COL_2_NAME);
+                        itemNum,mdItem->name,TAB_COL_0_NAME);
                 psDBDropTable(dbh,table);
                 psDBCleanup(dbh);
                 return 8*(itemNum+1);
             }
-            break;
-        case 3:
-            if(mdItem->type != PS_META_VEC) {
-                psError(PS_ERR_UNKNOWN,true,"Column #%d type %d not as expected %d",
-                        itemNum,mdItem->type,PS_META_VEC);
-                psDBDropTable(dbh,table);
-                psDBCleanup(dbh);
-                return 5*(itemNum+1);
-            }
-            if(((psVector*)mdItem->data.V)->type.type != PS_TYPE_F64) {
-                psError(PS_ERR_UNKNOWN,true,"Column #%d vector type %d not as expected %d",
-                        itemNum,((psVector*)mdItem->data.V)->type.type, PS_TYPE_F64);
-                psDBDropTable(dbh,table);
-                psDBCleanup(dbh);
-                return 6*(itemNum+1);
-            }
-            if(((psVector*)mdItem->data.V)->n != 3) {
-                psError(PS_ERR_UNKNOWN,true,"Column #%d vector size %d not as expected %d",
-                        itemNum,((psVector*)mdItem->data.V)->n,3);
-                psDBDropTable(dbh,table);
-                psDBCleanup(dbh);
-                return 7*(itemNum+1);
-            }
-            if(strcmp(mdItem->name,TAB_COL_3_NAME) != 0) {
-                psError(PS_ERR_UNKNOWN,true,"Column #%d name %s not as expected %s",
-                        itemNum,mdItem->name,TAB_COL_3_NAME);
-                psDBDropTable(dbh,table);
-                psDBCleanup(dbh);
-                return 8*(itemNum+1);
-            }
-            break;
-        case 4:
-            if(mdItem->type != PS_META_VEC) {
-                psError(PS_ERR_UNKNOWN,true,"Column #%d type %d not as expected %d",
-                        itemNum,mdItem->type,PS_META_VEC);
-                psDBDropTable(dbh,table);
-                psDBCleanup(dbh);
-                return 5*(itemNum+1);
-            }
-            if(((psVector*)mdItem->data.V)->type.type != PS_TYPE_BOOL) {
-                psError(PS_ERR_UNKNOWN,true,"Column #%d vector type %d not as expected %d",
-                        itemNum,((psVector*)mdItem->data.V)->type.type, PS_TYPE_BOOL);
-                psDBDropTable(dbh,table);
-                psDBCleanup(dbh);
-                return 6*(itemNum+1);
-            }
-            if(((psVector*)mdItem->data.V)->n != 3) {
-                psError(PS_ERR_UNKNOWN,true,"Column #%d vector size %d not as expected %d",
-                        itemNum,((psVector*)mdItem->data.V)->n,3);
-                psDBDropTable(dbh,table);
-                psDBCleanup(dbh);
-                return 7*(itemNum+1);
-            }
-            if(strcmp(mdItem->name,TAB_COL_4_NAME) != 0) {
-                psError(PS_ERR_UNKNOWN,true,"Column #%d name %s not as expected %s",
-                        itemNum,mdItem->name,TAB_COL_4_NAME);
-                psDBDropTable(dbh,table);
-                psDBCleanup(dbh);
-                return 8*(itemNum+1);
-            }
-            break;
-        case 5:
-            if(mdItem->type != PS_META_VEC) {
-                psError(PS_ERR_UNKNOWN,true,"Column #%d type %d not as expected %d",
-                        itemNum,mdItem->type,PS_META_VEC);
-                psDBDropTable(dbh,table);
-                psDBCleanup(dbh);
-                return 5*(itemNum+1);
-            }
-            if(((psVector*)mdItem->data.V)->type.type != PS_TYPE_S32) {
-                psError(PS_ERR_UNKNOWN,true,"Column #%d vector type %d not as expected %d",
-                        itemNum,((psVector*)mdItem->data.V)->type.type, PS_TYPE_S32);
-                psDBDropTable(dbh,table);
-                psDBCleanup(dbh);
-                return 6*(itemNum+1);
-            }
-            if(((psVector*)mdItem->data.V)->n != 3) {
-                psError(PS_ERR_UNKNOWN,true,"Column #%d vector size %d not as expected %d",
-                        itemNum,((psVector*)mdItem->data.V)->n,3);
-                psDBDropTable(dbh,table);
-                psDBCleanup(dbh);
-                return 7*(itemNum+1);
-            }
-            if(strcmp(mdItem->name,TAB_COL_5_NAME) != 0) {
-                psError(PS_ERR_UNKNOWN,true,"Column #%d name %s not as expected %s",
-                        itemNum,mdItem->name,TAB_COL_5_NAME);
-                psDBDropTable(dbh,table);
-                psDBCleanup(dbh);
-                return 8*(itemNum+1);
-            }
-            break;
             break;