Changeset 721 in Sophya

Timestamp:

Feb 6, 2000, 4:11:55 PM (26 years ago)

Author:

ansari

Message:

Adaptations aux modifs DVList (comment/var) - Reza 6/2/2000

File:

• trunk/SophyaExt/FitsIOServer/fitsioserver.cc (modified) (12 diffs)

trunk/SophyaExt/FitsIOServer/fitsioserver.cc

@@ -896 +896 @@
   for(it = dvl.Begin(); it != dvl.End(); it++)
     {
-      char keytype= (*it).second.typ;
+      char keytype= (*it).second.elval.typ;
       char keyname[10];
       strncpy(keyname,(*it).first.substr(0,64).c_str(),8);
@@ -905 +905 @@
         case 'I' :
           {
-            int ival=(*it).second.mtv.iv;
+            int ival=(*it).second.elval.mtv.iv;
             strcpy(comment,"I entier");
             fits_write_key(fptr,TINT,keyname,&ival,comment,&status);
@@ -912 +912 @@
         case 'D' :
           {
-            double dval=(*it).second.mtv.dv;
+            double dval=(*it).second.elval.mtv.dv;
             strcpy(comment,"D double");
             fits_write_key(fptr,TDOUBLE,keyname,&dval,comment,&status);
@@ -920 +920 @@
           {
             char strval[128];
-            strncpy(strval,(*it).second.mtv.strv,127);
+            strncpy(strval,(*it).second.elval.mtv.strv,127);
             strcpy(comment,"S character string");
             fits_write_key(fptr,TSTRING,keyname,&strval,comment,&status);
@@ -1280 +1280 @@
   for(it = dvl.Begin(); it != dvl.End(); it++)  
     {
-      int datatype=  key_type_PL2FITS( (*it).second.typ);
+      int datatype=  key_type_PL2FITS( (*it).second.elval.typ);
       // FLEN_KEYWORD est la longueur max d'un mot-cle. Il doit y avoir une 
       // erreur dans la librairie fits qui donne FLEN_KEYWORD=72 
@@ -1293 +1293 @@
         {
         case TINT :
-          ival=(*it).second.mtv.iv;
+          ival=(*it).second.elval.mtv.iv;
           strcpy(comment,"I entier");
 //DBG          cerr << " Writing I " << (string)keyname << " = " << ival << endl;
@@ -1299 +1299 @@
           break;
         case TDOUBLE :
-          dval=(*it).second.mtv.dv;
+          dval=(*it).second.elval.mtv.dv;
           strcpy(comment,"D double");
 //DBG          cerr << " Writing D " << (string)keyname << " = " << dval << endl;
@@ -1305 +1305 @@
           break;
         case TSTRING :
-          strncpy(strval, (*it).second.mtv.strv, 128); strval[127] = '\0';
+          strncpy(strval, (*it).second.elval.mtv.strv, 128); strval[127] = '\0';
           strcpy(comment,"S character string");
 //DBG          cerr << " Writing S " << (string)keyname << " = " << (string)strval << endl;
@@ -1438 +1438 @@
   for(it = dvl.Begin(); it != dvl.End(); it++)  
     {
-      int datatype=  key_type_PL2FITS( (*it).second.typ);
+      int datatype=  key_type_PL2FITS( (*it).second.elval.typ);
       char keyname[16];
       strncpy(keyname, (*it).first.substr(0,64).c_str(),flen_keyword);
@@ -1449 +1449 @@
         {
         case TINT :
-          ival=(*it).second.mtv.iv;
+          ival=(*it).second.elval.mtv.iv;
           strcpy(comment," ");
 //DBG          cerr << " Writing I " << (string)keyname << " = " << ival << endl;
@@ -1455 +1455 @@
           break;
         case TDOUBLE :
-          dval=(*it).second.mtv.dv;
+          dval=(*it).second.elval.mtv.dv;
           strcpy(comment," ");
 //DBG          cerr << " Writing D " << (string)keyname << " = " << dval << endl;
@@ -1461 +1461 @@
           break;
         case TSTRING :
-          strncpy(strval, (*it).second.mtv.strv, 128); strval[127] = '\0';
+          strncpy(strval, (*it).second.elval.mtv.strv, 128); strval[127] = '\0';
           strcpy(comment," ");
 //DBG          cerr << " Writing S " << (string)keyname << " = " << (string)strval << endl;