Changeset 2011
- Timestamp:
- Oct 7, 2004, 10:49:57 AM (22 years ago)
- Location:
- trunk/psLib/src
- Files:
-
- 7 edited
-
astronomy/psMetadata.c (modified) (3 diffs)
-
astronomy/psMetadataIO.c (modified) (3 diffs)
-
collections/psMetadata.c (modified) (3 diffs)
-
collections/psMetadataIO.c (modified) (3 diffs)
-
types/psMetadata.c (modified) (3 diffs)
-
types/psMetadataConfig.c (modified) (3 diffs)
-
xml/psXML.c (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/psLib/src/astronomy/psMetadata.c
r2004 r2011 12 12 * @author Ross Harman, MHPCC 13 13 * 14 * @version $Revision: 1.3 1$ $Name: not supported by cvs2svn $15 * @date $Date: 2004-10-07 19:31:41 $14 * @version $Revision: 1.32 $ $Name: not supported by cvs2svn $ 15 * @date $Date: 2004-10-07 20:49:51 $ 16 16 * 17 17 * Copyright 2004 Maui High Performance Computing Center, University of Hawaii … … 159 159 break; 160 160 case PS_META_S32: 161 metadataItem->data.S32 = (psS32)va_arg(argPtr, ps F64);161 metadataItem->data.S32 = (psS32)va_arg(argPtr, psS32); 162 162 break; 163 163 case PS_META_F32: … … 365 365 } 366 366 // Decrement reference count, since the metadata item is now in metadata collection and no longer needed 367 // here368 367 psMemDecrRefCounter(metadataItem); 369 368 -
trunk/psLib/src/astronomy/psMetadataIO.c
r2004 r2011 9 9 * @author Ross Harman, MHPCC 10 10 * 11 * @version $Revision: 1. 4$ $Name: not supported by cvs2svn $12 * @date $Date: 2004-10-07 19:31:59$11 * @version $Revision: 1.5 $ $Name: not supported by cvs2svn $ 12 * @date $Date: 2004-10-07 20:49:57 $ 13 13 * 14 14 * Copyright 2004 Maui High Performance Computing Center, University of Hawaii … … 463 463 int failedLines = 0; 464 464 psF64 tempDbl = 0.0; 465 psS32 tempInt = 0.0; 465 466 psMetadataItem *metadataItem = NULL; 466 467 psVector *tempVec = NULL; … … 613 614 break; 614 615 case PS_META_S32: 616 tempInt = (psS32)parseValue(strValue, &status); 617 if(!status) { 618 psMetadataAdd(*md, PS_LIST_TAIL, strName, mdType, strComment, tempInt); 619 } else { 620 status = 0; 621 failedLines++; 622 psError(__func__, "Failed to parse value. Value: %s Line %d: %s", strValue, lineCount, line); 623 continue; 624 } 625 break; 615 626 case PS_META_F32: 616 627 case PS_META_F64: -
trunk/psLib/src/collections/psMetadata.c
r2004 r2011 12 12 * @author Ross Harman, MHPCC 13 13 * 14 * @version $Revision: 1.3 1$ $Name: not supported by cvs2svn $15 * @date $Date: 2004-10-07 19:31:41 $14 * @version $Revision: 1.32 $ $Name: not supported by cvs2svn $ 15 * @date $Date: 2004-10-07 20:49:51 $ 16 16 * 17 17 * Copyright 2004 Maui High Performance Computing Center, University of Hawaii … … 159 159 break; 160 160 case PS_META_S32: 161 metadataItem->data.S32 = (psS32)va_arg(argPtr, ps F64);161 metadataItem->data.S32 = (psS32)va_arg(argPtr, psS32); 162 162 break; 163 163 case PS_META_F32: … … 365 365 } 366 366 // Decrement reference count, since the metadata item is now in metadata collection and no longer needed 367 // here368 367 psMemDecrRefCounter(metadataItem); 369 368 -
trunk/psLib/src/collections/psMetadataIO.c
r2004 r2011 9 9 * @author Ross Harman, MHPCC 10 10 * 11 * @version $Revision: 1. 4$ $Name: not supported by cvs2svn $12 * @date $Date: 2004-10-07 19:31:59$11 * @version $Revision: 1.5 $ $Name: not supported by cvs2svn $ 12 * @date $Date: 2004-10-07 20:49:57 $ 13 13 * 14 14 * Copyright 2004 Maui High Performance Computing Center, University of Hawaii … … 463 463 int failedLines = 0; 464 464 psF64 tempDbl = 0.0; 465 psS32 tempInt = 0.0; 465 466 psMetadataItem *metadataItem = NULL; 466 467 psVector *tempVec = NULL; … … 613 614 break; 614 615 case PS_META_S32: 616 tempInt = (psS32)parseValue(strValue, &status); 617 if(!status) { 618 psMetadataAdd(*md, PS_LIST_TAIL, strName, mdType, strComment, tempInt); 619 } else { 620 status = 0; 621 failedLines++; 622 psError(__func__, "Failed to parse value. Value: %s Line %d: %s", strValue, lineCount, line); 623 continue; 624 } 625 break; 615 626 case PS_META_F32: 616 627 case PS_META_F64: -
trunk/psLib/src/types/psMetadata.c
r2004 r2011 12 12 * @author Ross Harman, MHPCC 13 13 * 14 * @version $Revision: 1.3 1$ $Name: not supported by cvs2svn $15 * @date $Date: 2004-10-07 19:31:41 $14 * @version $Revision: 1.32 $ $Name: not supported by cvs2svn $ 15 * @date $Date: 2004-10-07 20:49:51 $ 16 16 * 17 17 * Copyright 2004 Maui High Performance Computing Center, University of Hawaii … … 159 159 break; 160 160 case PS_META_S32: 161 metadataItem->data.S32 = (psS32)va_arg(argPtr, ps F64);161 metadataItem->data.S32 = (psS32)va_arg(argPtr, psS32); 162 162 break; 163 163 case PS_META_F32: … … 365 365 } 366 366 // Decrement reference count, since the metadata item is now in metadata collection and no longer needed 367 // here368 367 psMemDecrRefCounter(metadataItem); 369 368 -
trunk/psLib/src/types/psMetadataConfig.c
r2004 r2011 9 9 * @author Ross Harman, MHPCC 10 10 * 11 * @version $Revision: 1. 4$ $Name: not supported by cvs2svn $12 * @date $Date: 2004-10-07 19:31:59$11 * @version $Revision: 1.5 $ $Name: not supported by cvs2svn $ 12 * @date $Date: 2004-10-07 20:49:57 $ 13 13 * 14 14 * Copyright 2004 Maui High Performance Computing Center, University of Hawaii … … 463 463 int failedLines = 0; 464 464 psF64 tempDbl = 0.0; 465 psS32 tempInt = 0.0; 465 466 psMetadataItem *metadataItem = NULL; 466 467 psVector *tempVec = NULL; … … 613 614 break; 614 615 case PS_META_S32: 616 tempInt = (psS32)parseValue(strValue, &status); 617 if(!status) { 618 psMetadataAdd(*md, PS_LIST_TAIL, strName, mdType, strComment, tempInt); 619 } else { 620 status = 0; 621 failedLines++; 622 psError(__func__, "Failed to parse value. Value: %s Line %d: %s", strValue, lineCount, line); 623 continue; 624 } 625 break; 615 626 case PS_META_F32: 616 627 case PS_META_F64: -
trunk/psLib/src/xml/psXML.c
r2004 r2011 9 9 * @author Ross Harman, MHPCC 10 10 * 11 * @version $Revision: 1. 4$ $Name: not supported by cvs2svn $12 * @date $Date: 2004-10-07 19:31:59$11 * @version $Revision: 1.5 $ $Name: not supported by cvs2svn $ 12 * @date $Date: 2004-10-07 20:49:57 $ 13 13 * 14 14 * Copyright 2004 Maui High Performance Computing Center, University of Hawaii … … 463 463 int failedLines = 0; 464 464 psF64 tempDbl = 0.0; 465 psS32 tempInt = 0.0; 465 466 psMetadataItem *metadataItem = NULL; 466 467 psVector *tempVec = NULL; … … 613 614 break; 614 615 case PS_META_S32: 616 tempInt = (psS32)parseValue(strValue, &status); 617 if(!status) { 618 psMetadataAdd(*md, PS_LIST_TAIL, strName, mdType, strComment, tempInt); 619 } else { 620 status = 0; 621 failedLines++; 622 psError(__func__, "Failed to parse value. Value: %s Line %d: %s", strValue, lineCount, line); 623 continue; 624 } 625 break; 615 626 case PS_META_F32: 616 627 case PS_META_F64:
Note:
See TracChangeset
for help on using the changeset viewer.
