Changeset 1376
- Timestamp:
- Aug 4, 2004, 10:47:52 AM (22 years ago)
- Location:
- trunk/psLib/src
- Files:
-
- 3 edited
-
astronomy/psMetadata.c (modified) (18 diffs)
-
collections/psMetadata.c (modified) (18 diffs)
-
types/psMetadata.c (modified) (18 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/psLib/src/astronomy/psMetadata.c
r1355 r1376 11 11 * @author Ross Harman, MHPCC 12 12 * 13 * @version $Revision: 1. 5$ $Name: not supported by cvs2svn $14 * @date $Date: 2004-0 7-31 00:48:20$13 * @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ 14 * @date $Date: 2004-08-04 20:47:52 $ 15 15 * 16 16 * Copyright 2004 Maui High Performance Computing Center, University of Hawaii … … 32 32 #include "psHash.h" 33 33 #include "psMetadata.h" 34 #include "psString.h" 34 35 35 36 … … 38 39 /******************************************************************************/ 39 40 40 // Maximum metadata length string41 #define MAX_VAL_SIZE 102442 43 41 // Maximum metadata error length 44 42 #define MAX_ERR_MESSAGE_LENGTH 1024 45 43 46 44 // Maximum line size 47 #define MAX_LINE_SIZE 8045 #define FITS_LINE_SIZE 80 48 46 49 47 /******************************************************************************/ … … 80 78 psFree( metadataItem->name ); 81 79 psFree( metadataItem->comment ); 82 83 if ( type == PS_META_STR || type == PS_META_IMG || type == PS_META_JPEG || type == PS_META_PNG || 84 type == PS_META_ASTROM || type == PS_META_UNKNOWN ) { 80 psFree( metadataItem->items ); 81 82 if ( type == PS_META_STR || 83 type == PS_META_IMG || 84 type == PS_META_JPEG || 85 type == PS_META_PNG || 86 type == PS_META_ASTROM || 87 type == PS_META_UNKNOWN ) { 85 88 psFree( metadataItem->data.V ); 86 89 } 87 88 psFree( metadataItem->items );89 90 } 90 91 … … 94 95 return ; 95 96 } 96 97 97 psFree( metadata->list ); 98 98 psFree( metadata->table ); … … 155 155 // Set metadata item value 156 156 switch ( type ) { 157 case PS_META_BOOL: 158 metadataItem->data.B = ( bool ) va_arg( argPtr, int ); 159 break; 157 160 case PS_META_S32: 158 161 metadataItem->data.S32 = va_arg( argPtr, psS32 ); … … 165 168 break; 166 169 case PS_META_STR: 170 metadataItem->data.V = psStringNCopy( va_arg( argPtr, char* ), MAX_STRING_LENGTH ); 171 break; 167 172 case PS_META_IMG: 168 173 case PS_META_JPEG: … … 170 175 case PS_META_ASTROM: 171 176 case PS_META_UNKNOWN: 172 metadataItem->data.V = psMemIncrRefCounter( va_arg( argPtr, psPTR ) );173 break;174 177 default: 175 psError( __func__, " 178 psError( __func__, "Invalid psMetadataType: %d", type ); 176 179 } 177 180 … … 201 204 p_psMemSetDeallocator( metadata, ( psFreeFcn ) metadataFree ); 202 205 203 // Allocate internal containers204 list = ( psList * ) ps Alloc( sizeof( psList ));206 // Allocate metadata's internal containers 207 list = ( psList * ) psListAlloc( NULL ); 205 208 if ( list == NULL ) { 206 209 psAbort( __func__, "Failed to allocate list" ); 207 210 } 208 211 209 table = ( psHash * ) ps Alloc( sizeof( psHash ));212 table = ( psHash * ) psHashAlloc( 10 ); 210 213 if ( table == NULL ) { 211 214 psAbort( __func__, "Failed to allocate table" ); 212 215 } 213 216 217 metadata->list = list; 218 metadata->table = table; 219 214 220 return metadata; 215 221 } … … 308 314 } 309 315 316 // Decrement reference count, since the metadata item is now in metadata collection and no longer needed here 317 psMemDecrRefCounter( metadataItem ); 318 310 319 return true; 311 320 } … … 543 552 544 553 switch ( type ) { 554 case PS_META_BOOL: 555 fprintf( fd, format, metadataItem->data.B ); 556 break; 545 557 case PS_META_S32: 546 558 fprintf( fd, format, metadataItem->data.S32 ); … … 566 578 } 567 579 568 psMetadata *psMetadataReadHeader( psMetadata *output, const char *extname, int extnum, const char *filename )569 {570 /* char line[ MAX_VAL_SIZE ];571 char keyName[ MAX_VAL_SIZE ];572 char keyValue[ MAX_VAL_SIZE ];573 char keyComment[ MAX_VAL_SIZE ];574 int status = 0;575 extnumCtr = 1;576 FILE *fd = NULL;577 578 if ( filename == NULL ) {579 psError( __func__, "Null file name not allowed" );580 return NULL;581 }582 583 if ( extname == NULL && extnum == 0 ) {584 psError( __func__, "Null extname AND extnum = 0 not allowed" );585 return NULL;586 } else if ( extname && extnum ) {587 psError( __func__, "Both extname AND extnum arguments should not have valid values." );588 return NULL;589 }590 591 fd = fopen( filename, "r" );592 if ( fd == NULL ) {593 psError( __func__, "Null FITS file descriptor not allowed" );594 return NULL;595 }596 597 // Allocate metadata if user didn't598 if ( output == NULL ) {599 output = psMetadataAlloc();600 psError( __func__, "Failed to allocate metadata" );601 return NULL;602 }603 604 // Move to user designated HDU number or HDU name in text file. HDU numbers starts at one.605 TODO if(extname == NULL) {606 return output;607 }608 } else if(extnum > 0) {609 return output;610 }611 }612 613 614 line = fgets(line, MAX_LINE_SIZE+1, fp);615 while(line != NULL) {616 617 if(!strncmp("END", line, 3)){618 extnumCtr++;619 }620 621 if(extnumCtr == extnum) {622 623 // Put text into metadata624 if(!strncmp("COMMENT", line, 7)){625 // COMMENT keywords have no "=" sign626 //TODO627 } else if (strchr(line, '\'') != NULL){628 629 // Output and logging keywords have tic (') characters630 keyName = strtok(line, "=");631 keyValue = strtok(NULL, "'");632 keyValue = strtok(NULL, "'");633 keyComment = strtok(NULL, "XXX");634 635 636 } else637 638 // Everything else is considered to be the standard name and value639 keyName = strtok(line, "=");640 keyValue = strtok(NULL, "/");641 keyComment = strtok(NULL, "XXX");642 }643 644 645 }646 647 // Read next line648 line = fgets(line, MAX_LINE_SIZE+1, fp);649 }650 651 */652 return output;653 }654 655 580 psMetadata *psMetadataFReadHeader( psMetadata *output, const char *extname, int extnum, fitsfile *fd ) 656 581 { 582 bool tempBool; 657 583 bool success; 658 584 char keyType; 659 char keyName[ MAX_VAL_SIZE ];660 char keyValue[ MAX_VAL_SIZE ];661 char keyComment[ MAX_VAL_SIZE ];662 char fitsErr[ MAX_ ERR_MESSAGE_LENGTH ];585 char keyName[ FITS_LINE_SIZE ]; 586 char keyValue[ FITS_LINE_SIZE ]; 587 char keyComment[ FITS_LINE_SIZE ]; 588 char fitsErr[ MAX_STRING_LENGTH ]; 663 589 char* tempExtname = NULL; 664 590 int i; … … 666 592 int status = 0; 667 593 int numKeys = 0; 594 int keyNum = 0; 668 595 psMetadataType metadataItemType; 669 596 … … 677 604 return NULL; 678 605 } else if ( extname && extnum ) { 679 psError( __func__, "Both extname AND extnum arguments should not have val id values." );606 psError( __func__, "Both extname AND extnum arguments should not have values." ); 680 607 return NULL; 681 608 } … … 684 611 if ( output == NULL ) { 685 612 output = psMetadataAlloc(); 686 psError( __func__, "Failed to allocate metadata" );687 return NULL;688 613 } 689 614 … … 694 619 psError( __func__, "FITS error while locating header: %s", fitsErr ); 695 620 status = 0; 696 fits_close_file( fd, &status );697 621 return output; 698 622 } 699 623 } else if ( extnum > 0 ) { 700 tempExtname = ( char* ) psAlloc( strlen( extname ) + 1 ); // fits_movnam_hdu doesn't like const part of extname 701 strncpy( tempExtname, extname, MAX_VAL_SIZE ); 624 tempExtname = ( char* ) extname; 702 625 if ( fits_movnam_hdu( fd, ANY_HDU, tempExtname, 0, &status ) != 0 ) { 703 626 fits_get_errstatus( status, fitsErr ); 704 627 psError( __func__, "FITS error while locating header: %s", fitsErr ); 705 628 status = 0; 706 fits_close_file( fd, &status );707 psFree( tempExtname );708 629 return output; 709 630 } 710 psFree( tempExtname );711 631 } 712 632 713 633 // Get number of key names 714 if ( fits_get_hdrpos( fd, &numKeys, NULL, &status ) != 0 ) {634 if ( fits_get_hdrpos( fd, &numKeys, &keyNum, &status ) != 0 ) { 715 635 fits_get_errstatus( status, fitsErr ); 716 636 psError( __func__, "FITS error while reading keys: %s", fitsErr ); 717 637 status = 0; 718 fits_close_file( fd, &status );719 638 return output; 720 639 } … … 726 645 psError( __func__, "FITS error while reading key number %d: %s", i, fitsErr ); 727 646 status = 0; 728 fits_close_file( fd, &status );729 647 return output; 730 648 } 731 732 649 if ( fits_get_keytype( keyValue, &keyType, &status ) != 0 ) { 733 650 fits_get_errstatus( status, fitsErr ); 734 psError( __func__, "FITS error while determining key type: %s", fitsErr ); 735 status = 0; 736 fits_close_file( fd, &status ); 737 return output; 651 if ( status != VALUE_UNDEFINED ) { 652 psError( __func__, "FITS error while determining key type: %s", fitsErr ); 653 status = 0; 654 return output; 655 } else { 656 // Some keywords are still valid even though they don't have a type or value, like COMMENTS 657 keyType = 'C'; 658 status = 0; 659 } 738 660 } 739 661 … … 752 674 break; 753 675 case 'L': 676 metadataItemType = PS_META_BOOL; 677 tempBool = ( keyValue[ 0 ] == 'T' ) ? 1 : 0; 678 success = psMetadataAdd( output, PS_LIST_HEAD, keyName, metadataItemType, keyComment, tempBool ); 679 break; 680 case 'U': 754 681 case 'X': 755 682 default: -
trunk/psLib/src/collections/psMetadata.c
r1355 r1376 11 11 * @author Ross Harman, MHPCC 12 12 * 13 * @version $Revision: 1. 5$ $Name: not supported by cvs2svn $14 * @date $Date: 2004-0 7-31 00:48:20$13 * @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ 14 * @date $Date: 2004-08-04 20:47:52 $ 15 15 * 16 16 * Copyright 2004 Maui High Performance Computing Center, University of Hawaii … … 32 32 #include "psHash.h" 33 33 #include "psMetadata.h" 34 #include "psString.h" 34 35 35 36 … … 38 39 /******************************************************************************/ 39 40 40 // Maximum metadata length string41 #define MAX_VAL_SIZE 102442 43 41 // Maximum metadata error length 44 42 #define MAX_ERR_MESSAGE_LENGTH 1024 45 43 46 44 // Maximum line size 47 #define MAX_LINE_SIZE 8045 #define FITS_LINE_SIZE 80 48 46 49 47 /******************************************************************************/ … … 80 78 psFree( metadataItem->name ); 81 79 psFree( metadataItem->comment ); 82 83 if ( type == PS_META_STR || type == PS_META_IMG || type == PS_META_JPEG || type == PS_META_PNG || 84 type == PS_META_ASTROM || type == PS_META_UNKNOWN ) { 80 psFree( metadataItem->items ); 81 82 if ( type == PS_META_STR || 83 type == PS_META_IMG || 84 type == PS_META_JPEG || 85 type == PS_META_PNG || 86 type == PS_META_ASTROM || 87 type == PS_META_UNKNOWN ) { 85 88 psFree( metadataItem->data.V ); 86 89 } 87 88 psFree( metadataItem->items );89 90 } 90 91 … … 94 95 return ; 95 96 } 96 97 97 psFree( metadata->list ); 98 98 psFree( metadata->table ); … … 155 155 // Set metadata item value 156 156 switch ( type ) { 157 case PS_META_BOOL: 158 metadataItem->data.B = ( bool ) va_arg( argPtr, int ); 159 break; 157 160 case PS_META_S32: 158 161 metadataItem->data.S32 = va_arg( argPtr, psS32 ); … … 165 168 break; 166 169 case PS_META_STR: 170 metadataItem->data.V = psStringNCopy( va_arg( argPtr, char* ), MAX_STRING_LENGTH ); 171 break; 167 172 case PS_META_IMG: 168 173 case PS_META_JPEG: … … 170 175 case PS_META_ASTROM: 171 176 case PS_META_UNKNOWN: 172 metadataItem->data.V = psMemIncrRefCounter( va_arg( argPtr, psPTR ) );173 break;174 177 default: 175 psError( __func__, " 178 psError( __func__, "Invalid psMetadataType: %d", type ); 176 179 } 177 180 … … 201 204 p_psMemSetDeallocator( metadata, ( psFreeFcn ) metadataFree ); 202 205 203 // Allocate internal containers204 list = ( psList * ) ps Alloc( sizeof( psList ));206 // Allocate metadata's internal containers 207 list = ( psList * ) psListAlloc( NULL ); 205 208 if ( list == NULL ) { 206 209 psAbort( __func__, "Failed to allocate list" ); 207 210 } 208 211 209 table = ( psHash * ) ps Alloc( sizeof( psHash ));212 table = ( psHash * ) psHashAlloc( 10 ); 210 213 if ( table == NULL ) { 211 214 psAbort( __func__, "Failed to allocate table" ); 212 215 } 213 216 217 metadata->list = list; 218 metadata->table = table; 219 214 220 return metadata; 215 221 } … … 308 314 } 309 315 316 // Decrement reference count, since the metadata item is now in metadata collection and no longer needed here 317 psMemDecrRefCounter( metadataItem ); 318 310 319 return true; 311 320 } … … 543 552 544 553 switch ( type ) { 554 case PS_META_BOOL: 555 fprintf( fd, format, metadataItem->data.B ); 556 break; 545 557 case PS_META_S32: 546 558 fprintf( fd, format, metadataItem->data.S32 ); … … 566 578 } 567 579 568 psMetadata *psMetadataReadHeader( psMetadata *output, const char *extname, int extnum, const char *filename )569 {570 /* char line[ MAX_VAL_SIZE ];571 char keyName[ MAX_VAL_SIZE ];572 char keyValue[ MAX_VAL_SIZE ];573 char keyComment[ MAX_VAL_SIZE ];574 int status = 0;575 extnumCtr = 1;576 FILE *fd = NULL;577 578 if ( filename == NULL ) {579 psError( __func__, "Null file name not allowed" );580 return NULL;581 }582 583 if ( extname == NULL && extnum == 0 ) {584 psError( __func__, "Null extname AND extnum = 0 not allowed" );585 return NULL;586 } else if ( extname && extnum ) {587 psError( __func__, "Both extname AND extnum arguments should not have valid values." );588 return NULL;589 }590 591 fd = fopen( filename, "r" );592 if ( fd == NULL ) {593 psError( __func__, "Null FITS file descriptor not allowed" );594 return NULL;595 }596 597 // Allocate metadata if user didn't598 if ( output == NULL ) {599 output = psMetadataAlloc();600 psError( __func__, "Failed to allocate metadata" );601 return NULL;602 }603 604 // Move to user designated HDU number or HDU name in text file. HDU numbers starts at one.605 TODO if(extname == NULL) {606 return output;607 }608 } else if(extnum > 0) {609 return output;610 }611 }612 613 614 line = fgets(line, MAX_LINE_SIZE+1, fp);615 while(line != NULL) {616 617 if(!strncmp("END", line, 3)){618 extnumCtr++;619 }620 621 if(extnumCtr == extnum) {622 623 // Put text into metadata624 if(!strncmp("COMMENT", line, 7)){625 // COMMENT keywords have no "=" sign626 //TODO627 } else if (strchr(line, '\'') != NULL){628 629 // Output and logging keywords have tic (') characters630 keyName = strtok(line, "=");631 keyValue = strtok(NULL, "'");632 keyValue = strtok(NULL, "'");633 keyComment = strtok(NULL, "XXX");634 635 636 } else637 638 // Everything else is considered to be the standard name and value639 keyName = strtok(line, "=");640 keyValue = strtok(NULL, "/");641 keyComment = strtok(NULL, "XXX");642 }643 644 645 }646 647 // Read next line648 line = fgets(line, MAX_LINE_SIZE+1, fp);649 }650 651 */652 return output;653 }654 655 580 psMetadata *psMetadataFReadHeader( psMetadata *output, const char *extname, int extnum, fitsfile *fd ) 656 581 { 582 bool tempBool; 657 583 bool success; 658 584 char keyType; 659 char keyName[ MAX_VAL_SIZE ];660 char keyValue[ MAX_VAL_SIZE ];661 char keyComment[ MAX_VAL_SIZE ];662 char fitsErr[ MAX_ ERR_MESSAGE_LENGTH ];585 char keyName[ FITS_LINE_SIZE ]; 586 char keyValue[ FITS_LINE_SIZE ]; 587 char keyComment[ FITS_LINE_SIZE ]; 588 char fitsErr[ MAX_STRING_LENGTH ]; 663 589 char* tempExtname = NULL; 664 590 int i; … … 666 592 int status = 0; 667 593 int numKeys = 0; 594 int keyNum = 0; 668 595 psMetadataType metadataItemType; 669 596 … … 677 604 return NULL; 678 605 } else if ( extname && extnum ) { 679 psError( __func__, "Both extname AND extnum arguments should not have val id values." );606 psError( __func__, "Both extname AND extnum arguments should not have values." ); 680 607 return NULL; 681 608 } … … 684 611 if ( output == NULL ) { 685 612 output = psMetadataAlloc(); 686 psError( __func__, "Failed to allocate metadata" );687 return NULL;688 613 } 689 614 … … 694 619 psError( __func__, "FITS error while locating header: %s", fitsErr ); 695 620 status = 0; 696 fits_close_file( fd, &status );697 621 return output; 698 622 } 699 623 } else if ( extnum > 0 ) { 700 tempExtname = ( char* ) psAlloc( strlen( extname ) + 1 ); // fits_movnam_hdu doesn't like const part of extname 701 strncpy( tempExtname, extname, MAX_VAL_SIZE ); 624 tempExtname = ( char* ) extname; 702 625 if ( fits_movnam_hdu( fd, ANY_HDU, tempExtname, 0, &status ) != 0 ) { 703 626 fits_get_errstatus( status, fitsErr ); 704 627 psError( __func__, "FITS error while locating header: %s", fitsErr ); 705 628 status = 0; 706 fits_close_file( fd, &status );707 psFree( tempExtname );708 629 return output; 709 630 } 710 psFree( tempExtname );711 631 } 712 632 713 633 // Get number of key names 714 if ( fits_get_hdrpos( fd, &numKeys, NULL, &status ) != 0 ) {634 if ( fits_get_hdrpos( fd, &numKeys, &keyNum, &status ) != 0 ) { 715 635 fits_get_errstatus( status, fitsErr ); 716 636 psError( __func__, "FITS error while reading keys: %s", fitsErr ); 717 637 status = 0; 718 fits_close_file( fd, &status );719 638 return output; 720 639 } … … 726 645 psError( __func__, "FITS error while reading key number %d: %s", i, fitsErr ); 727 646 status = 0; 728 fits_close_file( fd, &status );729 647 return output; 730 648 } 731 732 649 if ( fits_get_keytype( keyValue, &keyType, &status ) != 0 ) { 733 650 fits_get_errstatus( status, fitsErr ); 734 psError( __func__, "FITS error while determining key type: %s", fitsErr ); 735 status = 0; 736 fits_close_file( fd, &status ); 737 return output; 651 if ( status != VALUE_UNDEFINED ) { 652 psError( __func__, "FITS error while determining key type: %s", fitsErr ); 653 status = 0; 654 return output; 655 } else { 656 // Some keywords are still valid even though they don't have a type or value, like COMMENTS 657 keyType = 'C'; 658 status = 0; 659 } 738 660 } 739 661 … … 752 674 break; 753 675 case 'L': 676 metadataItemType = PS_META_BOOL; 677 tempBool = ( keyValue[ 0 ] == 'T' ) ? 1 : 0; 678 success = psMetadataAdd( output, PS_LIST_HEAD, keyName, metadataItemType, keyComment, tempBool ); 679 break; 680 case 'U': 754 681 case 'X': 755 682 default: -
trunk/psLib/src/types/psMetadata.c
r1355 r1376 11 11 * @author Ross Harman, MHPCC 12 12 * 13 * @version $Revision: 1. 5$ $Name: not supported by cvs2svn $14 * @date $Date: 2004-0 7-31 00:48:20$13 * @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ 14 * @date $Date: 2004-08-04 20:47:52 $ 15 15 * 16 16 * Copyright 2004 Maui High Performance Computing Center, University of Hawaii … … 32 32 #include "psHash.h" 33 33 #include "psMetadata.h" 34 #include "psString.h" 34 35 35 36 … … 38 39 /******************************************************************************/ 39 40 40 // Maximum metadata length string41 #define MAX_VAL_SIZE 102442 43 41 // Maximum metadata error length 44 42 #define MAX_ERR_MESSAGE_LENGTH 1024 45 43 46 44 // Maximum line size 47 #define MAX_LINE_SIZE 8045 #define FITS_LINE_SIZE 80 48 46 49 47 /******************************************************************************/ … … 80 78 psFree( metadataItem->name ); 81 79 psFree( metadataItem->comment ); 82 83 if ( type == PS_META_STR || type == PS_META_IMG || type == PS_META_JPEG || type == PS_META_PNG || 84 type == PS_META_ASTROM || type == PS_META_UNKNOWN ) { 80 psFree( metadataItem->items ); 81 82 if ( type == PS_META_STR || 83 type == PS_META_IMG || 84 type == PS_META_JPEG || 85 type == PS_META_PNG || 86 type == PS_META_ASTROM || 87 type == PS_META_UNKNOWN ) { 85 88 psFree( metadataItem->data.V ); 86 89 } 87 88 psFree( metadataItem->items );89 90 } 90 91 … … 94 95 return ; 95 96 } 96 97 97 psFree( metadata->list ); 98 98 psFree( metadata->table ); … … 155 155 // Set metadata item value 156 156 switch ( type ) { 157 case PS_META_BOOL: 158 metadataItem->data.B = ( bool ) va_arg( argPtr, int ); 159 break; 157 160 case PS_META_S32: 158 161 metadataItem->data.S32 = va_arg( argPtr, psS32 ); … … 165 168 break; 166 169 case PS_META_STR: 170 metadataItem->data.V = psStringNCopy( va_arg( argPtr, char* ), MAX_STRING_LENGTH ); 171 break; 167 172 case PS_META_IMG: 168 173 case PS_META_JPEG: … … 170 175 case PS_META_ASTROM: 171 176 case PS_META_UNKNOWN: 172 metadataItem->data.V = psMemIncrRefCounter( va_arg( argPtr, psPTR ) );173 break;174 177 default: 175 psError( __func__, " 178 psError( __func__, "Invalid psMetadataType: %d", type ); 176 179 } 177 180 … … 201 204 p_psMemSetDeallocator( metadata, ( psFreeFcn ) metadataFree ); 202 205 203 // Allocate internal containers204 list = ( psList * ) ps Alloc( sizeof( psList ));206 // Allocate metadata's internal containers 207 list = ( psList * ) psListAlloc( NULL ); 205 208 if ( list == NULL ) { 206 209 psAbort( __func__, "Failed to allocate list" ); 207 210 } 208 211 209 table = ( psHash * ) ps Alloc( sizeof( psHash ));212 table = ( psHash * ) psHashAlloc( 10 ); 210 213 if ( table == NULL ) { 211 214 psAbort( __func__, "Failed to allocate table" ); 212 215 } 213 216 217 metadata->list = list; 218 metadata->table = table; 219 214 220 return metadata; 215 221 } … … 308 314 } 309 315 316 // Decrement reference count, since the metadata item is now in metadata collection and no longer needed here 317 psMemDecrRefCounter( metadataItem ); 318 310 319 return true; 311 320 } … … 543 552 544 553 switch ( type ) { 554 case PS_META_BOOL: 555 fprintf( fd, format, metadataItem->data.B ); 556 break; 545 557 case PS_META_S32: 546 558 fprintf( fd, format, metadataItem->data.S32 ); … … 566 578 } 567 579 568 psMetadata *psMetadataReadHeader( psMetadata *output, const char *extname, int extnum, const char *filename )569 {570 /* char line[ MAX_VAL_SIZE ];571 char keyName[ MAX_VAL_SIZE ];572 char keyValue[ MAX_VAL_SIZE ];573 char keyComment[ MAX_VAL_SIZE ];574 int status = 0;575 extnumCtr = 1;576 FILE *fd = NULL;577 578 if ( filename == NULL ) {579 psError( __func__, "Null file name not allowed" );580 return NULL;581 }582 583 if ( extname == NULL && extnum == 0 ) {584 psError( __func__, "Null extname AND extnum = 0 not allowed" );585 return NULL;586 } else if ( extname && extnum ) {587 psError( __func__, "Both extname AND extnum arguments should not have valid values." );588 return NULL;589 }590 591 fd = fopen( filename, "r" );592 if ( fd == NULL ) {593 psError( __func__, "Null FITS file descriptor not allowed" );594 return NULL;595 }596 597 // Allocate metadata if user didn't598 if ( output == NULL ) {599 output = psMetadataAlloc();600 psError( __func__, "Failed to allocate metadata" );601 return NULL;602 }603 604 // Move to user designated HDU number or HDU name in text file. HDU numbers starts at one.605 TODO if(extname == NULL) {606 return output;607 }608 } else if(extnum > 0) {609 return output;610 }611 }612 613 614 line = fgets(line, MAX_LINE_SIZE+1, fp);615 while(line != NULL) {616 617 if(!strncmp("END", line, 3)){618 extnumCtr++;619 }620 621 if(extnumCtr == extnum) {622 623 // Put text into metadata624 if(!strncmp("COMMENT", line, 7)){625 // COMMENT keywords have no "=" sign626 //TODO627 } else if (strchr(line, '\'') != NULL){628 629 // Output and logging keywords have tic (') characters630 keyName = strtok(line, "=");631 keyValue = strtok(NULL, "'");632 keyValue = strtok(NULL, "'");633 keyComment = strtok(NULL, "XXX");634 635 636 } else637 638 // Everything else is considered to be the standard name and value639 keyName = strtok(line, "=");640 keyValue = strtok(NULL, "/");641 keyComment = strtok(NULL, "XXX");642 }643 644 645 }646 647 // Read next line648 line = fgets(line, MAX_LINE_SIZE+1, fp);649 }650 651 */652 return output;653 }654 655 580 psMetadata *psMetadataFReadHeader( psMetadata *output, const char *extname, int extnum, fitsfile *fd ) 656 581 { 582 bool tempBool; 657 583 bool success; 658 584 char keyType; 659 char keyName[ MAX_VAL_SIZE ];660 char keyValue[ MAX_VAL_SIZE ];661 char keyComment[ MAX_VAL_SIZE ];662 char fitsErr[ MAX_ ERR_MESSAGE_LENGTH ];585 char keyName[ FITS_LINE_SIZE ]; 586 char keyValue[ FITS_LINE_SIZE ]; 587 char keyComment[ FITS_LINE_SIZE ]; 588 char fitsErr[ MAX_STRING_LENGTH ]; 663 589 char* tempExtname = NULL; 664 590 int i; … … 666 592 int status = 0; 667 593 int numKeys = 0; 594 int keyNum = 0; 668 595 psMetadataType metadataItemType; 669 596 … … 677 604 return NULL; 678 605 } else if ( extname && extnum ) { 679 psError( __func__, "Both extname AND extnum arguments should not have val id values." );606 psError( __func__, "Both extname AND extnum arguments should not have values." ); 680 607 return NULL; 681 608 } … … 684 611 if ( output == NULL ) { 685 612 output = psMetadataAlloc(); 686 psError( __func__, "Failed to allocate metadata" );687 return NULL;688 613 } 689 614 … … 694 619 psError( __func__, "FITS error while locating header: %s", fitsErr ); 695 620 status = 0; 696 fits_close_file( fd, &status );697 621 return output; 698 622 } 699 623 } else if ( extnum > 0 ) { 700 tempExtname = ( char* ) psAlloc( strlen( extname ) + 1 ); // fits_movnam_hdu doesn't like const part of extname 701 strncpy( tempExtname, extname, MAX_VAL_SIZE ); 624 tempExtname = ( char* ) extname; 702 625 if ( fits_movnam_hdu( fd, ANY_HDU, tempExtname, 0, &status ) != 0 ) { 703 626 fits_get_errstatus( status, fitsErr ); 704 627 psError( __func__, "FITS error while locating header: %s", fitsErr ); 705 628 status = 0; 706 fits_close_file( fd, &status );707 psFree( tempExtname );708 629 return output; 709 630 } 710 psFree( tempExtname );711 631 } 712 632 713 633 // Get number of key names 714 if ( fits_get_hdrpos( fd, &numKeys, NULL, &status ) != 0 ) {634 if ( fits_get_hdrpos( fd, &numKeys, &keyNum, &status ) != 0 ) { 715 635 fits_get_errstatus( status, fitsErr ); 716 636 psError( __func__, "FITS error while reading keys: %s", fitsErr ); 717 637 status = 0; 718 fits_close_file( fd, &status );719 638 return output; 720 639 } … … 726 645 psError( __func__, "FITS error while reading key number %d: %s", i, fitsErr ); 727 646 status = 0; 728 fits_close_file( fd, &status );729 647 return output; 730 648 } 731 732 649 if ( fits_get_keytype( keyValue, &keyType, &status ) != 0 ) { 733 650 fits_get_errstatus( status, fitsErr ); 734 psError( __func__, "FITS error while determining key type: %s", fitsErr ); 735 status = 0; 736 fits_close_file( fd, &status ); 737 return output; 651 if ( status != VALUE_UNDEFINED ) { 652 psError( __func__, "FITS error while determining key type: %s", fitsErr ); 653 status = 0; 654 return output; 655 } else { 656 // Some keywords are still valid even though they don't have a type or value, like COMMENTS 657 keyType = 'C'; 658 status = 0; 659 } 738 660 } 739 661 … … 752 674 break; 753 675 case 'L': 676 metadataItemType = PS_META_BOOL; 677 tempBool = ( keyValue[ 0 ] == 'T' ) ? 1 : 0; 678 success = psMetadataAdd( output, PS_LIST_HEAD, keyName, metadataItemType, keyComment, tempBool ); 679 break; 680 case 'U': 754 681 case 'X': 755 682 default:
Note:
See TracChangeset
for help on using the changeset viewer.
