Changeset 1082 in Sophya for trunk/SophyaExt/FitsIOServer

Timestamp:

Jul 24, 2000, 2:51:50 PM (25 years ago)

Author:

ansari

Message:

Adaptation modifs MuTyV - Reza 24/7/2000

Location:

trunk/SophyaExt/FitsIOServer

Files:

• fitsfile.cc (modified) (3 diffs)
• fitsioserver.cc (modified) (9 diffs)

trunk/SophyaExt/FitsIOServer/fitsfile.cc

@@ -903 +903 @@
         case 'I' :
           {
-            int ival=(*it).second.elval.mtv.iv;
+            int ival=(*it).second.elval.iv;
             strncpy(comment,(*it).second.elcomm.c_str(),FLEN_COMMENT );
             fits_write_key(fptr_,TINT,keyname,&ival,comment,&status);
@@ -910 +910 @@
         case 'D' :
           {
-            double dval=(*it).second.elval.mtv.dv;
+            double dval=(*it).second.elval.dv;
             strncpy(comment,(*it).second.elcomm.c_str(),FLEN_COMMENT );
             fits_write_key(fptr_,TDOUBLE,keyname,&dval,comment,&status);
@@ -918 +918 @@
           {
             char strval[128];
-            strncpy(strval,(*it).second.elval.mtv.strv,127);
+            strncpy(strval,(*it).second.elval.strv->c_str(),127);
             strncpy(comment,(*it).second.elcomm.c_str(),FLEN_COMMENT );
             fits_write_key(fptr_,TSTRING,keyname,&strval,comment,&status);

trunk/SophyaExt/FitsIOServer/fitsioserver.cc

@@ -996 +996 @@
         case 'I' :
           {
-            int ival=(*it).second.elval.mtv.iv;
+            int ival=(*it).second.elval.iv;
             strcpy(comment,"I entier");
             fits_write_key(fptr,TINT,keyname,&ival,comment,&status);
@@ -1003 +1003 @@
         case 'D' :
           {
-            double dval=(*it).second.elval.mtv.dv;
+            double dval=(*it).second.elval.dv;
             strcpy(comment,"D double");
             fits_write_key(fptr,TDOUBLE,keyname,&dval,comment,&status);
@@ -1011 +1011 @@
           {
             char strval[128];
-            strncpy(strval,(*it).second.elval.mtv.strv,127);
+            strncpy(strval,(*it).second.elval.strv->c_str(),127);
             strcpy(comment,"S character string");
             fits_write_key(fptr,TSTRING,keyname,&strval,comment,&status);
@@ -1407 +1407 @@
         {
         case TINT :
-          ival=(*it).second.elval.mtv.iv;
+          ival=(*it).second.elval.iv;
           strcpy(comment,"I entier");
 //DBG          cerr << " Writing I " << (string)keyname << " = " << ival << endl;
@@ -1413 +1413 @@
           break;
         case TDOUBLE :
-          dval=(*it).second.elval.mtv.dv;
+          dval=(*it).second.elval.dv;
           strcpy(comment,"D double");
 //DBG          cerr << " Writing D " << (string)keyname << " = " << dval << endl;
@@ -1419 +1419 @@
           break;
         case TSTRING :
-          strncpy(strval, (*it).second.elval.mtv.strv, 128); strval[127] = '\0';
+          strncpy(strval, (*it).second.elval.strv->c_str(), 128); strval[127] = '\0';
           strcpy(comment,"S character string");
 //DBG          cerr << " Writing S " << (string)keyname << " = " << (string)strval << endl;
@@ -1598 +1598 @@
         {
         case TINT :
-          ival=(*it).second.elval.mtv.iv;
+          ival=(*it).second.elval.iv;
           strcpy(comment," ");
 //DBG          cerr << " Writing I " << (string)keyname << " = " << ival << endl;
@@ -1604 +1604 @@
           break;
         case TDOUBLE :
-          dval=(*it).second.elval.mtv.dv;
+          dval=(*it).second.elval.dv;
           strcpy(comment," ");
 //DBG          cerr << " Writing D " << (string)keyname << " = " << dval << endl;
@@ -1610 +1610 @@
           break;
         case TSTRING :
-          strncpy(strval, (*it).second.elval.mtv.strv, 128); strval[127] = '\0';
+          strncpy(strval, (*it).second.elval.strv->c_str(), 128); strval[127] = '\0';
           strcpy(comment," ");
 //DBG          cerr << " Writing S " << (string)keyname << " = " << (string)strval << endl;