Index: /trunk/psLib/src/astronomy/psMetadata.c
===================================================================
--- /trunk/psLib/src/astronomy/psMetadata.c	(revision 1354)
+++ /trunk/psLib/src/astronomy/psMetadata.c	(revision 1355)
@@ -11,6 +11,6 @@
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2004-07-31 00:17:01 $
+*  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2004-07-31 00:48:20 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -568,86 +568,86 @@
 psMetadata *psMetadataReadHeader( psMetadata *output, const char *extname, int extnum, const char *filename )
 {
-    char line[ MAX_VAL_SIZE ];
-    char keyName[ MAX_VAL_SIZE ];
-    char keyValue[ MAX_VAL_SIZE ];
-    char keyComment[ MAX_VAL_SIZE ];
-    int status = 0;
-    extnumCtr = 1;
-    FILE *fd = NULL;
-    
-    if ( filename == NULL ) {
-            psError( __func__, "Null file name not allowed" );
-            return NULL;
-        }
-        
-    if ( extname == NULL && extnum == 0 ) {
-            psError( __func__, "Null extname AND extnum = 0 not allowed" );
-            return NULL;
-        } else if ( extname && extnum ) {
-            psError( __func__, "Both extname AND extnum arguments should not have valid values." );
-            return NULL;
-        }
-        
-    fd = fopen( filename, "r" );
-    if ( fd == NULL ) {
-            psError( __func__, "Null FITS file descriptor not allowed" );
-            return NULL;
-        }
-        
-    // Allocate metadata if user didn't
-    if ( output == NULL ) {
-            output = psMetadataAlloc();
-            psError( __func__, "Failed to allocate metadata" );
-            return NULL;
-        }
-        
-    // Move to user designated HDU number or HDU name in text file. HDU numbers starts at one.
-    /* TODO    if(extname == NULL) {
-                return output;
+    /*    char line[ MAX_VAL_SIZE ];
+        char keyName[ MAX_VAL_SIZE ];
+        char keyValue[ MAX_VAL_SIZE ];
+        char keyComment[ MAX_VAL_SIZE ];
+        int status = 0;
+        extnumCtr = 1;
+        FILE *fd = NULL;
+        
+        if ( filename == NULL ) {
+                psError( __func__, "Null file name not allowed" );
+                return NULL;
             }
-        } else if(extnum > 0) {
-                return output;
+            
+        if ( extname == NULL && extnum == 0 ) {
+                psError( __func__, "Null extname AND extnum = 0 not allowed" );
+                return NULL;
+            } else if ( extname && extnum ) {
+                psError( __func__, "Both extname AND extnum arguments should not have valid values." );
+                return NULL;
             }
-        }
-     
-     
-         line = fgets(line, MAX_LINE_SIZE+1, fp);
-         while(line != NULL) {
-     
-             if(!strncmp("END", line, 3)){
-                 extnumCtr++;
+            
+        fd = fopen( filename, "r" );
+        if ( fd == NULL ) {
+                psError( __func__, "Null FITS file descriptor not allowed" );
+                return NULL;
+            }
+            
+        // Allocate metadata if user didn't
+        if ( output == NULL ) {
+                output = psMetadataAlloc();
+                psError( __func__, "Failed to allocate metadata" );
+                return NULL;
+            }
+            
+        // Move to user designated HDU number or HDU name in text file. HDU numbers starts at one.
+         TODO    if(extname == NULL) {
+                    return output;
+                }
+            } else if(extnum > 0) {
+                    return output;
+                }
+            }
+         
+         
+             line = fgets(line, MAX_LINE_SIZE+1, fp);
+             while(line != NULL) {
+         
+                 if(!strncmp("END", line, 3)){
+                     extnumCtr++;
+                 }
+         
+                 if(extnumCtr == extnum) {
+         
+                     // Put text into metadata
+                     if(!strncmp("COMMENT", line, 7)){
+                         // COMMENT keywords have no "=" sign
+                         //TODO
+                     } else if (strchr(line, '\'') != NULL){
+         
+                         // Output and logging keywords have tic (') characters
+                         keyName = strtok(line, "=");
+                         keyValue = strtok(NULL, "'");
+                         keyValue = strtok(NULL, "'");
+                         keyComment = strtok(NULL, "XXX");
+         
+         
+                     } else
+         
+                         // Everything else is considered to be the standard name and value
+                         keyName = strtok(line, "=");
+                         keyValue = strtok(NULL, "/");
+                         keyComment = strtok(NULL, "XXX");
+                     }
+         
+         
+                 }
+         
+                 // Read next line
+                 line = fgets(line, MAX_LINE_SIZE+1, fp);
              }
-     
-             if(extnumCtr == extnum) {
-     
-                 // Put text into metadata
-                 if(!strncmp("COMMENT", line, 7)){
-                     // COMMENT keywords have no "=" sign
-                     //TODO
-                 } else if (strchr(line, '\'') != NULL){
-     
-                     // Output and logging keywords have tic (') characters
-                     keyName = strtok(line, "=");
-                     keyValue = strtok(NULL, "'");
-                     keyValue = strtok(NULL, "'");
-                     keyComment = strtok(NULL, "XXX");
-     
-     
-                 } else
-     
-                     // Everything else is considered to be the standard name and value
-                     keyName = strtok(line, "=");
-                     keyValue = strtok(NULL, "/");
-                     keyComment = strtok(NULL, "XXX");
-                 }
-     
-     
-             }
-     
-             // Read next line
-             line = fgets(line, MAX_LINE_SIZE+1, fp);
-         }
-     
-    */ 
+         
+        */ 
     return output;
 }
