Changeset 4006126 in tol

Timestamp:

Nov 7, 2009, 4:24:25 PM (17 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

1941-docker-image-to-test, devel, master

Children:

0020b903

Parents:

e8916d6

Message:

Fixes #777

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@1623 be4846ae-f051-483a-831f-b64e7d08527f

Location:

tol/OIS

Files:

• oiscompress.cpp (modified) (1 diff)
• oiscreator.cpp (modified) (10 diffs)
• oisloader.cpp (modified) (10 diffs)
• tol_ois.h (modified) (1 diff)

tol/OIS/oiscompress.cpp

@@ -350 +350 @@
   }
   return(ok);
-
 };
 

tol/OIS/oiscreator.cpp

@@ -36 +36 @@
 #include <tol/tol_bvmatgra.h>
 #include <tol/tol_bstruct.h>
+#include "tol_ois_macros.h"
 
         
 BTraceInit("oiscreator.cpp");
 
-//#define TRACE_OIS_HIERARCHY
-#ifdef TRACE_OIS_HIERARCHY
-static FILE* logHrchyWrite_ = 
-  fopen((BSys::TolAppData()+"syslog/OisHierarchyLogWrite.log").String(),"w");
-#endif
 
 
@@ -328 +324 @@
 //--------------------------------------------------------------------
 {
-  int sz = v.Size();
-  EWrite(sz,stream);
-  Ensure(Write((const void*)v.String(),1,sz, stream));
+  TRACE_OIS_STREAM("WRITE",stream,"BText", v);
+  int length = v.Length();
+  EWrite(length,stream);
+  Ensure(Write((const void*)v.String(),1,length, stream));
   return(true);
 };
