IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 3671


Ignore:
Timestamp:
Apr 5, 2005, 3:12:58 PM (21 years ago)
Author:
desonia
Message:

Removed PS_TYPE_PTR from psElemType, as per latest SDRS.

Location:
trunk/psLib/src
Files:
23 edited

Legend:

Unmodified
Added
Removed

  • trunk/psLib/src/astronomy/psDB.c

    r3591 r3671  
    1212 *  @author Joshua Hoblitt
    1313 *
    14  *  @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
    15  *  @date $Date: 2005-03-31 02:54:27 $
     14 *  @version $Revision: 1.14 $ $Name: not supported by cvs2svn $
     15 *  @date $Date: 2005-04-06 01:12:58 $
    1616 *
    1717 *  Copyright 2005 Joshua Hoblitt, University of Hawaii
    … …  
    360360        // valid for psVector?
    361361        break;
    362     case PS_TYPE_PTR:
    363         // valid for psVector?
    364         break;
    365362    }
    366363
    … …  
    448445
    449446            // copy field data and convert NULLs to the appropriate NaN value
    450             if ((pType == PS_TYPE_PTR) || (pType == PS_META_STR)) {
     447            if (pType == PS_META_STR) {
    451448                psMetadataAddStr(md, 0, field[i].name, "", data);
    452449            } else if (pType == PS_META_S32) {
    … …  
    621618        // column as an psArray of strings; otherwise fetch the column as a
    622619        // psVector.
    623         if ((pType == PS_TYPE_PTR) || (pType == PS_META_STR)) {
     620        if (pType == PS_META_STR) {
    624621            // PS_META_UNKNOWN -> PS_META_ARRAY ?
    625622            column = psDBSelectColumn(dbh, tableName, field[i].name, 0);
    … …  
    821818                   (item->type == PS_META_LOOKUPTABLE) || (item->type == PS_META_JPEG)   ||
    822819                   (item->type == PS_META_PNG)         || (item->type == PS_META_ASTROM) ||
    823                    (item->type == PS_META_UNKNOWN)     || (item->type == PS_TYPE_PTR)) {
     820                   (item->type == PS_META_UNKNOWN)) {
    824821
    825822            bind[i].buffer_length = (unsigned long)strlen((char *)item->data.V);
    … …  
    881878                   (item->type == PS_META_LOOKUPTABLE) || (item->type == PS_META_JPEG)   ||
    882879                   (item->type == PS_META_PNG)         || (item->type == PS_META_ASTROM) ||
    883                    (item->type == PS_META_UNKNOWN)     || (item->type == PS_TYPE_PTR)) {
     880                   (item->type == PS_META_UNKNOWN)) {
    884881            // + column name + _ + varchar( + length + )
    885882            psStringAppend(&query, "%s VARCHAR(%s)", item->name, item->data.V);
    … …  
    12711268        psDBAddToLookupTable(lookupTable, PS_TYPE_C64, "PS_TYPE_C64 is not supported");
    12721269        psDBAddToLookupTable(lookupTable, PS_TYPE_BOOL,"BOOLEAN");
    1273         psDBAddToLookupTable(lookupTable, PS_TYPE_PTR, "BLOB");
    12741270        psDBAddToLookupTable(lookupTable, PS_META_STR, "BLOB");
    12751271    }
    … …  
    13241320
    13251321        // DECIMAL does not exist in the pType to SQL table
    1326         value = psDBIntToString((psU64)PS_TYPE_PTR);
     1322        value = psDBIntToString(0);
    13271323        psHashAdd(lookupTable, "DECIMAL", value);
    13281324        psFree(value);
    … …  
    14161412        psDBAddVoidToLookupTable(lookupTable, PS_TYPE_C64,    psDBMySQLTypeAlloc(MYSQL_TYPE_VAR_STRING, false));
    14171413        psDBAddVoidToLookupTable(lookupTable, PS_TYPE_BOOL,   psDBMySQLTypeAlloc(MYSQL_TYPE_TINY,       true));
    1418         psDBAddVoidToLookupTable(lookupTable, PS_TYPE_PTR,    psDBMySQLTypeAlloc(MYSQL_TYPE_VAR_STRING, false));
     1414        // XXX: removed PS_TYPE_PTR, can this be removed too?
     1415        // psDBAddVoidToLookupTable(lookupTable, PS_TYPE_PTR,    psDBMySQLTypeAlloc(MYSQL_TYPE_VAR_STRING, false));
    14191416
    14201417        psDBAddVoidToLookupTable(lookupTable, PS_META_STR,    psDBMySQLTypeAlloc(MYSQL_TYPE_VAR_STRING, false));
    … …  
    15381535        // what is NaN for a bool?
    15391536        break;
    1540     case PS_TYPE_PTR:
    1541         PS_NAN_ALLOC(myNaN, char, '\0');
    1542         break;
    15431537    }
    15441538
    … …  
    15931587    case PS_TYPE_BOOL:
    15941588        // what is NaN for a bool?
    1595         break;
    1596     case PS_TYPE_PTR:
    1597         isNaN = PS_IS_NAN(char, data, '\0');
    15981589        break;
    15991590    }

  • trunk/psLib/src/astronomy/psMetadata.h

    r3544 r3671  
    1111*  @author Ross Harman, MHPCC
    1212*
    13 *  @version $Revision: 1.42 $ $Name: not supported by cvs2svn $
    14 *  @date $Date: 2005-03-29 22:13:53 $
     13*  @version $Revision: 1.43 $ $Name: not supported by cvs2svn $
     14*  @date $Date: 2005-04-06 01:12:58 $
    1515*
    1616*  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    6464        (METATYPE==PS_META_F32) ? PS_TYPE_F32 : \
    6565        (METATYPE==PS_META_F64) ? PS_TYPE_F64 : \
    66         (METATYPE==PS_META_BOOL) ? PS_TYPE_BOOL : PS_TYPE_PTR )
     66        (METATYPE==PS_META_BOOL) ? PS_TYPE_BOOL : 0 )
    6767
    6868/** Option flags for psMetadata functions

  • trunk/psLib/src/astronomy/psMetadataIO.c

    r3441 r3671  
    99*  @author Ross Harman, MHPCC
    1010*
    11 *  @version $Revision: 1.23 $ $Name: not supported by cvs2svn $
    12 *  @date $Date: 2005-03-17 19:01:01 $
     11*  @version $Revision: 1.24 $ $Name: not supported by cvs2svn $
     12*  @date $Date: 2005-04-06 01:12:58 $
    1313*
    1414*  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    509509    char *strComment = NULL;
    510510    char *linePtr = NULL;
    511     psElemType vecType = PS_TYPE_PTR;
     511    psElemType vecType = 0;
    512512    psS32 status = 0;
    513513    psU32 lineCount = 0;
    … …  
    956956    psS32 status = 0;
    957957    psU32 lineNumber = 0;
    958     psElemType pType = PS_TYPE_PTR;
     958    psElemType pType = 0;
    959959    char *strName = NULL;
    960960    char *strType = NULL;

  • trunk/psLib/src/collections/psMetadata.h

    r3544 r3671  
    1111*  @author Ross Harman, MHPCC
    1212*
    13 *  @version $Revision: 1.42 $ $Name: not supported by cvs2svn $
    14 *  @date $Date: 2005-03-29 22:13:53 $
     13*  @version $Revision: 1.43 $ $Name: not supported by cvs2svn $
     14*  @date $Date: 2005-04-06 01:12:58 $
    1515*
    1616*  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    6464        (METATYPE==PS_META_F32) ? PS_TYPE_F32 : \
    6565        (METATYPE==PS_META_F64) ? PS_TYPE_F64 : \
    66         (METATYPE==PS_META_BOOL) ? PS_TYPE_BOOL : PS_TYPE_PTR )
     66        (METATYPE==PS_META_BOOL) ? PS_TYPE_BOOL : 0 )
    6767
    6868/** Option flags for psMetadata functions

  • trunk/psLib/src/collections/psMetadataIO.c

    r3441 r3671  
    99*  @author Ross Harman, MHPCC
    1010*
    11 *  @version $Revision: 1.23 $ $Name: not supported by cvs2svn $
    12 *  @date $Date: 2005-03-17 19:01:01 $
     11*  @version $Revision: 1.24 $ $Name: not supported by cvs2svn $
     12*  @date $Date: 2005-04-06 01:12:58 $
    1313*
    1414*  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    509509    char *strComment = NULL;
    510510    char *linePtr = NULL;
    511     psElemType vecType = PS_TYPE_PTR;
     511    psElemType vecType = 0;
    512512    psS32 status = 0;
    513513    psU32 lineCount = 0;
    … …  
    956956    psS32 status = 0;
    957957    psU32 lineNumber = 0;
    958     psElemType pType = PS_TYPE_PTR;
     958    psElemType pType = 0;
    959959    char *strName = NULL;
    960960    char *strType = NULL;

  • trunk/psLib/src/dataIO/psDB.c

    r3591 r3671  
    1212 *  @author Joshua Hoblitt
    1313 *
    14  *  @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
    15  *  @date $Date: 2005-03-31 02:54:27 $
     14 *  @version $Revision: 1.14 $ $Name: not supported by cvs2svn $
     15 *  @date $Date: 2005-04-06 01:12:58 $
    1616 *
    1717 *  Copyright 2005 Joshua Hoblitt, University of Hawaii
    … …  
    360360        // valid for psVector?
    361361        break;
    362     case PS_TYPE_PTR:
    363         // valid for psVector?
    364         break;
    365362    }
    366363
    … …  
    448445
    449446            // copy field data and convert NULLs to the appropriate NaN value
    450             if ((pType == PS_TYPE_PTR) || (pType == PS_META_STR)) {
     447            if (pType == PS_META_STR) {
    451448                psMetadataAddStr(md, 0, field[i].name, "", data);
    452449            } else if (pType == PS_META_S32) {
    … …  
    621618        // column as an psArray of strings; otherwise fetch the column as a
    622619        // psVector.
    623         if ((pType == PS_TYPE_PTR) || (pType == PS_META_STR)) {
     620        if (pType == PS_META_STR) {
    624621            // PS_META_UNKNOWN -> PS_META_ARRAY ?
    625622            column = psDBSelectColumn(dbh, tableName, field[i].name, 0);
    … …  
    821818                   (item->type == PS_META_LOOKUPTABLE) || (item->type == PS_META_JPEG)   ||
    822819                   (item->type == PS_META_PNG)         || (item->type == PS_META_ASTROM) ||
    823                    (item->type == PS_META_UNKNOWN)     || (item->type == PS_TYPE_PTR)) {
     820                   (item->type == PS_META_UNKNOWN)) {
    824821
    825822            bind[i].buffer_length = (unsigned long)strlen((char *)item->data.V);
    … …  
    881878                   (item->type == PS_META_LOOKUPTABLE) || (item->type == PS_META_JPEG)   ||
    882879                   (item->type == PS_META_PNG)         || (item->type == PS_META_ASTROM) ||
    883                    (item->type == PS_META_UNKNOWN)     || (item->type == PS_TYPE_PTR)) {
     880                   (item->type == PS_META_UNKNOWN)) {
    884881            // + column name + _ + varchar( + length + )
    885882            psStringAppend(&query, "%s VARCHAR(%s)", item->name, item->data.V);
    … …  
    12711268        psDBAddToLookupTable(lookupTable, PS_TYPE_C64, "PS_TYPE_C64 is not supported");
    12721269        psDBAddToLookupTable(lookupTable, PS_TYPE_BOOL,"BOOLEAN");
    1273         psDBAddToLookupTable(lookupTable, PS_TYPE_PTR, "BLOB");
    12741270        psDBAddToLookupTable(lookupTable, PS_META_STR, "BLOB");
    12751271    }
    … …  
    13241320
    13251321        // DECIMAL does not exist in the pType to SQL table
    1326         value = psDBIntToString((psU64)PS_TYPE_PTR);
     1322        value = psDBIntToString(0);
    13271323        psHashAdd(lookupTable, "DECIMAL", value);
    13281324        psFree(value);
    … …  
    14161412        psDBAddVoidToLookupTable(lookupTable, PS_TYPE_C64,    psDBMySQLTypeAlloc(MYSQL_TYPE_VAR_STRING, false));
    14171413        psDBAddVoidToLookupTable(lookupTable, PS_TYPE_BOOL,   psDBMySQLTypeAlloc(MYSQL_TYPE_TINY,       true));
    1418         psDBAddVoidToLookupTable(lookupTable, PS_TYPE_PTR,    psDBMySQLTypeAlloc(MYSQL_TYPE_VAR_STRING, false));
     1414        // XXX: removed PS_TYPE_PTR, can this be removed too?
     1415        // psDBAddVoidToLookupTable(lookupTable, PS_TYPE_PTR,    psDBMySQLTypeAlloc(MYSQL_TYPE_VAR_STRING, false));
    14191416
    14201417        psDBAddVoidToLookupTable(lookupTable, PS_META_STR,    psDBMySQLTypeAlloc(MYSQL_TYPE_VAR_STRING, false));
    … …  
    15381535        // what is NaN for a bool?
    15391536        break;
    1540     case PS_TYPE_PTR:
    1541         PS_NAN_ALLOC(myNaN, char, '\0');
    1542         break;
    15431537    }
    15441538
    … …  
    15931587    case PS_TYPE_BOOL:
    15941588        // what is NaN for a bool?
    1595         break;
    1596     case PS_TYPE_PTR:
    1597         isNaN = PS_IS_NAN(char, data, '\0');
    15981589        break;
    15991590    }

  • trunk/psLib/src/dataIO/psFits.c

    r3661 r3671  
    77 *  @author Robert DeSonia, MHPCC
    88 *
    9  *  @version $Revision: 1.25 $ $Name: not supported by cvs2svn $
    10  *  @date $Date: 2005-04-05 19:33:30 $
     9 *  @version $Revision: 1.26 $ $Name: not supported by cvs2svn $
     10 *  @date $Date: 2005-04-06 01:12:58 $
    1111 *
    1212 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    2727#define MAX_STRING_LENGTH 256  // maximum length string for FITS routines
    2828
     29// list of FITS header keys to ignore.
    2930static char* standardFitsKeys[] = {
    3031                                      NULL
    … …  
    7273                "Unknown FITS datatype, %d.",
    7374                datatype);
    74         return PS_TYPE_PTR;
     75        return 0;
    7576    }
    7677}

  • trunk/psLib/src/dataManip/psFunctions.c

    r3405 r3671  
    77 *  polynomials.  It also contains a Gaussian functions.
    88 *
    9  *  @version $Revision: 1.94 $ $Name: not supported by cvs2svn $
    10  *  @date $Date: 2005-03-10 22:33:57 $
     9 *  @version $Revision: 1.95 $ $Name: not supported by cvs2svn $
     10 *  @date $Date: 2005-04-06 01:12:58 $
    1111 *
    1212 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    19851985                PS_ERRORTEXT_psFunctions_TYPE_NOT_SUPPORTED,
    19861986                strType);
     1987        return 0;
    19871988    case PS_TYPE_C64:
    19881989        PS_TYPE_NAME(strType,x->type.type);
    … …  
    19901991                PS_ERRORTEXT_psFunctions_TYPE_NOT_SUPPORTED,
    19911992                strType);
    1992     case PS_TYPE_PTR:
    1993         PS_TYPE_NAME(strType,x->type.type);
    1994         psError(PS_ERR_BAD_PARAMETER_TYPE,
    1995                 PS_ERRORTEXT_psFunctions_TYPE_NOT_SUPPORTED,
    1996                 strType);
     1993        return 0;
    19971994    case PS_TYPE_BOOL:
    19981995        PS_TYPE_NAME(strType,x->type.type);
    … …  
    20001997                PS_ERRORTEXT_psFunctions_TYPE_NOT_SUPPORTED,
    20011998                strType);
     1999        return 0;
    20022000    }
    20032001    return(-3);

  • trunk/psLib/src/db/psDB.c

    r3591 r3671  
    1212 *  @author Joshua Hoblitt
    1313 *
    14  *  @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
    15  *  @date $Date: 2005-03-31 02:54:27 $
     14 *  @version $Revision: 1.14 $ $Name: not supported by cvs2svn $
     15 *  @date $Date: 2005-04-06 01:12:58 $
    1616 *
    1717 *  Copyright 2005 Joshua Hoblitt, University of Hawaii
    … …  
    360360        // valid for psVector?
    361361        break;
    362     case PS_TYPE_PTR:
    363         // valid for psVector?
    364         break;
    365362    }
    366363
    … …  
    448445
    449446            // copy field data and convert NULLs to the appropriate NaN value
    450             if ((pType == PS_TYPE_PTR) || (pType == PS_META_STR)) {
     447            if (pType == PS_META_STR) {
    451448                psMetadataAddStr(md, 0, field[i].name, "", data);
    452449            } else if (pType == PS_META_S32) {
    … …  
    621618        // column as an psArray of strings; otherwise fetch the column as a
    622619        // psVector.
    623         if ((pType == PS_TYPE_PTR) || (pType == PS_META_STR)) {
     620        if (pType == PS_META_STR) {
    624621            // PS_META_UNKNOWN -> PS_META_ARRAY ?
    625622            column = psDBSelectColumn(dbh, tableName, field[i].name, 0);
    … …  
    821818                   (item->type == PS_META_LOOKUPTABLE) || (item->type == PS_META_JPEG)   ||
    822819                   (item->type == PS_META_PNG)         || (item->type == PS_META_ASTROM) ||
    823                    (item->type == PS_META_UNKNOWN)     || (item->type == PS_TYPE_PTR)) {
     820                   (item->type == PS_META_UNKNOWN)) {
    824821
    825822            bind[i].buffer_length = (unsigned long)strlen((char *)item->data.V);
    … …  
    881878                   (item->type == PS_META_LOOKUPTABLE) || (item->type == PS_META_JPEG)   ||
    882879                   (item->type == PS_META_PNG)         || (item->type == PS_META_ASTROM) ||
    883                    (item->type == PS_META_UNKNOWN)     || (item->type == PS_TYPE_PTR)) {
     880                   (item->type == PS_META_UNKNOWN)) {
    884881            // + column name + _ + varchar( + length + )
    885882            psStringAppend(&query, "%s VARCHAR(%s)", item->name, item->data.V);
    … …  
    12711268        psDBAddToLookupTable(lookupTable, PS_TYPE_C64, "PS_TYPE_C64 is not supported");
    12721269        psDBAddToLookupTable(lookupTable, PS_TYPE_BOOL,"BOOLEAN");
    1273         psDBAddToLookupTable(lookupTable, PS_TYPE_PTR, "BLOB");
    12741270        psDBAddToLookupTable(lookupTable, PS_META_STR, "BLOB");
    12751271    }
    … …  
    13241320
    13251321        // DECIMAL does not exist in the pType to SQL table
    1326         value = psDBIntToString((psU64)PS_TYPE_PTR);
     1322        value = psDBIntToString(0);
    13271323        psHashAdd(lookupTable, "DECIMAL", value);
    13281324        psFree(value);
    … …  
    14161412        psDBAddVoidToLookupTable(lookupTable, PS_TYPE_C64,    psDBMySQLTypeAlloc(MYSQL_TYPE_VAR_STRING, false));
    14171413        psDBAddVoidToLookupTable(lookupTable, PS_TYPE_BOOL,   psDBMySQLTypeAlloc(MYSQL_TYPE_TINY,       true));
    1418         psDBAddVoidToLookupTable(lookupTable, PS_TYPE_PTR,    psDBMySQLTypeAlloc(MYSQL_TYPE_VAR_STRING, false));
     1414        // XXX: removed PS_TYPE_PTR, can this be removed too?
     1415        // psDBAddVoidToLookupTable(lookupTable, PS_TYPE_PTR,    psDBMySQLTypeAlloc(MYSQL_TYPE_VAR_STRING, false));
    14191416
    14201417        psDBAddVoidToLookupTable(lookupTable, PS_META_STR,    psDBMySQLTypeAlloc(MYSQL_TYPE_VAR_STRING, false));
    … …  
    15381535        // what is NaN for a bool?
    15391536        break;
    1540     case PS_TYPE_PTR:
    1541         PS_NAN_ALLOC(myNaN, char, '\0');
    1542         break;
    15431537    }
    15441538
    … …  
    15931587    case PS_TYPE_BOOL:
    15941588        // what is NaN for a bool?
    1595         break;
    1596     case PS_TYPE_PTR:
    1597         isNaN = PS_IS_NAN(char, data, '\0');
    15981589        break;
    15991590    }

  • trunk/psLib/src/fft/psImageFFT.c

    r3301 r3671  
    55 *  @author Robert DeSonia, MHPCC
    66 *
    7  *  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
    8  *  @date $Date: 2005-02-22 19:38:44 $
     7 *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
     8 *  @date $Date: 2005-04-06 01:12:58 $
    99 *
    1010 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    126126
    127127    /* if not a complex number, this is logically just a copy then */
    128     if (!PS_IS_PSELEMTYPE_COMPLEX(type) && type != PS_TYPE_PTR) {
     128    if (!PS_IS_PSELEMTYPE_COMPLEX(type)) {
    129129        return psImageCopy(out, in, type);
    130130    }
    … …  
    186186
    187187    /* if not a complex image type, this is logically just zeroed image of same size */
    188     if (!PS_IS_PSELEMTYPE_COMPLEX(type) && type != PS_TYPE_PTR) {
     188    if (!PS_IS_PSELEMTYPE_COMPLEX(type)) {
    189189        out = psImageRecycle(out, numCols, numRows, type);
    190190        memset(out->data.V[0], 0, PSELEMTYPE_SIZEOF(type) * numCols * numRows);
    … …  
    327327
    328328    /* if not a complex image, this is logically just a image copy */
    329     if (!PS_IS_PSELEMTYPE_COMPLEX(type) && type != PS_TYPE_PTR) {
     329    if (!PS_IS_PSELEMTYPE_COMPLEX(type)) {
    330330        return psImageCopy(out, in, type);
    331331    }

  • trunk/psLib/src/fileUtils/psDB.c

    r3591 r3671  
    1212 *  @author Joshua Hoblitt
    1313 *
    14  *  @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
    15  *  @date $Date: 2005-03-31 02:54:27 $
     14 *  @version $Revision: 1.14 $ $Name: not supported by cvs2svn $
     15 *  @date $Date: 2005-04-06 01:12:58 $
    1616 *
    1717 *  Copyright 2005 Joshua Hoblitt, University of Hawaii
    … …  
    360360        // valid for psVector?
    361361        break;
    362     case PS_TYPE_PTR:
    363         // valid for psVector?
    364         break;
    365362    }
    366363
    … …  
    448445
    449446            // copy field data and convert NULLs to the appropriate NaN value
    450             if ((pType == PS_TYPE_PTR) || (pType == PS_META_STR)) {
     447            if (pType == PS_META_STR) {
    451448                psMetadataAddStr(md, 0, field[i].name, "", data);
    452449            } else if (pType == PS_META_S32) {
    … …  
    621618        // column as an psArray of strings; otherwise fetch the column as a
    622619        // psVector.
    623         if ((pType == PS_TYPE_PTR) || (pType == PS_META_STR)) {
     620        if (pType == PS_META_STR) {
    624621            // PS_META_UNKNOWN -> PS_META_ARRAY ?
    625622            column = psDBSelectColumn(dbh, tableName, field[i].name, 0);
    … …  
    821818                   (item->type == PS_META_LOOKUPTABLE) || (item->type == PS_META_JPEG)   ||
    822819                   (item->type == PS_META_PNG)         || (item->type == PS_META_ASTROM) ||
    823                    (item->type == PS_META_UNKNOWN)     || (item->type == PS_TYPE_PTR)) {
     820                   (item->type == PS_META_UNKNOWN)) {
    824821
    825822            bind[i].buffer_length = (unsigned long)strlen((char *)item->data.V);
    … …  
    881878                   (item->type == PS_META_LOOKUPTABLE) || (item->type == PS_META_JPEG)   ||
    882879                   (item->type == PS_META_PNG)         || (item->type == PS_META_ASTROM) ||
    883                    (item->type == PS_META_UNKNOWN)     || (item->type == PS_TYPE_PTR)) {
     880                   (item->type == PS_META_UNKNOWN)) {
    884881            // + column name + _ + varchar( + length + )
    885882            psStringAppend(&query, "%s VARCHAR(%s)", item->name, item->data.V);
    … …  
    12711268        psDBAddToLookupTable(lookupTable, PS_TYPE_C64, "PS_TYPE_C64 is not supported");
    12721269        psDBAddToLookupTable(lookupTable, PS_TYPE_BOOL,"BOOLEAN");
    1273         psDBAddToLookupTable(lookupTable, PS_TYPE_PTR, "BLOB");
    12741270        psDBAddToLookupTable(lookupTable, PS_META_STR, "BLOB");
    12751271    }
    … …  
    13241320
    13251321        // DECIMAL does not exist in the pType to SQL table
    1326         value = psDBIntToString((psU64)PS_TYPE_PTR);
     1322        value = psDBIntToString(0);
    13271323        psHashAdd(lookupTable, "DECIMAL", value);
    13281324        psFree(value);
    … …  
    14161412        psDBAddVoidToLookupTable(lookupTable, PS_TYPE_C64,    psDBMySQLTypeAlloc(MYSQL_TYPE_VAR_STRING, false));
    14171413        psDBAddVoidToLookupTable(lookupTable, PS_TYPE_BOOL,   psDBMySQLTypeAlloc(MYSQL_TYPE_TINY,       true));
    1418         psDBAddVoidToLookupTable(lookupTable, PS_TYPE_PTR,    psDBMySQLTypeAlloc(MYSQL_TYPE_VAR_STRING, false));
     1414        // XXX: removed PS_TYPE_PTR, can this be removed too?
     1415        // psDBAddVoidToLookupTable(lookupTable, PS_TYPE_PTR,    psDBMySQLTypeAlloc(MYSQL_TYPE_VAR_STRING, false));
    14191416
    14201417        psDBAddVoidToLookupTable(lookupTable, PS_META_STR,    psDBMySQLTypeAlloc(MYSQL_TYPE_VAR_STRING, false));
    … …  
    15381535        // what is NaN for a bool?
    15391536        break;
    1540     case PS_TYPE_PTR:
    1541         PS_NAN_ALLOC(myNaN, char, '\0');
    1542         break;
    15431537    }
    15441538
    … …  
    15931587    case PS_TYPE_BOOL:
    15941588        // what is NaN for a bool?
    1595         break;
    1596     case PS_TYPE_PTR:
    1597         isNaN = PS_IS_NAN(char, data, '\0');
    15981589        break;
    15991590    }

  • trunk/psLib/src/fileUtils/psFits.c

    r3661 r3671  
    77 *  @author Robert DeSonia, MHPCC
    88 *
    9  *  @version $Revision: 1.25 $ $Name: not supported by cvs2svn $
    10  *  @date $Date: 2005-04-05 19:33:30 $
     9 *  @version $Revision: 1.26 $ $Name: not supported by cvs2svn $
     10 *  @date $Date: 2005-04-06 01:12:58 $
    1111 *
    1212 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    2727#define MAX_STRING_LENGTH 256  // maximum length string for FITS routines
    2828
     29// list of FITS header keys to ignore.
    2930static char* standardFitsKeys[] = {
    3031                                      NULL
    … …  
    7273                "Unknown FITS datatype, %d.",
    7374                datatype);
    74         return PS_TYPE_PTR;
     75        return 0;
    7576    }
    7677}

  • trunk/psLib/src/fits/psFits.c

    r3661 r3671  
    77 *  @author Robert DeSonia, MHPCC
    88 *
    9  *  @version $Revision: 1.25 $ $Name: not supported by cvs2svn $
    10  *  @date $Date: 2005-04-05 19:33:30 $
     9 *  @version $Revision: 1.26 $ $Name: not supported by cvs2svn $
     10 *  @date $Date: 2005-04-06 01:12:58 $
    1111 *
    1212 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    2727#define MAX_STRING_LENGTH 256  // maximum length string for FITS routines
    2828
     29// list of FITS header keys to ignore.
    2930static char* standardFitsKeys[] = {
    3031                                      NULL
    … …  
    7273                "Unknown FITS datatype, %d.",
    7374                datatype);
    74         return PS_TYPE_PTR;
     75        return 0;
    7576    }
    7677}

  • trunk/psLib/src/image/psImage.c

    r3446 r3671  
    99 *  @author Ross Harman, MHPCC
    1010 *
    11  *  @version $Revision: 1.61 $ $Name: not supported by cvs2svn $
    12  *  @date $Date: 2005-03-18 02:35:14 $
     11 *  @version $Revision: 1.62 $ $Name: not supported by cvs2svn $
     12 *  @date $Date: 2005-04-06 01:12:58 $
    1313 *
    1414 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    3535    if (image == NULL) {
    3636        return;
    37     }
    38 
    39     if (image->type.type == PS_TYPE_PTR) {
    40         // 2-D array of pointers -- must dereference elements
    41         psU32 oldNumRows = image->numRows;
    42         psU32 oldNumCols = image->numCols;
    43         psPtr* rowPtr;
    44 
    45         for (psU32 row = 0; row < oldNumRows; row++) {
    46             rowPtr = image->data.PTR[row];
    47             for (psU32 col = 0; col < oldNumCols; col++) {
    48                 psMemDecrRefCounter(rowPtr[col]);
    49             }
    50         }
    5137    }
    5238
    … …  
    188174    }
    189175
    190     if (old->type.type == PS_TYPE_PTR) {
    191         // 2-D array of pointers -- must
    192         // dereference
    193         psU32 oldNumRows = old->numRows;
    194         psU32 oldNumCols = old->numCols;
    195         psPtr* rowPtr;
    196 
    197         for (psU32 row = 0; row < oldNumRows; row++) {
    198             rowPtr = old->data.PTR[row];
    199             for (psU32 col = 0; col < oldNumCols; col++) {
    200                 psMemDecrRefCounter(rowPtr[col]);
    201                 rowPtr[col] = NULL;
    202             }
    203         }
    204     }
    205 
    206176    /* image already the right size/type? */
    207177    if (numCols == old->numCols && numRows == old->numRows &&
    … …  
    263233    elements = numRows * numCols;
    264234    elementSize = PSELEMTYPE_SIZEOF(inDatatype);
    265 
    266     if (inDatatype == PS_TYPE_PTR || type == PS_TYPE_PTR) {
    267         psError(PS_ERR_BAD_PARAMETER_TYPE, true,
    268                 PS_ERRORTEXT_psImage_IMAGE_TYPE_UNSUPPORTED,
    269                 PS_TYPE_PTR_NAME);
    270         psFree(output);
    271         return NULL;
    272     }
    273235
    274236    output = psImageRecycle(output, numCols, numRows, type);

  • trunk/psLib/src/image/psImageFFT.c

    r3301 r3671  
    55 *  @author Robert DeSonia, MHPCC
    66 *
    7  *  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
    8  *  @date $Date: 2005-02-22 19:38:44 $
     7 *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
     8 *  @date $Date: 2005-04-06 01:12:58 $
    99 *
    1010 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    126126
    127127    /* if not a complex number, this is logically just a copy then */
    128     if (!PS_IS_PSELEMTYPE_COMPLEX(type) && type != PS_TYPE_PTR) {
     128    if (!PS_IS_PSELEMTYPE_COMPLEX(type)) {
    129129        return psImageCopy(out, in, type);
    130130    }
    … …  
    186186
    187187    /* if not a complex image type, this is logically just zeroed image of same size */
    188     if (!PS_IS_PSELEMTYPE_COMPLEX(type) && type != PS_TYPE_PTR) {
     188    if (!PS_IS_PSELEMTYPE_COMPLEX(type)) {
    189189        out = psImageRecycle(out, numCols, numRows, type);
    190190        memset(out->data.V[0], 0, PSELEMTYPE_SIZEOF(type) * numCols * numRows);
    … …  
    327327
    328328    /* if not a complex image, this is logically just a image copy */
    329     if (!PS_IS_PSELEMTYPE_COMPLEX(type) && type != PS_TYPE_PTR) {
     329    if (!PS_IS_PSELEMTYPE_COMPLEX(type)) {
    330330        return psImageCopy(out, in, type);
    331331    }

  • trunk/psLib/src/math/psPolynomial.c

    r3405 r3671  
    77 *  polynomials.  It also contains a Gaussian functions.
    88 *
    9  *  @version $Revision: 1.94 $ $Name: not supported by cvs2svn $
    10  *  @date $Date: 2005-03-10 22:33:57 $
     9 *  @version $Revision: 1.95 $ $Name: not supported by cvs2svn $
     10 *  @date $Date: 2005-04-06 01:12:58 $
    1111 *
    1212 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    19851985                PS_ERRORTEXT_psFunctions_TYPE_NOT_SUPPORTED,
    19861986                strType);
     1987        return 0;
    19871988    case PS_TYPE_C64:
    19881989        PS_TYPE_NAME(strType,x->type.type);
    … …  
    19901991                PS_ERRORTEXT_psFunctions_TYPE_NOT_SUPPORTED,
    19911992                strType);
    1992     case PS_TYPE_PTR:
    1993         PS_TYPE_NAME(strType,x->type.type);
    1994         psError(PS_ERR_BAD_PARAMETER_TYPE,
    1995                 PS_ERRORTEXT_psFunctions_TYPE_NOT_SUPPORTED,
    1996                 strType);
     1993        return 0;
    19971994    case PS_TYPE_BOOL:
    19981995        PS_TYPE_NAME(strType,x->type.type);
    … …  
    20001997                PS_ERRORTEXT_psFunctions_TYPE_NOT_SUPPORTED,
    20011998                strType);
     1999        return 0;
    20022000    }
    20032001    return(-3);

  • trunk/psLib/src/math/psSpline.c

    r3405 r3671  
    77 *  polynomials.  It also contains a Gaussian functions.
    88 *
    9  *  @version $Revision: 1.94 $ $Name: not supported by cvs2svn $
    10  *  @date $Date: 2005-03-10 22:33:57 $
     9 *  @version $Revision: 1.95 $ $Name: not supported by cvs2svn $
     10 *  @date $Date: 2005-04-06 01:12:58 $
    1111 *
    1212 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    19851985                PS_ERRORTEXT_psFunctions_TYPE_NOT_SUPPORTED,
    19861986                strType);
     1987        return 0;
    19871988    case PS_TYPE_C64:
    19881989        PS_TYPE_NAME(strType,x->type.type);
    … …  
    19901991                PS_ERRORTEXT_psFunctions_TYPE_NOT_SUPPORTED,
    19911992                strType);
    1992     case PS_TYPE_PTR:
    1993         PS_TYPE_NAME(strType,x->type.type);
    1994         psError(PS_ERR_BAD_PARAMETER_TYPE,
    1995                 PS_ERRORTEXT_psFunctions_TYPE_NOT_SUPPORTED,
    1996                 strType);
     1993        return 0;
    19971994    case PS_TYPE_BOOL:
    19981995        PS_TYPE_NAME(strType,x->type.type);
    … …  
    20001997                PS_ERRORTEXT_psFunctions_TYPE_NOT_SUPPORTED,
    20011998                strType);
     1999        return 0;
    20022000    }
    20032001    return(-3);

  • trunk/psLib/src/mathtypes/psImage.c

    r3446 r3671  
    99 *  @author Ross Harman, MHPCC
    1010 *
    11  *  @version $Revision: 1.61 $ $Name: not supported by cvs2svn $
    12  *  @date $Date: 2005-03-18 02:35:14 $
     11 *  @version $Revision: 1.62 $ $Name: not supported by cvs2svn $
     12 *  @date $Date: 2005-04-06 01:12:58 $
    1313 *
    1414 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    3535    if (image == NULL) {
    3636        return;
    37     }
    38 
    39     if (image->type.type == PS_TYPE_PTR) {
    40         // 2-D array of pointers -- must dereference elements
    41         psU32 oldNumRows = image->numRows;
    42         psU32 oldNumCols = image->numCols;
    43         psPtr* rowPtr;
    44 
    45         for (psU32 row = 0; row < oldNumRows; row++) {
    46             rowPtr = image->data.PTR[row];
    47             for (psU32 col = 0; col < oldNumCols; col++) {
    48                 psMemDecrRefCounter(rowPtr[col]);
    49             }
    50         }
    5137    }
    5238
    … …  
    188174    }
    189175
    190     if (old->type.type == PS_TYPE_PTR) {
    191         // 2-D array of pointers -- must
    192         // dereference
    193         psU32 oldNumRows = old->numRows;
    194         psU32 oldNumCols = old->numCols;
    195         psPtr* rowPtr;
    196 
    197         for (psU32 row = 0; row < oldNumRows; row++) {
    198             rowPtr = old->data.PTR[row];
    199             for (psU32 col = 0; col < oldNumCols; col++) {
    200                 psMemDecrRefCounter(rowPtr[col]);
    201                 rowPtr[col] = NULL;
    202             }
    203         }
    204     }
    205 
    206176    /* image already the right size/type? */
    207177    if (numCols == old->numCols && numRows == old->numRows &&
    … …  
    263233    elements = numRows * numCols;
    264234    elementSize = PSELEMTYPE_SIZEOF(inDatatype);
    265 
    266     if (inDatatype == PS_TYPE_PTR || type == PS_TYPE_PTR) {
    267         psError(PS_ERR_BAD_PARAMETER_TYPE, true,
    268                 PS_ERRORTEXT_psImage_IMAGE_TYPE_UNSUPPORTED,
    269                 PS_TYPE_PTR_NAME);
    270         psFree(output);
    271         return NULL;
    272     }
    273235
    274236    output = psImageRecycle(output, numCols, numRows, type);

  • trunk/psLib/src/sys/psType.h

    r3381 r3671  
    1010*  @author Ross Harman, MHPCC
    1111*
    12 *  @version $Revision: 1.31 $ $Name: not supported by cvs2svn $
    13 *  @date $Date: 2005-03-07 20:58:50 $
     12*  @version $Revision: 1.32 $ $Name: not supported by cvs2svn $
     13*  @date $Date: 2005-04-06 01:12:58 $
    1414*
    1515*  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    8383    PS_TYPE_C32  = 0x0808,             ///< Complex numbers consisting of single-precision floating point.
    8484    PS_TYPE_C64  = 0x0810,             ///< Complex numbers consisting of double-precision floating point.
    85     PS_TYPE_BOOL = 0x1301,             ///< Boolean.
    86     PS_TYPE_PTR  = 0x0000              ///< Something else that's not supported for arithmetic.
     85    PS_TYPE_BOOL = 0x1301              ///< Boolean.
    8786} psElemType;
    8887
    … …  
    133132#define PS_TYPE_C32_NAME  "psC32"
    134133#define PS_TYPE_C64_NAME  "psC64"
    135 #define PS_TYPE_PTR_NAME  "psPtr"
    136134
    137135#define PS_TYPE_NAME(value,type) \
    … …  
    175173case PS_TYPE_C64: \
    176174    value = PS_TYPE_C64_NAME; \
    177     break; \
    178 case PS_TYPE_PTR: \
    179     value = PS_TYPE_PTR_NAME; \
    180175    break; \
    181176default: \
    … …  
    206201#define PS_IS_PSELEMTYPE_BOOL(x) ((x & 0x1000) == 0x1000)
    207202/// Macro to determine the storage size, in bytes, of the psElemType.
    208 #define PSELEMTYPE_SIZEOF(x) ( (x==(PS_TYPE_PTR&0xFFFF)) ? sizeof(psPtr) :(x & 0xFF) )
     203#define PSELEMTYPE_SIZEOF(x) (x & 0xFF)
    209204
    210205/** Dimensions of a data type.

  • trunk/psLib/src/sysUtils/psType.h

    r3381 r3671  
    1010*  @author Ross Harman, MHPCC
    1111*
    12 *  @version $Revision: 1.31 $ $Name: not supported by cvs2svn $
    13 *  @date $Date: 2005-03-07 20:58:50 $
     12*  @version $Revision: 1.32 $ $Name: not supported by cvs2svn $
     13*  @date $Date: 2005-04-06 01:12:58 $
    1414*
    1515*  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    8383    PS_TYPE_C32  = 0x0808,             ///< Complex numbers consisting of single-precision floating point.
    8484    PS_TYPE_C64  = 0x0810,             ///< Complex numbers consisting of double-precision floating point.
    85     PS_TYPE_BOOL = 0x1301,             ///< Boolean.
    86     PS_TYPE_PTR  = 0x0000              ///< Something else that's not supported for arithmetic.
     85    PS_TYPE_BOOL = 0x1301              ///< Boolean.
    8786} psElemType;
    8887
    … …  
    133132#define PS_TYPE_C32_NAME  "psC32"
    134133#define PS_TYPE_C64_NAME  "psC64"
    135 #define PS_TYPE_PTR_NAME  "psPtr"
    136134
    137135#define PS_TYPE_NAME(value,type) \
    … …  
    175173case PS_TYPE_C64: \
    176174    value = PS_TYPE_C64_NAME; \
    177     break; \
    178 case PS_TYPE_PTR: \
    179     value = PS_TYPE_PTR_NAME; \
    180175    break; \
    181176default: \
    … …  
    206201#define PS_IS_PSELEMTYPE_BOOL(x) ((x & 0x1000) == 0x1000)
    207202/// Macro to determine the storage size, in bytes, of the psElemType.
    208 #define PSELEMTYPE_SIZEOF(x) ( (x==(PS_TYPE_PTR&0xFFFF)) ? sizeof(psPtr) :(x & 0xFF) )
     203#define PSELEMTYPE_SIZEOF(x) (x & 0xFF)
    209204
    210205/** Dimensions of a data type.

  • trunk/psLib/src/types/psMetadata.h

    r3544 r3671  
    1111*  @author Ross Harman, MHPCC
    1212*
    13 *  @version $Revision: 1.42 $ $Name: not supported by cvs2svn $
    14 *  @date $Date: 2005-03-29 22:13:53 $
     13*  @version $Revision: 1.43 $ $Name: not supported by cvs2svn $
     14*  @date $Date: 2005-04-06 01:12:58 $
    1515*
    1616*  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    6464        (METATYPE==PS_META_F32) ? PS_TYPE_F32 : \
    6565        (METATYPE==PS_META_F64) ? PS_TYPE_F64 : \
    66         (METATYPE==PS_META_BOOL) ? PS_TYPE_BOOL : PS_TYPE_PTR )
     66        (METATYPE==PS_META_BOOL) ? PS_TYPE_BOOL : 0 )
    6767
    6868/** Option flags for psMetadata functions

  • trunk/psLib/src/types/psMetadataConfig.c

    r3441 r3671  
    99*  @author Ross Harman, MHPCC
    1010*
    11 *  @version $Revision: 1.23 $ $Name: not supported by cvs2svn $
    12 *  @date $Date: 2005-03-17 19:01:01 $
     11*  @version $Revision: 1.24 $ $Name: not supported by cvs2svn $
     12*  @date $Date: 2005-04-06 01:12:58 $
    1313*
    1414*  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    509509    char *strComment = NULL;
    510510    char *linePtr = NULL;
    511     psElemType vecType = PS_TYPE_PTR;
     511    psElemType vecType = 0;
    512512    psS32 status = 0;
    513513    psU32 lineCount = 0;
    … …  
    956956    psS32 status = 0;
    957957    psU32 lineNumber = 0;
    958     psElemType pType = PS_TYPE_PTR;
     958    psElemType pType = 0;
    959959    char *strName = NULL;
    960960    char *strType = NULL;

  • trunk/psLib/src/xml/psXML.c

    r3441 r3671  
    99*  @author Ross Harman, MHPCC
    1010*
    11 *  @version $Revision: 1.23 $ $Name: not supported by cvs2svn $
    12 *  @date $Date: 2005-03-17 19:01:01 $
     11*  @version $Revision: 1.24 $ $Name: not supported by cvs2svn $
     12*  @date $Date: 2005-04-06 01:12:58 $
    1313*
    1414*  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    509509    char *strComment = NULL;
    510510    char *linePtr = NULL;
    511     psElemType vecType = PS_TYPE_PTR;
     511    psElemType vecType = 0;
    512512    psS32 status = 0;
    513513    psU32 lineCount = 0;
    … …  
    956956    psS32 status = 0;
    957957    psU32 lineNumber = 0;
    958     psElemType pType = PS_TYPE_PTR;
     958    psElemType pType = 0;
    959959    char *strName = NULL;
    960960    char *strType = NULL;
Note: See TracChangeset for help on using the changeset viewer.