Index: /trunk/psLib/src/collections/psMetadata.c
===================================================================
--- /trunk/psLib/src/collections/psMetadata.c	(revision 1354)
+++ /trunk/psLib/src/collections/psMetadata.c	(revision 1355)
@@ -11,6 +11,6 @@
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2004-07-31 00:17:01 $
+*  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2004-07-31 00:48:20 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -568,86 +568,86 @@
 psMetadata *psMetadataReadHeader( psMetadata *output, const char *extname, int extnum, const char *filename )
 {
-    char line[ MAX_VAL_SIZE ];
-    char keyName[ MAX_VAL_SIZE ];
-    char keyValue[ MAX_VAL_SIZE ];
-    char keyComment[ MAX_VAL_SIZE ];
-    int status = 0;
-    extnumCtr = 1;
-    FILE *fd = NULL;
-    
-    if ( filename == NULL ) {
-            psError( __func__, "Null file name not allowed" );
-            return NULL;
-        }
-        
-    if ( extname == NULL && extnum == 0 ) {
-            psError( __func__, "Null extname AND extnum = 0 not allowed" );
-            return NULL;
-        } else if ( extname && extnum ) {
-            psError( __func__, "Both extname AND extnum arguments should not have valid values." );
-            return NULL;
-        }
-        
-    fd = fopen( filename, "r" );
-    if ( fd == NULL ) {
-            psError( __func__, "Null FITS file descriptor not allowed" );
-            return NULL;
-        }
-        
-    // Allocate metadata if user didn't
-    if ( output == NULL ) {
-            output = psMetadataAlloc();
-            psError( __func__, "Failed to allocate metadata" );
-            return NULL;
-        }
-        
-    // Move to user designated HDU number or HDU name in text file. HDU numbers starts at one.
-    /* TODO    if(extname == NULL) {
-                return output;
+    /*    char line[ MAX_VAL_SIZE ];
+        char keyName[ MAX_VAL_SIZE ];
+        char keyValue[ MAX_VAL_SIZE ];
+        char keyComment[ MAX_VAL_SIZE ];
+        int status = 0;
+        extnumCtr = 1;
+        FILE *fd = NULL;
+        
+        if ( filename == NULL ) {
+                psError( __func__, "Null file name not allowed" );
+                return NULL;
             }
-        } else if(extnum > 0) {
-                return output;
+            
+        if ( extname == NULL && extnum == 0 ) {
+                psError( __func__, "Null extname AND extnum = 0 not allowed" );
+                return NULL;
+            } else if ( extname && extnum ) {
+                psError( __func__, "Both extname AND extnum arguments should not have valid values." );
+                return NULL;
             }
-        }
-     
-     
-         line = fgets(line, MAX_LINE_SIZE+1, fp);
-         while(line != NULL) {
-     
-             if(!strncmp("END", line, 3)){
-                 extnumCtr++;
+            
+        fd = fopen( filename, "r" );
+        if ( fd == NULL ) {
+                psError( __func__, "Null FITS file descriptor not allowed" );
+                return NULL;
+            }
+            
+        // Allocate metadata if user didn't
+        if ( output == NULL ) {
+                output = psMetadataAlloc();
+                psError( __func__, "Failed to allocate metadata" );
+                return NULL;
+            }
+            
+        // Move to user designated HDU number or HDU name in text file. HDU numbers starts at one.
+         TODO    if(extname == NULL) {
+                    return output;
+                }
+            } else if(extnum > 0) {
+                    return output;
+                }
+            }
+         
+         
+             line = fgets(line, MAX_LINE_SIZE+1, fp);
+             while(line != NULL) {
+         
+                 if(!strncmp("END", line, 3)){
+                     extnumCtr++;
+                 }
+         
+                 if(extnumCtr == extnum) {
+         
+                     // Put text into metadata
+                     if(!strncmp("COMMENT", line, 7)){
+                         // COMMENT keywords have no "=" sign
+                         //TODO
+                     } else if (strchr(line, '\'') != NULL){
+         
+                         // Output and logging keywords have tic (') characters
+                         keyName = strtok(line, "=");
+                         keyValue = strtok(NULL, "'");
+                         keyValue = strtok(NULL, "'");
+                         keyComment = strtok(NULL, "XXX");
+         
+         
+                     } else
+         
+                         // Everything else is considered to be the standard name and value
+                         keyName = strtok(line, "=");
+                         keyValue = strtok(NULL, "/");
+                         keyComment = strtok(NULL, "XXX");
+                     }
+         
+         
+                 }
+         
+                 // Read next line
+                 line = fgets(line, MAX_LINE_SIZE+1, fp);
              }
-     
-             if(extnumCtr == extnum) {
-     
-                 // Put text into metadata
-                 if(!strncmp("COMMENT", line, 7)){
-                     // COMMENT keywords have no "=" sign
-                     //TODO
-                 } else if (strchr(line, '\'') != NULL){
-     
-                     // Output and logging keywords have tic (') characters
-                     keyName = strtok(line, "=");
-                     keyValue = strtok(NULL, "'");
-                     keyValue = strtok(NULL, "'");
-                     keyComment = strtok(NULL, "XXX");
-     
-     
-                 } else
-     
-                     // Everything else is considered to be the standard name and value
-                     keyName = strtok(line, "=");
-                     keyValue = strtok(NULL, "/");
-                     keyComment = strtok(NULL, "XXX");
-                 }
-     
-     
-             }
-     
-             // Read next line
-             line = fgets(line, MAX_LINE_SIZE+1, fp);
-         }
-     
-    */ 
+         
+        */ 
     return output;
 }
