Changeset 2459 in Sophya for trunk/SophyaLib/BaseTools/ppersist.h

Timestamp:

Nov 22, 2003, 6:45:23 PM (22 years ago)

Author:

ansari

Message:

Suite modifications PPersist - en particulier, utilisation des RawInOutStream - Reza 22 Nov 2003

File:

• trunk/SophyaLib/BaseTools/ppersist.h (modified) (6 diffs)

trunk/SophyaLib/BaseTools/ppersist.h

@@ -13 +13 @@
 #include "pexceptions.h"
 #include "gnumd5.h"
+#include "rawstream.h"
 
 
@@ -39 +40 @@
   public:
     virtual           ~PPersist() {}
-// J'ajoute cette fonction pour assurer la compatibilite 
-// avec l'ancien PPersist d'Eros     (Reza 23/04/99)
-    virtual int_4      ClassId() const { return(0); }
 
     void               Write(string const& fn) const;
@@ -116 +114 @@
           PPS_NAMETAG_MARK = 7,     // To have a name tag, position marker in a file
           PPS_POSTAG_MARK = 8,      // Position tag mark + 8 bytes (=stream position)
-          PPS_POSTAG_TABLE = 40,    // Position tag table + 8 bytes (=stream position)
+          PPS_POSTAG_TABLE = 9,     // Position tag table + 8 bytes (=stream position)
           PPS_SIMPLE = 16,          // 16 + number of bytes, up to 8 bytes
           PPS_SIMPLE_ARRAY4 = 32,   // 32 + number of bytes, up to 8 bytes, then 4 bytes of length
@@ -146 +144 @@
     bool   GotoPositionTag(int_8 pos);
     bool   GotoNameTag(string const& name);
-    inline bool   GotoTag(string const& name) { return GotoNameTag(name); }
-    int    NbTags();
-    bool   GotoTagNum(int itag);  // 0..NbTags-1
+    int    NbNameTags(); 
+    bool   GotoNameTagNum(int itag);  // 0..NbTags-1
     string GetTagName(int itag);  // 0..NbTags-1
     string GetTagClassName(int itag);  // 0..NbTags-1
-    vector<string> const &  GetTagNames();  
+    vector<string> const &  GetNameTags();  
+
+    // Saut jusqu'au prochain objet 
+    bool   SkipToNextObject();
 
     // Lecture donnees de base et tableaux de donnees de base
@@ -247 +247 @@
     void   Scan();
 
-    istream* s;
+    RawInOutStream* s;
 
     bool bigEndian;
@@ -342 +342 @@
 
   protected:
-    ostream* s;
+    RawInOutStream* s;
     bool bigEndian;