IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 3571


Ignore:
Timestamp:
Mar 30, 2005, 1:25:18 PM (21 years ago)
Author:
asc
Message:

bugfixes and tweaks: do not blindly convert MySQL datatypes to psLib datatypes

Location:
trunk/psLib/src
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/psLib/src/astronomy/psDB.c

    r3567 r3571  
    1212 *  @author Joshua Hoblitt
    1313 *
    14  *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
    15  *  @date $Date: 2005-03-30 23:07:45 $
     14 *  @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
     15 *  @date $Date: 2005-03-30 23:25:18 $
    1616 *
    1717 *  Copyright 2005 Joshua Hoblitt, University of Hawaii
     
    217217    MYSQL_ROW       row;                // single row of db result set
    218218    char            *query;             // SQL query
    219     psU64           rowCount;           // number of rows in db result set
    220     psU64           dataSize;           // size of field
     219    my_ulonglong    rowCount;           // number of rows in db result set
     220    unsigned long   dataSize;           // size of field
    221221    unsigned int    fieldCount;         // number of fields in db result set
    222222    psArray         *column = NULL;     // return array
     
    250250    }
    251251
    252     rowCount = (psU64)mysql_num_rows(result);
     252    rowCount = mysql_num_rows(result);
    253253
    254254    // pre-allocate enough elements to hold the complete result set
     
    261261        // get the first element of lengths array that is part of the
    262262        // result set
    263         dataSize = (psU64)*mysql_fetch_lengths(result);
     263        dataSize = *(mysql_fetch_lengths(result));
    264264
    265265        // represent NULL as an empty string
     
    372372    MYSQL_FIELD     *field;             // field type info
    373373    char            *query;             // SQL query
    374     psU64           rowCount;           // number of rows in db result set
    375     psU64           fieldCount;         // number of fields in db result set
    376     long            *fieldLength;       // field sizes
     374    my_ulonglong    rowCount;           // number of rows in db result set
     375    unsigned int    fieldCount;         // number of fields in db result set
     376    unsigned long   *fieldLength;       // field sizes
    377377    long            len;                // field length
    378378    psArray         *resultSet;         // return array
     
    413413    }
    414414
    415     rowCount = (psU64)mysql_num_rows(result);
     415    rowCount = mysql_num_rows(result);
    416416
    417417    // pre-allocate enough elements to hold the complete result set
     
    497497    MYSQL_STMT      *stmt;              // prepared db statement
    498498    MYSQL_BIND      *bind;              // field values to insert
    499     psU32           paramCount;         // number of placeholders in query
     499    unsigned long   paramCount;         // number of placeholders in query
    500500    psU64           j;                  // row index
    501501
     
    528528
    529529    // how many place holders are in our query
    530     paramCount = (psU32)mysql_stmt_param_count(stmt);
     530    paramCount = mysql_stmt_param_count(stmt);
    531531
    532532    // structure larger enough to hold one field of data per place holder
     
    591591    MYSQL_RES       *result;
    592592    MYSQL_FIELD     *field;
    593     psU32           fieldCount;
     593    unsigned int    fieldCount;
    594594    psMetadata      *table;
    595595    psU32           pType;
    596     psU32           i;
     596    unsigned int    i;
    597597    psPtr           column;
    598598
     
    642642    char            *query;
    643643    MYSQL_STMT      *stmt;              // prepared db statement
    644     psU32           paramCount;         // number of placeholders in query
     644    unsigned long   paramCount;         // number of placeholders in query
    645645    MYSQL_BIND      *bind;              // field values to insert
    646     psU64           rowsAffected;       // number of rows affected by query
     646    my_ulonglong    rowsAffected;       // number of rows affected by query
    647647
    648648    query = psDBGenerateUpdateRowSQL(tableName, where, values);
     
    670670
    671671    // how many place holders are in our query
    672     paramCount = (psU32)mysql_stmt_param_count(stmt);
     672    paramCount = mysql_stmt_param_count(stmt);
    673673
    674674    // structure large enough to hold one field of data per place holder
     
    713713    mysql_commit(dbh->mysql);
    714714
    715     rowsAffected = (psU64)mysql_stmt_affected_rows(stmt);
     715    rowsAffected = mysql_stmt_affected_rows(stmt);
    716716
    717717    mysql_stmt_close(stmt);
  • trunk/psLib/src/dataIO/psDB.c

    r3567 r3571  
    1212 *  @author Joshua Hoblitt
    1313 *
    14  *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
    15  *  @date $Date: 2005-03-30 23:07:45 $
     14 *  @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
     15 *  @date $Date: 2005-03-30 23:25:18 $
    1616 *
    1717 *  Copyright 2005 Joshua Hoblitt, University of Hawaii
     
    217217    MYSQL_ROW       row;                // single row of db result set
    218218    char            *query;             // SQL query
    219     psU64           rowCount;           // number of rows in db result set
    220     psU64           dataSize;           // size of field
     219    my_ulonglong    rowCount;           // number of rows in db result set
     220    unsigned long   dataSize;           // size of field
    221221    unsigned int    fieldCount;         // number of fields in db result set
    222222    psArray         *column = NULL;     // return array
     
    250250    }
    251251
    252     rowCount = (psU64)mysql_num_rows(result);
     252    rowCount = mysql_num_rows(result);
    253253
    254254    // pre-allocate enough elements to hold the complete result set
     
    261261        // get the first element of lengths array that is part of the
    262262        // result set
    263         dataSize = (psU64)*mysql_fetch_lengths(result);
     263        dataSize = *(mysql_fetch_lengths(result));
    264264
    265265        // represent NULL as an empty string
     
    372372    MYSQL_FIELD     *field;             // field type info
    373373    char            *query;             // SQL query
    374     psU64           rowCount;           // number of rows in db result set
    375     psU64           fieldCount;         // number of fields in db result set
    376     long            *fieldLength;       // field sizes
     374    my_ulonglong    rowCount;           // number of rows in db result set
     375    unsigned int    fieldCount;         // number of fields in db result set
     376    unsigned long   *fieldLength;       // field sizes
    377377    long            len;                // field length
    378378    psArray         *resultSet;         // return array
     
    413413    }
    414414
    415     rowCount = (psU64)mysql_num_rows(result);
     415    rowCount = mysql_num_rows(result);
    416416
    417417    // pre-allocate enough elements to hold the complete result set
     
    497497    MYSQL_STMT      *stmt;              // prepared db statement
    498498    MYSQL_BIND      *bind;              // field values to insert
    499     psU32           paramCount;         // number of placeholders in query
     499    unsigned long   paramCount;         // number of placeholders in query
    500500    psU64           j;                  // row index
    501501
     
    528528
    529529    // how many place holders are in our query
    530     paramCount = (psU32)mysql_stmt_param_count(stmt);
     530    paramCount = mysql_stmt_param_count(stmt);
    531531
    532532    // structure larger enough to hold one field of data per place holder
     
    591591    MYSQL_RES       *result;
    592592    MYSQL_FIELD     *field;
    593     psU32           fieldCount;
     593    unsigned int    fieldCount;
    594594    psMetadata      *table;
    595595    psU32           pType;
    596     psU32           i;
     596    unsigned int    i;
    597597    psPtr           column;
    598598
     
    642642    char            *query;
    643643    MYSQL_STMT      *stmt;              // prepared db statement
    644     psU32           paramCount;         // number of placeholders in query
     644    unsigned long   paramCount;         // number of placeholders in query
    645645    MYSQL_BIND      *bind;              // field values to insert
    646     psU64           rowsAffected;       // number of rows affected by query
     646    my_ulonglong    rowsAffected;       // number of rows affected by query
    647647
    648648    query = psDBGenerateUpdateRowSQL(tableName, where, values);
     
    670670
    671671    // how many place holders are in our query
    672     paramCount = (psU32)mysql_stmt_param_count(stmt);
     672    paramCount = mysql_stmt_param_count(stmt);
    673673
    674674    // structure large enough to hold one field of data per place holder
     
    713713    mysql_commit(dbh->mysql);
    714714
    715     rowsAffected = (psU64)mysql_stmt_affected_rows(stmt);
     715    rowsAffected = mysql_stmt_affected_rows(stmt);
    716716
    717717    mysql_stmt_close(stmt);
  • trunk/psLib/src/db/psDB.c

    r3567 r3571  
    1212 *  @author Joshua Hoblitt
    1313 *
    14  *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
    15  *  @date $Date: 2005-03-30 23:07:45 $
     14 *  @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
     15 *  @date $Date: 2005-03-30 23:25:18 $
    1616 *
    1717 *  Copyright 2005 Joshua Hoblitt, University of Hawaii
     
    217217    MYSQL_ROW       row;                // single row of db result set
    218218    char            *query;             // SQL query
    219     psU64           rowCount;           // number of rows in db result set
    220     psU64           dataSize;           // size of field
     219    my_ulonglong    rowCount;           // number of rows in db result set
     220    unsigned long   dataSize;           // size of field
    221221    unsigned int    fieldCount;         // number of fields in db result set
    222222    psArray         *column = NULL;     // return array
     
    250250    }
    251251
    252     rowCount = (psU64)mysql_num_rows(result);
     252    rowCount = mysql_num_rows(result);
    253253
    254254    // pre-allocate enough elements to hold the complete result set
     
    261261        // get the first element of lengths array that is part of the
    262262        // result set
    263         dataSize = (psU64)*mysql_fetch_lengths(result);
     263        dataSize = *(mysql_fetch_lengths(result));
    264264
    265265        // represent NULL as an empty string
     
    372372    MYSQL_FIELD     *field;             // field type info
    373373    char            *query;             // SQL query
    374     psU64           rowCount;           // number of rows in db result set
    375     psU64           fieldCount;         // number of fields in db result set
    376     long            *fieldLength;       // field sizes
     374    my_ulonglong    rowCount;           // number of rows in db result set
     375    unsigned int    fieldCount;         // number of fields in db result set
     376    unsigned long   *fieldLength;       // field sizes
    377377    long            len;                // field length
    378378    psArray         *resultSet;         // return array
     
    413413    }
    414414
    415     rowCount = (psU64)mysql_num_rows(result);
     415    rowCount = mysql_num_rows(result);
    416416
    417417    // pre-allocate enough elements to hold the complete result set
     
    497497    MYSQL_STMT      *stmt;              // prepared db statement
    498498    MYSQL_BIND      *bind;              // field values to insert
    499     psU32           paramCount;         // number of placeholders in query
     499    unsigned long   paramCount;         // number of placeholders in query
    500500    psU64           j;                  // row index
    501501
     
    528528
    529529    // how many place holders are in our query
    530     paramCount = (psU32)mysql_stmt_param_count(stmt);
     530    paramCount = mysql_stmt_param_count(stmt);
    531531
    532532    // structure larger enough to hold one field of data per place holder
     
    591591    MYSQL_RES       *result;
    592592    MYSQL_FIELD     *field;
    593     psU32           fieldCount;
     593    unsigned int    fieldCount;
    594594    psMetadata      *table;
    595595    psU32           pType;
    596     psU32           i;
     596    unsigned int    i;
    597597    psPtr           column;
    598598
     
    642642    char            *query;
    643643    MYSQL_STMT      *stmt;              // prepared db statement
    644     psU32           paramCount;         // number of placeholders in query
     644    unsigned long   paramCount;         // number of placeholders in query
    645645    MYSQL_BIND      *bind;              // field values to insert
    646     psU64           rowsAffected;       // number of rows affected by query
     646    my_ulonglong    rowsAffected;       // number of rows affected by query
    647647
    648648    query = psDBGenerateUpdateRowSQL(tableName, where, values);
     
    670670
    671671    // how many place holders are in our query
    672     paramCount = (psU32)mysql_stmt_param_count(stmt);
     672    paramCount = mysql_stmt_param_count(stmt);
    673673
    674674    // structure large enough to hold one field of data per place holder
     
    713713    mysql_commit(dbh->mysql);
    714714
    715     rowsAffected = (psU64)mysql_stmt_affected_rows(stmt);
     715    rowsAffected = mysql_stmt_affected_rows(stmt);
    716716
    717717    mysql_stmt_close(stmt);
  • trunk/psLib/src/fileUtils/psDB.c

    r3567 r3571  
    1212 *  @author Joshua Hoblitt
    1313 *
    14  *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
    15  *  @date $Date: 2005-03-30 23:07:45 $
     14 *  @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
     15 *  @date $Date: 2005-03-30 23:25:18 $
    1616 *
    1717 *  Copyright 2005 Joshua Hoblitt, University of Hawaii
     
    217217    MYSQL_ROW       row;                // single row of db result set
    218218    char            *query;             // SQL query
    219     psU64           rowCount;           // number of rows in db result set
    220     psU64           dataSize;           // size of field
     219    my_ulonglong    rowCount;           // number of rows in db result set
     220    unsigned long   dataSize;           // size of field
    221221    unsigned int    fieldCount;         // number of fields in db result set
    222222    psArray         *column = NULL;     // return array
     
    250250    }
    251251
    252     rowCount = (psU64)mysql_num_rows(result);
     252    rowCount = mysql_num_rows(result);
    253253
    254254    // pre-allocate enough elements to hold the complete result set
     
    261261        // get the first element of lengths array that is part of the
    262262        // result set
    263         dataSize = (psU64)*mysql_fetch_lengths(result);
     263        dataSize = *(mysql_fetch_lengths(result));
    264264
    265265        // represent NULL as an empty string
     
    372372    MYSQL_FIELD     *field;             // field type info
    373373    char            *query;             // SQL query
    374     psU64           rowCount;           // number of rows in db result set
    375     psU64           fieldCount;         // number of fields in db result set
    376     long            *fieldLength;       // field sizes
     374    my_ulonglong    rowCount;           // number of rows in db result set
     375    unsigned int    fieldCount;         // number of fields in db result set
     376    unsigned long   *fieldLength;       // field sizes
    377377    long            len;                // field length
    378378    psArray         *resultSet;         // return array
     
    413413    }
    414414
    415     rowCount = (psU64)mysql_num_rows(result);
     415    rowCount = mysql_num_rows(result);
    416416
    417417    // pre-allocate enough elements to hold the complete result set
     
    497497    MYSQL_STMT      *stmt;              // prepared db statement
    498498    MYSQL_BIND      *bind;              // field values to insert
    499     psU32           paramCount;         // number of placeholders in query
     499    unsigned long   paramCount;         // number of placeholders in query
    500500    psU64           j;                  // row index
    501501
     
    528528
    529529    // how many place holders are in our query
    530     paramCount = (psU32)mysql_stmt_param_count(stmt);
     530    paramCount = mysql_stmt_param_count(stmt);
    531531
    532532    // structure larger enough to hold one field of data per place holder
     
    591591    MYSQL_RES       *result;
    592592    MYSQL_FIELD     *field;
    593     psU32           fieldCount;
     593    unsigned int    fieldCount;
    594594    psMetadata      *table;
    595595    psU32           pType;
    596     psU32           i;
     596    unsigned int    i;
    597597    psPtr           column;
    598598
     
    642642    char            *query;
    643643    MYSQL_STMT      *stmt;              // prepared db statement
    644     psU32           paramCount;         // number of placeholders in query
     644    unsigned long   paramCount;         // number of placeholders in query
    645645    MYSQL_BIND      *bind;              // field values to insert
    646     psU64           rowsAffected;       // number of rows affected by query
     646    my_ulonglong    rowsAffected;       // number of rows affected by query
    647647
    648648    query = psDBGenerateUpdateRowSQL(tableName, where, values);
     
    670670
    671671    // how many place holders are in our query
    672     paramCount = (psU32)mysql_stmt_param_count(stmt);
     672    paramCount = mysql_stmt_param_count(stmt);
    673673
    674674    // structure large enough to hold one field of data per place holder
     
    713713    mysql_commit(dbh->mysql);
    714714
    715     rowsAffected = (psU64)mysql_stmt_affected_rows(stmt);
     715    rowsAffected = mysql_stmt_affected_rows(stmt);
    716716
    717717    mysql_stmt_close(stmt);
Note: See TracChangeset for help on using the changeset viewer.