Index: /trunk/psLib/src/types/psMetadata.c
===================================================================
--- /trunk/psLib/src/types/psMetadata.c	(revision 1354)
+++ /trunk/psLib/src/types/psMetadata.c	(revision 1355)
@@ -11,6 +11,6 @@
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2004-07-31 00:17:01 $
+*  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2004-07-31 00:48:20 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -568,86 +568,86 @@
 psMetadata *psMetadataReadHeader( psMetadata *output, const char *extname, int extnum, const char *filename )
 {
-    char line[ MAX_VAL_SIZE ];
-    char keyName[ MAX_VAL_SIZE ];
-    char keyValue[ MAX_VAL_SIZE ];
-    char keyComment[ MAX_VAL_SIZE ];
-    int status = 0;
-    extnumCtr = 1;
-    FILE *fd = NULL;
-    
-    if ( filename == NULL ) {
-            psError( __func__, "Null file name not allowed" );
-            return NULL;
-        }
-        
-    if ( extname == NULL && extnum == 0 ) {
-            psError( __func__, "Null extname AND extnum = 0 not allowed" );
-            return NULL;
-        } else if ( extname && extnum ) {
-            psError( __func__, "Both extname AND extnum arguments should not have valid values." );
-            return NULL;
-        }
-        
-    fd = fopen( filename, "r" );
-    if ( fd == NULL ) {
-            psError( __func__, "Null FITS file descriptor not allowed" );
-            return NULL;
-        }
-        
-    // Allocate metadata if user didn't
-    if ( output == NULL ) {
-            output = psMetadataAlloc();
-            psError( __func__, "Failed to allocate metadata" );
-            return NULL;
-        }
-        
-    // Move to user designated HDU number or HDU name in text file. HDU numbers starts at one.
-    /* TODO    if(extname == NULL) {
-                return output;
+    /*    char line[ MAX_VAL_SIZE ];
+        char keyName[ MAX_VAL_SIZE ];
+        char keyValue[ MAX_VAL_SIZE ];
+        char keyComment[ MAX_VAL_SIZE ];
+        int status = 0;
+        extnumCtr = 1;
+        FILE *fd = NULL;
+        
+        if ( filename == NULL ) {
+                psError( __func__, "Null file name not allowed" );
+                return NULL;
             }
-        } else if(extnum > 0) {
-                return output;
+            
+        if ( extname == NULL && extnum == 0 ) {
+                psError( __func__, "Null extname AND extnum = 0 not allowed" );
+                return NULL;
+            } else if ( extname && extnum ) {
+                psError( __func__, "Both extname AND extnum arguments should not have valid values." );
+                return NULL;
             }
-        }
-     
-     
-         line = fgets(line, MAX_LINE_SIZE+1, fp);
-         while(line != NULL) {
-     
-             if(!strncmp("END", line, 3)){
-                 extnumCtr++;
+            
+        fd = fopen( filename, "r" );
+        if ( fd == NULL ) {
+                psError( __func__, "Null FITS file descriptor not allowed" );
+                return NULL;
+            }
+            
+        // Allocate metadata if user didn't
+        if ( output == NULL ) {
+                output = psMetadataAlloc();
+                psError( __func__, "Failed to allocate metadata" );
+                return NULL;
+            }
+            
+        // Move to user designated HDU number or HDU name in text file. HDU numbers starts at one.
+         TODO    if(extname == NULL) {
+                    return output;
+                }
+            } else if(extnum > 0) {
+                    return output;
+                }
+            }
+         
+         
+             line = fgets(line, MAX_LINE_SIZE+1, fp);
+             while(line != NULL) {
+         
+                 if(!strncmp("END", line, 3)){
+                     extnumCtr++;
+                 }
+         
+                 if(extnumCtr == extnum) {
+         
+                     // Put text into metadata
+                     if(!strncmp("COMMENT", line, 7)){
+                         // COMMENT keywords have no "=" sign
+                         //TODO
+                     } else if (strchr(line, '\'') != NULL){
+         
+                         // Output and logging keywords have tic (') characters
+                         keyName = strtok(line, "=");
+                         keyValue = strtok(NULL, "'");
+                         keyValue = strtok(NULL, "'");
+                         keyComment = strtok(NULL, "XXX");
+         
+         
+                     } else
+         
+                         // Everything else is considered to be the standard name and value
+                         keyName = strtok(line, "=");
+                         keyValue = strtok(NULL, "/");
+                         keyComment = strtok(NULL, "XXX");
+                     }
+         
+         
+                 }
+         
+                 // Read next line
+                 line = fgets(line, MAX_LINE_SIZE+1, fp);
              }
-     
-             if(extnumCtr == extnum) {
-     
-                 // Put text into metadata
-                 if(!strncmp("COMMENT", line, 7)){
-                     // COMMENT keywords have no "=" sign
-                     //TODO
-                 } else if (strchr(line, '\'') != NULL){
-     
-                     // Output and logging keywords have tic (') characters
-                     keyName = strtok(line, "=");
-                     keyValue = strtok(NULL, "'");
-                     keyValue = strtok(NULL, "'");
-                     keyComment = strtok(NULL, "XXX");
-     
-     
-                 } else
-     
-                     // Everything else is considered to be the standard name and value
-                     keyName = strtok(line, "=");
-                     keyValue = strtok(NULL, "/");
-                     keyComment = strtok(NULL, "XXX");
-                 }
-     
-     
-             }
-     
-             // Read next line
-             line = fgets(line, MAX_LINE_SIZE+1, fp);
-         }
-     
-    */ 
+         
+        */ 
     return output;
 }