Changeset 28003 for branches/pap/ippToPsps/src/ippToPspsConfig.c

Timestamp:

May 18, 2010, 12:49:05 PM (16 years ago)

Author:

eugene

Message:

merging changes from trunk into branches/pap

Location:

branches/pap

Files:

• . (modified) (1 prop)
• ippToPsps/src/ippToPspsConfig.c (modified) (7 diffs)

branches/pap/ippToPsps/src/ippToPspsConfig.c

@@ -737 +737 @@
                     if (fromHeader) {
                         fits_read_key(fitsIn, TBYTE, table->columns[i].ippName, &int8col[0], NULL, &readStatus);
-                        if (!isnormal(int8col[0])) int8col[0] = int8null;
+                        if (!isfinite(int8col[0])) int8col[0] = int8null;
                     }
                     else fits_read_col(fitsIn, TBYTE, table->columns[i].ippColNum, 1, 1, nRows, &int8null, int8col, &anynull, &readStatus);
@@ -745 +745 @@
                     if (fromHeader) {
                         fits_read_key(fitsIn, TSHORT, table->columns[i].ippName, &int16col[0], NULL, &readStatus);
-                        if (!isnormal(int16col[0])) int16col[0] = int16null;
+                        if (!isfinite(int16col[0])) int16col[0] = int16null;
                     }
                     else fits_read_col(fitsIn, TSHORT, table->columns[i].ippColNum, 1, 1, nRows, &int16null, int16col, &anynull, &readStatus);
@@ -753 +753 @@
                     if (fromHeader) {
                         fits_read_key(fitsIn, TLONG, table->columns[i].ippName, &longcol[0], NULL, &readStatus);
-                        if (!isnormal(longcol[0])) longcol[0] = longnull;
+                        if (!isfinite(longcol[0])) longcol[0] = longnull;
                     }
                     else fits_read_col(fitsIn, TLONG, table->columns[i].ippColNum, 1, 1, nRows, &longnull, longcol, &anynull, &readStatus);
@@ -761 +761 @@
                     if (fromHeader) {
                         fits_read_key(fitsIn, TLONGLONG, table->columns[i].ippName, &longcol[0], NULL, &readStatus);
-                        if (!isnormal(longcol[0])) longcol[0] = longnull;
+                        if (!isfinite(longcol[0])) longcol[0] = longnull;
                     }
                     else fits_read_col(fitsIn, TLONGLONG, table->columns[i].ippColNum, 1, 1, nRows, &longnull, longcol, &anynull, &readStatus);
@@ -769 +769 @@
                     if (fromHeader) {
                         fits_read_key(fitsIn, TFLOAT, table->columns[i].ippName,&floatcol[0], NULL, &readStatus); 
-                        if (!isnormal(floatcol[0])) floatcol[0] = floatnull;
+                        if (!isfinite(floatcol[0])) floatcol[0] = floatnull;
                     }
                     else fits_read_col(fitsIn, TFLOAT, table->columns[i].ippColNum, 1, 1, nRows, &floatnull, floatcol, &anynull, &readStatus);
@@ -777 +777 @@
                     if (fromHeader) {
                         fits_read_key(fitsIn, TDOUBLE, table->columns[i].ippName, &doublecol[0], NULL, &readStatus);
-                        if (!isnormal(doublecol[0])) doublecol[0] = doublenull;
+                        if (!isfinite(doublecol[0])) doublecol[0] = doublenull;
                     }
                     else fits_read_col(fitsIn, TDOUBLE, table->columns[i].ippColNum, 1, 1, nRows, &doublenull, doublecol, &anynull, &readStatus);
@@ -795 +795 @@
 
             // TODO need these errors, but strange error handling runs out of memory
-            //if (readStatus) psError(PS_ERR_IO, false, "Unable to read col num '%d' col name '%s'", table->columns[i].ippColNum, table->columns[i].ippName );
-            //if (writeStatus) psError(PS_ERR_IO, false, "Unable to write col '%s'", table->columns[i].pspsName );
+            //if (readStatus) {
+            //    psError(PS_ERR_IO, false, "Unable to read col num '%d' col name '%s', type %d", 
+            //        table->columns[i].ippColNum, table->columns[i].ippName, table->columns[i].ippType);
+            //    fits_report_error(stderr, readStatus);
+            //}
+            //if (writeStatus) {
+            //    psError(PS_ERR_IO, false, "Unable to write col '%s'", table->columns[i].pspsName );
+            //    fits_report_error(stderr, writeStatus);
+            //}
         }
     }