Changeset 4312 for trunk/psLib/src/db

Timestamp:

Jun 17, 2005, 2:53:32 PM (21 years ago)

Author:

drobbin

Message:

* empty log message *

Location:

trunk/psLib/src/db

Files:

• psDB.c (modified) (6 diffs)
• psDB.h (modified) (5 diffs)

trunk/psLib/src/db/psDB.c

@@ -12 +12 @@
  *  @author Joshua Hoblitt
  *
- *  @version $Revision: 1.28 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-18 00:52:56 $
+ *  @version $Revision: 1.29 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-18 00:53:32 $
  *
  *  Copyright 2005 Joshua Hoblitt, University of Hawaii
@@ -244 +244 @@
 }
 
-psArray *psDBSelectColumn(psDB *dbh, const char *tableName, const char *col, psU64 limit)
+psArray *psDBSelectColumn(psDB *dbh, const char *tableName, const char *col, unsigned long long limit)
 {
     MYSQL_RES       *result;            // complete db result set
@@ -339 +339 @@
 }
 
-psVector *psDBSelectColumnNum(psDB *dbh, const char *tableName, const char *col, psElemType pType, const psU64 limit)
+psVector *psDBSelectColumnNum(psDB *dbh, const char *tableName, const char *col, psElemType type, unsigned long long limit)
 {
     psArray         *stringColumn;      // source psArray
@@ -350 +350 @@
     }
 
-    column = psVectorAlloc(stringColumn->n, pType);
+    column = psVectorAlloc(stringColumn->n, type);
 
     // conversion functions are a portability issue
-    switch (pType) {
+    switch (type) {
     case PS_TYPE_S8:
         PS_STR_ARRAY_TO_PTYPE(column->data.S8, stringColumn, atoi, psS8, PS_TYPE_S8);
@@ -403 +403 @@
 }
 
-psArray *psDBSelectRows(psDB *dbh, const char *tableName, psMetadata *where, const psU64 limit)
+psArray *psDBSelectRows(psDB *dbh, const char *tableName, psMetadata *where, unsigned long long limit)
 {
     MYSQL_RES       *result;            // complete db result set
@@ -536 +536 @@
 }
 
-bool psDBInsertRows(psDB *dbh, const char *tableName, psArray *rowSet)
+bool psDBInsertRows(psDB *dbh, const char *tableName, const psArray *rowSet)
 {
     psMetadata      *row;               // row of data

trunk/psLib/src/db/psDB.h

@@ -10 +10 @@
  *  @author Joshua Hoblitt
  *
- *  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-07 02:29:44 $
+ *  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-18 00:53:32 $
  *
  *  Copyright 2005 Joshua Hoblitt, University of Hawaii
@@ -143 +143 @@
     const char *tableName,              ///< Table name
     const char *col,                    ///< Column name
-    const psU64 limit                   ///< Maximum number of elements to return
+    unsigned long long limit                   ///< Maximum number of elements to return
 );
 
@@ -158 +158 @@
     const char *tableName,              ///< Table name
     const char *col,                    ///< Column name
-    psElemType pType,                   ///< Resulting psVector type
-    const psU64 limit                   ///< Maximum number of elements to return
+    psElemType type,                   ///< Resulting psVector type
+    unsigned long long limit            ///< Maximum number of elements to return
 );
 
@@ -179 +179 @@
     psDB *dbh,                          ///< Database handle
     const char *tableName,              ///< Table name
-    psMetadata *where,                  ///< Row match criteria
-    const psU64 limit                   ///< Maximum number of elements to return
+    psMetadata *where,            ///< Row match criteria
+    unsigned long long limit            ///< Maximum number of elements to return
 );
 
@@ -212 +212 @@
     psDB *dbh,                          ///< Database handle
     const char *tableName,              ///< Table name
-    psArray *rowSet                     ///< Set of rows to insert
+    const psArray *rowSet                     ///< Set of rows to insert
 );