IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 3495 for trunk/psLib/src


Ignore:
Timestamp:
Mar 24, 2005, 12:21:17 PM (21 years ago)
Author:
desonia
Message:

changes for test of psFitsUpdateTable.

Location:
trunk/psLib/src
Files:
6 edited

Legend:

Unmodified
Added
Removed

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

    r3407 r3495  
    1 
    21/** @file  psMetadata.c
    32*
    … …  
    1211*  @author Ross Harman, MHPCC
    1312*
    14 *  @version $Revision: 1.55 $ $Name: not supported by cvs2svn $
    15 *  @date $Date: 2005-03-11 20:38:56 $
     13*  @version $Revision: 1.56 $ $Name: not supported by cvs2svn $
     14*  @date $Date: 2005-03-24 22:21:17 $
    1615*
    1716*  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    119118    }
    120119    psFree(iter->iter);
    121     regfree(iter->preg);
     120
     121    if (iter->preg != NULL) {
     122        regfree(iter->preg);
     123    }
    122124}
    123125

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

    r3407 r3495  
    1 
    21/** @file  psMetadata.c
    32*
    … …  
    1211*  @author Ross Harman, MHPCC
    1312*
    14 *  @version $Revision: 1.55 $ $Name: not supported by cvs2svn $
    15 *  @date $Date: 2005-03-11 20:38:56 $
     13*  @version $Revision: 1.56 $ $Name: not supported by cvs2svn $
     14*  @date $Date: 2005-03-24 22:21:17 $
    1615*
    1716*  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    119118    }
    120119    psFree(iter->iter);
    121     regfree(iter->preg);
     120
     121    if (iter->preg != NULL) {
     122        regfree(iter->preg);
     123    }
    122124}
    123125

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

    r3476 r3495  
    77 *  @author Robert DeSonia, MHPCC
    88 *
    9  *  @version $Revision: 1.22 $ $Name: not supported by cvs2svn $
    10  *  @date $Date: 2005-03-22 21:52:49 $
     9 *  @version $Revision: 1.23 $ $Name: not supported by cvs2svn $
     10 *  @date $Date: 2005-03-24 22:21:17 $
    1111 *
    1212 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    16681668    }
    16691669
    1670 
    16711670    // check to see if we even are positioned on a table HDU
    16721671    int hdutype;
    … …  
    16841683        return false;
    16851684    }
    1686 
    16871685
    16881686    psMetadataIterator* iter = psMetadataIteratorAlloc(data,PS_LIST_HEAD,NULL);
    … …  
    17001698                convertPsTypeToFits(item->type, NULL, NULL, &dataType);
    17011699
    1702                 if (fits_write_col(fits->p_fd, dataType, colnum, row, 0,1,&item->data,&status) != 0) {
     1700                if (fits_write_col(fits->p_fd, dataType, colnum, row+1, 1, 1, &item->data,&status) != 0) {
    17031701                    char fitsErr[MAX_STRING_LENGTH];
    17041702                    (void)fits_get_errstatus(status, fitsErr);
    … …  
    17061704                            PS_ERRORTEXT_psFits_WRITE_FAILED,
    17071705                            fits->filename, fitsErr);
     1706                    psFree(iter);
    17081707                    return false;
    17091708                }
     1709            } else {
     1710                // the column was not found.
     1711                psWarning("No column with the name '%s' exists in the table.",
     1712                          item->name);
    17101713            }
    17111714        }

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

    r3476 r3495  
    77 *  @author Robert DeSonia, MHPCC
    88 *
    9  *  @version $Revision: 1.22 $ $Name: not supported by cvs2svn $
    10  *  @date $Date: 2005-03-22 21:52:49 $
     9 *  @version $Revision: 1.23 $ $Name: not supported by cvs2svn $
     10 *  @date $Date: 2005-03-24 22:21:17 $
    1111 *
    1212 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    16681668    }
    16691669
    1670 
    16711670    // check to see if we even are positioned on a table HDU
    16721671    int hdutype;
    … …  
    16841683        return false;
    16851684    }
    1686 
    16871685
    16881686    psMetadataIterator* iter = psMetadataIteratorAlloc(data,PS_LIST_HEAD,NULL);
    … …  
    17001698                convertPsTypeToFits(item->type, NULL, NULL, &dataType);
    17011699
    1702                 if (fits_write_col(fits->p_fd, dataType, colnum, row, 0,1,&item->data,&status) != 0) {
     1700                if (fits_write_col(fits->p_fd, dataType, colnum, row+1, 1, 1, &item->data,&status) != 0) {
    17031701                    char fitsErr[MAX_STRING_LENGTH];
    17041702                    (void)fits_get_errstatus(status, fitsErr);
    … …  
    17061704                            PS_ERRORTEXT_psFits_WRITE_FAILED,
    17071705                            fits->filename, fitsErr);
     1706                    psFree(iter);
    17081707                    return false;
    17091708                }
     1709            } else {
     1710                // the column was not found.
     1711                psWarning("No column with the name '%s' exists in the table.",
     1712                          item->name);
    17101713            }
    17111714        }

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

    r3476 r3495  
    77 *  @author Robert DeSonia, MHPCC
    88 *
    9  *  @version $Revision: 1.22 $ $Name: not supported by cvs2svn $
    10  *  @date $Date: 2005-03-22 21:52:49 $
     9 *  @version $Revision: 1.23 $ $Name: not supported by cvs2svn $
     10 *  @date $Date: 2005-03-24 22:21:17 $
    1111 *
    1212 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    16681668    }
    16691669
    1670 
    16711670    // check to see if we even are positioned on a table HDU
    16721671    int hdutype;
    … …  
    16841683        return false;
    16851684    }
    1686 
    16871685
    16881686    psMetadataIterator* iter = psMetadataIteratorAlloc(data,PS_LIST_HEAD,NULL);
    … …  
    17001698                convertPsTypeToFits(item->type, NULL, NULL, &dataType);
    17011699
    1702                 if (fits_write_col(fits->p_fd, dataType, colnum, row, 0,1,&item->data,&status) != 0) {
     1700                if (fits_write_col(fits->p_fd, dataType, colnum, row+1, 1, 1, &item->data,&status) != 0) {
    17031701                    char fitsErr[MAX_STRING_LENGTH];
    17041702                    (void)fits_get_errstatus(status, fitsErr);
    … …  
    17061704                            PS_ERRORTEXT_psFits_WRITE_FAILED,
    17071705                            fits->filename, fitsErr);
     1706                    psFree(iter);
    17081707                    return false;
    17091708                }
     1709            } else {
     1710                // the column was not found.
     1711                psWarning("No column with the name '%s' exists in the table.",
     1712                          item->name);
    17101713            }
    17111714        }

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

    r3407 r3495  
    1 
    21/** @file  psMetadata.c
    32*
    … …  
    1211*  @author Ross Harman, MHPCC
    1312*
    14 *  @version $Revision: 1.55 $ $Name: not supported by cvs2svn $
    15 *  @date $Date: 2005-03-11 20:38:56 $
     13*  @version $Revision: 1.56 $ $Name: not supported by cvs2svn $
     14*  @date $Date: 2005-03-24 22:21:17 $
    1615*
    1716*  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    119118    }
    120119    psFree(iter->iter);
    121     regfree(iter->preg);
     120
     121    if (iter->preg != NULL) {
     122        regfree(iter->preg);
     123    }
    122124}
    123125
Note: See TracChangeset for help on using the changeset viewer.