Changeset 1354 in Sophya for trunk/SophyaExt/FitsIOServer

Timestamp:

Dec 15, 2000, 6:58:13 PM (25 years ago)

Author:

lemeur

Message:

methode getStringKeyword

Location:

trunk/SophyaExt/FitsIOServer

Files:

• fitsfile.cc (modified) (5 diffs)
• fitsfile.h (modified) (1 diff)

trunk/SophyaExt/FitsIOServer/fitsfile.cc

@@ -345 +345 @@
 }
 
-bool FitsInFile::hasKeyword(string keyw, int hdunum)
+string FitsInFile::getStringKeyword(int hdunum, string keyw, int& retStatus)
+{
+  string s;
+  retStatus = 0;
+  int status = 0;
+  if (hdunum != hdunum_ )
+    {
+      int hdutype;
+      fits_movabs_hdu(fptr_,hdunum,&hdutype,&status);
+    }
+  
+  char value[FLEN_VALUE];
+  char* keyname= const_cast<char*>(keyw.c_str());
+  fits_read_key_str(fptr_,keyname,value,NULL,&status);
+  if (status == 0)
+    s = string(value);
+  else retStatus = status;
+  if (hdunum != hdunum_ )
+    {
+      int hdutype;
+      if (hdunum_ != 0)
+        fits_movabs_hdu(fptr_,hdunum_,&hdutype,&status);
+      else           fits_movabs_hdu(fptr_,1,&hdutype,&status);
+      
+    }
+  return s;
+}
+bool FitsInFile::hasKeyword(int hdunum, string keyw)
      {
        bool has=false;
@@ -1886 +1913 @@
   char* cvalue = new char[16];
   sprintf(cvalue,"%e",value);
-  //  char* kn = const_cast<char*>(keyname.c_str());
-  //  char* cm = const_cast<char*>(comment.c_str());
   FitsKeyword kw(keyname, string(cvalue), comment);
   mots_cles_.push_back(kw);
@@ -1935 +1960 @@
       {
         status=0;
+        if (status == VALUE_UNDEFINED) cout << "WARNING (FitsKeyword) : undefined keyword value " << endl;
         datatype_=' ';
       }
@@ -1943 +1969 @@
       case 'C':
         {
-          svalue_ = string(val);
+          strip(valk, 'B','\'');
+          svalue_ = string(valk);
             break;
         }
@@ -1953 +1980 @@
       case 'L':
         {
-          //      cout << " ATTENTION : pb a regler avec logical!" << endl;
-          if (value[0] == 'T') ivalue_ = 1;
-          else ivalue_ = 0;
+          bool bb = value.c_str();
+          ivalue_ = (int)bb;
           break;
           }

trunk/SophyaExt/FitsIOServer/fitsfile.h

@@ -135 +135 @@
 
    void  ReadHeader(int hdunum);
-bool hasKeyword(string keyw, int hdunum);
+bool hasKeyword(int hdunum, string keyw);
+string getStringKeyword(int hdunum, string keyname,int& retStatus);
 
   /*! \return a reference on a DVList containing the keywords from FITS file */