Changeset 3671 for trunk/psLib/src/astronomy

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/astronomy

Files:

• psDB.c (modified) (11 diffs)
• psMetadata.h (modified) (2 diffs)
• psMetadataIO.c (modified) (3 diffs)

trunk/psLib/src/astronomy/psDB.c

@@ -12 +12 @@
  *  @author Joshua Hoblitt
  *
- *  @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-03-31 02:54:27 $
+ *  @version $Revision: 1.14 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-04-06 01:12:58 $
  *
  *  Copyright 2005 Joshua Hoblitt, University of Hawaii
@@ -360 +360 @@
         // valid for psVector?
         break;
-    case PS_TYPE_PTR:
-        // valid for psVector?
-        break;
     }
 
@@ -448 +445 @@
 
             // copy field data and convert NULLs to the appropriate NaN value
-            if ((pType == PS_TYPE_PTR) || (pType == PS_META_STR)) {
+            if (pType == PS_META_STR) {
                 psMetadataAddStr(md, 0, field[i].name, "", data);
             } else if (pType == PS_META_S32) {
@@ -621 +618 @@
         // column as an psArray of strings; otherwise fetch the column as a
         // psVector.
-        if ((pType == PS_TYPE_PTR) || (pType == PS_META_STR)) {
+        if (pType == PS_META_STR) {
             // PS_META_UNKNOWN -> PS_META_ARRAY ?
             column = psDBSelectColumn(dbh, tableName, field[i].name, 0);
@@ -821 +818 @@
                    (item->type == PS_META_LOOKUPTABLE) || (item->type == PS_META_JPEG)   ||
                    (item->type == PS_META_PNG)         || (item->type == PS_META_ASTROM) ||
-                   (item->type == PS_META_UNKNOWN)     || (item->type == PS_TYPE_PTR)) {
+                   (item->type == PS_META_UNKNOWN)) {
 
             bind[i].buffer_length = (unsigned long)strlen((char *)item->data.V);
@@ -881 +878 @@
                    (item->type == PS_META_LOOKUPTABLE) || (item->type == PS_META_JPEG)   ||
                    (item->type == PS_META_PNG)         || (item->type == PS_META_ASTROM) ||
-                   (item->type == PS_META_UNKNOWN)     || (item->type == PS_TYPE_PTR)) {
+                   (item->type == PS_META_UNKNOWN)) {
             // + column name + _ + varchar( + length + )
             psStringAppend(&query, "%s VARCHAR(%s)", item->name, item->data.V);
@@ -1271 +1268 @@
         psDBAddToLookupTable(lookupTable, PS_TYPE_C64, "PS_TYPE_C64 is not supported");
         psDBAddToLookupTable(lookupTable, PS_TYPE_BOOL,"BOOLEAN");
-        psDBAddToLookupTable(lookupTable, PS_TYPE_PTR, "BLOB");
         psDBAddToLookupTable(lookupTable, PS_META_STR, "BLOB");
     }
@@ -1324 +1320 @@
 
         // DECIMAL does not exist in the pType to SQL table
-        value = psDBIntToString((psU64)PS_TYPE_PTR);
+        value = psDBIntToString(0);
         psHashAdd(lookupTable, "DECIMAL", value);
         psFree(value);
@@ -1416 +1412 @@
         psDBAddVoidToLookupTable(lookupTable, PS_TYPE_C64,    psDBMySQLTypeAlloc(MYSQL_TYPE_VAR_STRING, false));
         psDBAddVoidToLookupTable(lookupTable, PS_TYPE_BOOL,   psDBMySQLTypeAlloc(MYSQL_TYPE_TINY,       true));
-        psDBAddVoidToLookupTable(lookupTable, PS_TYPE_PTR,    psDBMySQLTypeAlloc(MYSQL_TYPE_VAR_STRING, false));
+        // XXX: removed PS_TYPE_PTR, can this be removed too?
+        // psDBAddVoidToLookupTable(lookupTable, PS_TYPE_PTR,    psDBMySQLTypeAlloc(MYSQL_TYPE_VAR_STRING, false));
 
         psDBAddVoidToLookupTable(lookupTable, PS_META_STR,    psDBMySQLTypeAlloc(MYSQL_TYPE_VAR_STRING, false));
@@ -1538 +1535 @@
         // what is NaN for a bool?
         break;
-    case PS_TYPE_PTR:
-        PS_NAN_ALLOC(myNaN, char, '\0');
-        break;
     }
 
@@ -1593 +1587 @@
     case PS_TYPE_BOOL:
         // what is NaN for a bool?
-        break;
-    case PS_TYPE_PTR:
-        isNaN = PS_IS_NAN(char, data, '\0');
         break;
     }

trunk/psLib/src/astronomy/psMetadata.h

@@ -11 +11 @@
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.42 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-03-29 22:13:53 $
+*  @version $Revision: 1.43 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-04-06 01:12:58 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -64 +64 @@
         (METATYPE==PS_META_F32) ? PS_TYPE_F32 : \
         (METATYPE==PS_META_F64) ? PS_TYPE_F64 : \
-        (METATYPE==PS_META_BOOL) ? PS_TYPE_BOOL : PS_TYPE_PTR )
+        (METATYPE==PS_META_BOOL) ? PS_TYPE_BOOL : 0 )
 
 /** Option flags for psMetadata functions

trunk/psLib/src/astronomy/psMetadataIO.c

@@ -9 +9 @@
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.23 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-03-17 19:01:01 $
+*  @version $Revision: 1.24 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-04-06 01:12:58 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -509 +509 @@
     char *strComment = NULL;
     char *linePtr = NULL;
-    psElemType vecType = PS_TYPE_PTR;
+    psElemType vecType = 0;
     psS32 status = 0;
     psU32 lineCount = 0;
@@ -956 +956 @@
     psS32 status = 0;
     psU32 lineNumber = 0;
-    psElemType pType = PS_TYPE_PTR;
+    psElemType pType = 0;
     char *strName = NULL;
     char *strType = NULL;