@@ -338 +335 @@
 //--------------------------------------------------------------------
 {
+  TRACE_OIS_STREAM("WRITE",stream,"BDat", BText("")<<v);
   double x = v.Value();
   EWrite(x, stream);
@@ -347 +345 @@
 //--------------------------------------------------------------------
 {
+  TRACE_OIS_STREAM("WRITE",stream,"BComplex", BText("")<<v);
   EWrite(v.X(), stream);
   EWrite(v.Y(), stream);
@@ -356 +355 @@
 //--------------------------------------------------------------------
 {
+  TRACE_OIS_STREAM("WRITE",stream,"BDate", BText("")<<v);
   double h = v.Hash();
   return(Write(h,stream));
@@ -364 +364 @@
 //--------------------------------------------------------------------
 {
+  TRACE_OIS_STREAM("WRITE",stream,"BDat*", BText("")<<s);
   Ensure(Write(buf,sizeof(BDat),s,stream));
   return(true);
@@ -372 +373 @@
 //--------------------------------------------------------------------
 {
+  TRACE_OIS_STREAM("WRITE",stream,"BPol", x.Name());
   int s = x.Size();
   EWrite(s, stream);
@@ -392 +394 @@
 //--------------------------------------------------------------------
 {
-  BMemberOwner::BClassByNameHash::const_iterator iterC;
   int n = 0;
   int s = x.size();
+  TRACE_OIS_STREAM("WRITE",stream,"BMemberOwner", "");
+  BMemberOwner::BClassByNameHash::const_iterator iterC;
   EWrite(s,stream);
   for(iterC=x.begin(); iterC!=x.end(); iterC++, n++)
@@ -407 +410 @@
 //--------------------------------------------------------------------
 {
+  TRACE_OIS_STREAM("WRITE",stream,"BClass", BText("")<<cls.FullName());
   Ensure(Write(cls, *(cls.parentHash_), object_));
   Ensure(Write(cls, *(cls.ascentHash_), object_));
@@ -863 +867 @@
   Ensure(Write(nb.Set()));
   char hasClass = nb.Class()!=NULL;
-  Ensure(Write(hasClass, object_));
+  Ensure(Write(hasClass, set_));
   if(hasClass)
   {
-    Ensure(Write(nb.Class()->FullName(), object_));
+    BText className = nb.Class()->FullName();
+    Ensure(Write(className, set_));
   }
   return(true);

tol/OIS/oisloader.cpp

@@ -41 +41 @@
 #include <tol/tol_bnameblock.h>
 #include <tol/tol_bstruct.h>
+#include "tol_ois_macros.h"
 
 BTraceInit("oisloader.cpp");
 
-
-//#define TRACE_OIS_HIERARCHY
-#ifdef TRACE_OIS_HIERARCHY
-  static FILE* logHrchyRead_ = 
-  fopen((BSys::TolAppData()+"syslog/OisHierarchyLogRead.log").String,"w");
-#endif
 
 //--------------------------------------------------------------------
@@ -261 +256 @@
 //--------------------------------------------------------------------
 {
+  TRACE_OIS_STREAM("READ",stream,"BText", v);
   static char aux_[65536];
-  int sz;
-  ERead(sz,stream);
-  Ensure(Read(aux_,1,sz, stream));
-  aux_[sz]=0; 
-  v.Copy(aux_);
+  if(control_.oisEngine_.oisVersion_<"02.13")
+  {
+    int sz;
+    ERead(sz,stream);
+    Ensure(Read(aux_,1,sz, stream));
+    aux_[sz]=0; 
+    v.Copy(aux_);
+  }
+  else
+  {
+    int length;
+    ERead(length,stream);
+    v.ReallocateBuffer(length+1);
+    v.PutLength(length);
+    Ensure(Read(v.Buffer(),1,length, stream));
+  }
   return(true);
 };
@@ -274 +281 @@
 //--------------------------------------------------------------------
 {
+  TRACE_OIS_STREAM("READ",stream,"BDat", BText("")<<v);
   if(control_.typeSizes_.sizeof_BDat_==sizeof(BDatOld))
   {
@@ -302 +310 @@
 //--------------------------------------------------------------------
 {
+  TRACE_OIS_STREAM("READ",stream,"BComplex", BText("")<<v);
   BDat x, y;
   ERead(x, stream);
@@ -313 +322 @@
 //--------------------------------------------------------------------
 {
+  TRACE_OIS_STREAM("READ",stream,"BDate", BText("")<<v);
   double h;
   ERead(h,stream);
@@ -323 +333 @@
 //--------------------------------------------------------------------
 {
+  TRACE_OIS_STREAM("READ",stream,"BDat*", BText("")<<s);
   if(control_.typeSizes_.sizeof_BDat_==sizeof(BDatOld))
   {
@@ -353 +364 @@
 //--------------------------------------------------------------------
 {
+  TRACE_OIS_STREAM("READ",stream,"BPol", x.Name());
   int s, i;
   bool ok = true;
@@ -396 +408 @@
 //--------------------------------------------------------------------
 {
+  TRACE_OIS_STREAM("READ",stream,"BMemberOwner", "");
   BMemberOwner::BClassByNameHash::const_iterator iterC;
   int n = 0;
@@ -422 +435 @@
 //--------------------------------------------------------------------
 {
+  TRACE_OIS_STREAM("READ",stream,"BClass", BText("")<<cls.FullName());
   BMemberOwner::BClassByNameHash& parents = *cls.parentHash_;
   Ensure(Read(cls,parents,stream));
@@ -1141 +1155 @@
           {
             char hasClass;
-            Ensure(Read(hasClass, object_));
+            if(control_.oisEngine_.oisVersion_>="02.13")
+            {
+              Ensure(Read(hasClass, set_));
+            }
+            else
+            {
+              Ensure(Read(hasClass, object_));
+            }
             if(hasClass)
             {
               BText className;
-              Ensure(Read(className, object_));
+              if(control_.oisEngine_.oisVersion_>="02.13")
+              {
+                Ensure(Read(className, set_));
+              }
+              else
+              {
+                Ensure(Read(className, object_));
+              }
               if(control_.oisEngine_.oisVersion_<"02.09")
               {

tol/OIS/tol_ois.h

@@ -39 +39 @@
 //read old OIS files. This will be called a hard change. Then a
 //traslation utility will be available.
-#define OIS_VERSION "02.12"
+#define OIS_VERSION "02.13"
 
 #define OIS_Load_Mode_Header          0