IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 4341


Ignore:
Timestamp:
Jun 21, 2005, 3:41:30 PM (21 years ago)
Author:
jhoblitt
Message:

add psError() error reporting

Location:
trunk/glueforge/templates/psdb
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/glueforge/templates/psdb/createtable.tt

    r4337 r4341  
    2626    if (!psMetadataAdd(md, PS_LIST_TAIL, "[% item.name %]", PS_META_BOOL, [% item.comment %], [% item.value %])) {
    2727[% END -%]
    28         // psError(); something bad happened
     28        psError(PS_ERR_UNKNOWN, false, "failed to add item [% item.name %]");
    2929        psFree(md);
    3030        return false;
    3131    }
    3232[% END -%]
     33
    3334    status = psDBCreateTable(dbh, [% namespace FILTER upper %]_TABLE_NAME, md);
     35
    3436    psFree(md);
    3537

  • trunk/glueforge/templates/psdb/insert.tt

    r4338 r4341  
    2323    if (!psMetadataAdd(md, PS_LIST_TAIL, "[% item.name %]", PS_META_BOOL, NULL, [% item.name %])) {
    2424[% END -%]
    25         // psError(); something bad happened
     25        psError(PS_ERR_UNKNOWN, false, "failed to add item [% item.name %]");
    2626        psFree(md);
    2727        return false;

  • trunk/glueforge/templates/psdb/insertfits.tt

    r4340 r4341  
    55    // move to (the first?) extension named  [% namespace FILTER upper %]_TABLE_NAME
    66    if (!psFitsMoveExtName(fits, [% namespace FILTER upper %]_TABLE_NAME)) {
    7         // psError(); something bad happened
     7        psError(PS_ERR_UNKNOWN, true, "failed to find FITS extension %s", [% namespace FILTER upper %]_TABLE_NAME);
    88        return false;
    99    }
    … …  
    1111    // check HDU type
    1212    if (psFitsGetExtType(fits) != PS_FITS_TYPE_BINARY_TABLE)  {
    13         // psError(); something bad happened
     13        psError(PS_ERR_UNKNOWN, true, "FITS HDU type is not PS_FITS_TYPE_BINARY_TABLE");
    1414        return false;
    1515    }
    … …  
    1818    rowSet = psFitsReadTable(fits);
    1919    if (!rowSet) {
    20         // psError(); something bad happened
     20        psError(PS_ERR_UNKNOWN, true, "FITS read error or FITS table is empty");
    2121        psFree(rowSet);
    2222        return false;
    … …  
    2424
    2525    if (!psDBInsertRows(dbh, [% namespace FILTER upper %]_TABLE_NAME, rowSet)) {
    26         // psError(); something bad happened
     26        psError(PS_ERR_UNKNOWN, false, "databse insert failed");
    2727        psFree(rowSet);
    2828        return false;

  • trunk/glueforge/templates/psdb/metadatafromobject.tt

    r4332 r4341  
    1212    if (!psMetadataAdd(md, PS_LIST_TAIL, "[% item.name %]", PS_META_BOOL, NULL, object->[% item.name %])) {
    1313[% END -%]
    14         // psError(); something bad happened
     14        psError(PS_ERR_UNKNOWN, false, "failed to add item [% item.name %]");
    1515        psFree(md);
    1616        return NULL;

  • trunk/glueforge/templates/psdb/objectfrommetadata.tt

    r4334 r4341  
    2121[% END -%]
    2222    if (!status) {
    23         // psError(); something bad happened
     23        psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item [% item.name %]");
    2424        return false;
    2525    }

  • trunk/glueforge/templates/psdb/pop.tt

    r4340 r4341  
    2424    psMemIncrRefCounter(row);
    2525    if (!row) {
    26         // psError(); error or table is empty
     26        psError(PS_ERR_UNKNOWN, true, "database error or table is empty");
    2727        return NULL;
    2828    }
    … …  
    3131    rowID = psMetadataLookupS32(&status, row, [% namespace FILTER upper %]_INDEX_NAME);
    3232    if (!status) {
    33         // psError(); something bad happened
     33        psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item %s", [% namespace FILTER upper %]_INDEX_NAME);
    3434        psFree(row);
    3535        return NULL;
    … …  
    4141    deleted = psDBDeleteRows(dbh, [% namespace FILTER upper %]_TABLE_NAME, popped);
    4242    if (deleted != 1) {
    43         // psError(); something bad happened
     43        psError(PS_ERR_UNKNOWN, false, "database failed to delete row");
    4444        psFree(popped);
    4545        psFree(row);
    … …  
    5858[% END -%]
    5959    if (!status) {
    60         // psError(); something bad happened
     60        psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item [% item.name %]");
    6161        psFree(row);
    6262        return false;

  • trunk/glueforge/templates/psdb/popfits.tt

    r4277 r4341  
    44
    55    if (!fooSelectRowsFits(dbh, fits, NULL, limit)) {
    6         // psError(); something bad happened
     6        psError(PS_ERR_UNKNOWN, true, "database error or table is empty");
    77        return false;
    88    }
    … …  
    1212                "DELETE FROM %s ORDER BY %s DESC LIMIT %lld",
    1313                [% namespace FILTER upper %]_TABLE_NAME, [% namespace FILTER upper %]_INDEX_NAME, limit) < 0) {
    14         // psError(); something bad happened
     14        psError(PS_ERR_UNKNOWN, true, "query value attempted to exceed %s bytes", MAX_STRING_LENGTH);
    1515        return false;
    1616    }
    1717           
    1818    if (!p_psDBRunQuery(dbh, query)) {
    19         // psError(); something bad happened
     19        psError(PS_ERR_UNKNOWN, false, "database query failed");
    2020        return false;
    2121    }

  • trunk/glueforge/templates/psdb/popobject.tt

    r4326 r4341  
    2121[% END -%]
    2222[% END %])) {
    23         // psError(); something bad happened
     23        psError(PS_ERR_UNKNOWN, false, "failed to pop a database row");
    2424        return NULL;
    2525    }

  • trunk/glueforge/templates/psdb/selectrowsfits.tt

    r4328 r4341  
    1212    for (i = 0; i < rowSet->n; i++) {
    1313        if (!psMetadataRemove((psMetadata *)rowSet->data[i], 0, [% namespace FILTER upper %]_INDEX_NAME)) {
    14             // psError(); something bad happened
     14            psError(PS_ERR_UNKNOWN, true, "failed to remove item %s", [% namespace FILTER upper %]_INDEX_NAME);
    1515            psFree(rowSet);
    1616            return false;
    … …  
    2020    // output to fits
    2121    if (!psFitsWriteTable(fits, NULL, rowSet)) {
    22         // psError(); something bad happened
     22        psError(PS_ERR_UNKNOWN, false, "FITS table write failed");
    2323        psFree(rowSet);
    2424        return false;
    … …  
    2727    // FIXME: needs to be after a new ext is written?
    2828    if (!psFitsSetExtName(fits, [% namespace FILTER upper %]_TABLE_NAME)) {
    29         // psError(); something bad happened
     29        psError(PS_ERR_UNKNOWN, false, "failed to set FITS HDU extension name");
    3030        psFree(rowSet);
    3131        return false;
Note: See TracChangeset for help on using the changeset viewer.