Changeset 1183 in Sophya

Timestamp:

Sep 11, 2000, 4:52:35 PM (25 years ago)

Author:

ansari

Message:

revu l'ouverture des fichiers

Location:

trunk/SophyaExt/FitsIOServer

Files:

• fitsfile.cc (modified) (8 diffs)
• fitsfile.h (modified) (3 diffs)

trunk/SophyaExt/FitsIOServer/fitsfile.cc

@@ -21 +21 @@
 
 
-void FitsIOHandler::Write(char flnm[], bool OldFile) 
-
-{
-
-  FitsOutFile of(flnm, OldFile);
+void FitsIOHandler::Write(char flnm[], string WriteMode) 
+
+{
+
+  FitsOutFile of(flnm,  WriteMode);
   Write(of);
 }
@@ -783 +783 @@
 
       strncpy(keyname,card,LEN_KEYWORD-1);
-      
       if(strncmp(keyname,comkey,LEN_KEYWORD-1) != 0 && strlen(keyname) != 0 
          && strlen(strval) != 0)
@@ -831 +830 @@
 }
 
-FitsOutFile::FitsOutFile(char flnm[], bool OldFile)
+FitsOutFile::FitsOutFile(char flnm[], string WriteMode)
 {
 
@@ -838 +837 @@
 
   // create new FITS file
-  if (!OldFile)
-    {
-      fits_create_file(&fptr_,flnm,&status);
-      if( status ) printerror(status,"file already exists");
-    }
-  else
-    {
-      fits_open_file(&fptr_,flnm,READWRITE,&status);
-      if( status ) printerror(status,"file does not exist");
-      fits_get_num_hdus(fptr_, &hdunum_, &status);
-      int hdutype;
-      fits_movabs_hdu(fptr_,hdunum_,&hdutype,&status);
-      if( status ) printerror( status,":FitsFile::WriteF : erreur movabs");
-
-    }
-
+
+  fits_create_file(&fptr_,flnm,&status);
+  if( status )
+    {
+      // si on veut ecrire a la fin de ce fichier
+      if (WriteMode == string("append"))
+        {
+          status = 0;
+          fits_open_file(&fptr_,flnm,READWRITE,&status);
+          if( status )
+            {
+              cout << " error opening file: " << flnm << endl;
+              printerror(status, "failure opening a file supposed to exist");
+            }
+          else cout << " file " << flnm << " opened, new objects will be appended " << endl;
+          fits_get_num_hdus(fptr_, &hdunum_, &status);
+          int hdutype;
+          fits_movabs_hdu(fptr_,hdunum_,&hdutype,&status);
+          if( status ) printerror( status,":FitsFile::WriteF : erreur movabs");
+        }
+      else 
+        if (WriteMode == string("clear")) 
+          {
+            status = 0;
+            char* newname = new char[strlen(flnm)+1];
+            //
+            newname[0] = '!';
+            newname[1] = '\0';
+            strcat(newname, flnm);
+            fits_create_file(&fptr_,newname,&status);
+            if (status)
+              {
+                cout << " error opening file: " << flnm << endl;
+                printerror(status, "unable to open file, supposed to exist");
+              }
+            else  cout << " file " << flnm << " will be overwrited " << endl;
+              
+          }
+        else 
+          if  (WriteMode == string("unknown")) printerror(status, " file seems already to exist");
+
+          else  printerror(status, "open file failed");
+      
+    }
 }
 
@@ -1151 +1178 @@
       char keyname[10];
       strncpy(keyname,(*it).first.substr(0,64).c_str(),10);
+      string key(keyname);
       char comment[FLEN_COMMENT];
       char strval[FLEN_VALUE]= "";
@@ -1157 +1185 @@
       if (status != 0 || strncmp(keyname,comkey,LEN_KEYWORD-1) == 0 ) 
         {
+          string coco = dvl.GetComment(key);
+          coco.copy( comment, FLEN_COMMENT-1);
+          int bout = (coco.length() < FLEN_COMMENT) ? coco.length() : FLEN_COMMENT-1;
+          comment[bout]= '\0';
           status = 0;
           switch (keytype)
@@ -1162 +1194 @@
             case 'I' :
               {
-                int ival=(*it).second.elval.iv;
-                strncpy(comment,(*it).second.elcomm.c_str(),FLEN_COMMENT );
-                fits_write_key(fptr_,TINT,keyname,&ival,comment,&status);
+                int ival = (int)dvl.GetI(key);
+                fits_write_key(fptr_,TINT,keyname,&ival, comment,&status);
                 break;
               }
             case 'D' :
               {
-                double dval=(*it).second.elval.dv;
-                strncpy(comment,(*it).second.elcomm.c_str(),FLEN_COMMENT );
+                double dval= (double)dvl.GetD(key);
                 fits_write_key(fptr_,TDOUBLE,keyname,&dval,comment,&status);
                 break;
@@ -1176 +1206 @@
             case 'S' :
               {
-                char strval[128];
-                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);
+                char strvaleur[FLEN_VALUE]= "";
+                string valChaine = dvl.GetS(key);
+                valChaine.copy(strvaleur, FLEN_VALUE-1);
+                int fin =  (valChaine.length() < FLEN_VALUE) ? valChaine.length() : FLEN_VALUE-1;
+                strvaleur[fin]= '\0';
+
+                fits_write_key(fptr_,TSTRING,keyname,&strvaleur,comment,&status);
                 break;
               }

trunk/SophyaExt/FitsIOServer/fitsfile.h

@@ -68 +68 @@
 this method is called from inherited objects : 
 
-for writing a new object in a new fits-extension, at the end of 
+for writing a new object in a new fits-extension :
+
+???
+
+ at the end of 
 
 the existing file (flnm), if OldFile=true. 
@@ -84 +88 @@
 calls the method 'WriteToFits' from the inherited  object
 
+\param <WriteMode>  string , WriteMode = "clear" -> if alreadyy exists, the file will be overwrited (else created) ; WriteMode = "append" -> further objects will be appended to the file if it exists (else : file created). Otherwise, file created if does not exist, else : exception. (the last situation is the default)
+
+
 */ 
-  void   Write(char flnm[], bool OldFile=false) ;
+  void   Write(char flnm[], string WriteMode= string("unknown")) ;
 
   /*!
@@ -352 +359 @@
  public:
    FitsOutFile();
-   FitsOutFile(char flnm[], bool OldFile=false);
+   FitsOutFile(char flnm[], string WriteMode= string("unknown"));
    ~FitsOutFile() { ;};
    inline void InitNull() {imageOnPrimary_=false;}