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

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.cc (modified) (22 diffs)

trunk/SophyaLib/BaseTools/ppersist.cc

@@ -347 +347 @@
 //--
 {
-  if (!s.GotoTag(tag))
+  if (!s.GotoNameTag(tag))
     throw NotFoundExc("PPersist::ReadAtTag  tag not found");
   Read(s);
@@ -401 +401 @@
 //--
 {
-  s = new ifstream(flnm.c_str(),ios::in | IOS_BIN); 
+  s = new RawInFileStream(flnm.c_str());
 
   // Read and check header
@@ -444 +444 @@
   filename = flnm;  // keep the filename
   seqread = true;   // To flag non sequential reads
-  if (scan) Scan();
+  if (scan && s->isSeekable()) Scan();
 }
 
@@ -472 +472 @@
 
   unsigned char ppstype;
-  size_t debut;
-#ifdef STREAMPOS_IS_CLASS
-  debut = s->tellg().offset();
-#else
+  int_8 debut;
   debut = s->tellg();
-#endif
-
-  // Find tag entries at end of file
-  // if (defined(Linux) || defined(Darwin)) &&  defined(__GNUG__) && (__GNUC__ < 3)
-#if defined(__GNUG__) && (__GNUC__ < 3)
-  // There seems to be a bug where seekg with ios::end under Linux  with g++
-  // prior to version gcc 3.1 
-  // The bug seems to be there also with Darwin/MacOSX
-  // So, we use seek with ios::beg
-  s->seekg(0, ios::end);
-  int_8 tagpos = s->tellg() - (sizeof(int_8)+1);
-  s->seekg(tagpos, ios::beg);
-#else
+
   s->seekg(-(sizeof(int_8)+1), ios::end);
-#endif
 
   GetTypeTag(ppstype);
@@ -499 +483 @@
   int_8 pos;
   GetRawI8(pos);
-#if defined(Darwin)
-  // Septembre 2003 - Reza : Pb avec MacOSX 10.2
-  // Sur MacOSX (10.2, g++ 3.1), la lecture du dernier byte du flot cause 
-  // une erreur, et le flot ne se repositionne plus
-  // On ferme le flot et on le rouvre ...
-  delete s;
-  s = new ifstream(FileName().c_str(), ios::in | IOS_BIN); 
-#endif
   if (pos < 0) {  // no tags
     s->seekg(debut);
@@ -536 +512 @@
 
 int
-PInPersist::NbTags()
+PInPersist::NbNameTags()
 {
   return tags.size();
@@ -567 +543 @@
 
 bool
-PInPersist::GotoTagNum(int itag)
+PInPersist::GotoNameTagNum(int itag)
 {
   if (itag<0 || itag >= (int)tags.size()) return false;
@@ -601 +577 @@
 static vector<string> * ret_tag_names = NULL;
 vector<string> const &
-PInPersist::GetTagNames()
+PInPersist::GetNameTags()
 {
 if (ret_tag_names) delete ret_tag_names;
@@ -608 +584 @@
 for(i=tags.begin(); i!=tags.end(); i++) ret_tag_names->push_back((*i).first);
 return(*ret_tag_names);  
+}
+
+bool
+PInPersist::SkipToNextObject()
+{
+  // A FAIRE NOV 2003 - REZA
+  return true;
 }
 
@@ -1087 +1070 @@
 PInPersist::GetObject(AnyDataObj & o, string tagname)
 {
-  GotoTag(tagname);
+  GotoNameTag(tagname);
   GetPPObject(&o);
   return;
@@ -1147 +1130 @@
   unsigned char ppstag=0;
   unsigned char ppst1,ppst2,ppst3,ppst30;
-  uint_8 cpos,fsize;
+  int_8 cpos,fsize;
   uint_8 ui8,cid,oid;
   int_4 i4;
@@ -1158 +1141 @@
 
 
-#ifdef STREAMPOS_IS_CLASS
-  cpos = s->tellg().offset();
-#else
   cpos = s->tellg();
-#endif
   s->seekg(0,ios::end);
-#ifdef STREAMPOS_IS_CLASS
-  fsize = s->tellg().offset();
-#else
   fsize = s->tellg();
-#endif
   s->seekg(cpos,ios::beg);
 
@@ -1178 +1153 @@
 
   while ( (ppstag != PPS_EOF) &&  (cpos < fsize) ) {
-#ifdef STREAMPOS_IS_CLASS
-  cpos = s->tellg().offset();
-#else
-  cpos = s->tellg();
-#endif
+    cpos = s->tellg();
     GetRawUByte(ppstag);
     totntags++;
@@ -1293 +1264 @@
         if (lev > 0)  cout << "<PPS_SIMPLE_ARRAY4> tag at position " << hex << cpos << dec 
                            << " DataType=" << dtype << " NElts= " << i4 << endl;
-        s->seekg((uint_8)dsizeskip*(uint_8)i4, ios::cur);
+        s->seekg((int_8)dsizeskip*(int_8)i4, ios::cur);
         break;
 
@@ -1300 +1271 @@
         if (lev > 0)  cout << "<PPS_SIMPLE_ARRAY8> tag at position " << hex << cpos << dec 
                            << " DataType=" << dtype << " NElts= " << ui8 << endl;
-        s->seekg((uint_8)dsizeskip*ui8, ios::cur);
+        s->seekg((int_8)dsizeskip*ui8, ios::cur);
         break;
       }
@@ -1334 +1305 @@
     // Let's try to read it
     int_8 cpos;
-#ifdef STREAMPOS_IS_CLASS
-    cpos = s->tellg().offset();
-#else
     cpos = s->tellg();
-#endif
     s->seekg(pos);
     PPersist* ppo = ReadObject();
@@ -1359 +1326 @@
   //  cerr << " DBG - PInPersist::KeepOId() " << oid << endl;
   if ((objList.size() > 0) && (objList.find(oid) != objList.end()) ) {
-    //  Ceci ne devrait arriver que si on lit dans le desordre (avec GotoTag)
+    //  Ceci ne devrait arriver que si on lit dans le desordre (avec GotoNameTag)
     //  et pas avec une lecture sequentielle ...   Reza 03/2000
     //  cerr << "PInPersist::KeepOId()/Warning - already present PPS_ObjectId ! " << oid << endl;
@@ -1401 +1368 @@
   pps_OId = 0;
   // Output stream creation
-  s = new ofstream(flnm.c_str(),ios::out | IOS_BIN);  
+  s = new RawOutFileStream(flnm.c_str());
   version = 3;
   // Header
@@ -1426 +1393 @@
   } else {
     int_8 tagPos;
-#ifdef STREAMPOS_IS_CLASS
-    tagPos = s->tellp().offset();
-#else
     tagPos = s->tellp();
-#endif
     for (map<string,int_8>::iterator i = tags.begin(); i != tags.end(); i++) {
       string name = (*i).first;
@@ -1450 +1413 @@
 {
   int_8 tagpos;
-#ifdef STREAMPOS_IS_CLASS
-  tagpos = s->tellp().offset();
-#else
   tagpos = s->tellp();
-#endif
   PutRawByte(PPS_POSTAG_MARK);
   PutI8(tagpos);
@@ -1471 +1430 @@
   // Get current file position
   int_8 tagPos;
-
-  #ifdef STREAMPOS_IS_CLASS
-  tagPos = s->tellp().offset();
-  #else
   tagPos = s->tellp();
-  #endif
 
   tags[name] = tagPos;
@@ -2011 +1965 @@
     objreftag rt;
     rt.ppsoid = id;
-#ifdef STREAMPOS_IS_CLASS
-    rt.ppspos = s->tellp().offset();
-#else
     rt.ppspos = s->tellp();
-#endif
     objList[mid] = rt;
   }