Changeset 6b793f6 in tol

Timestamp:

Nov 17, 2010, 5:15:20 PM (16 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

f59c9c6

Parents:

1b6682e

Message:

Fixes #887

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

Location:

tol/OIS

Files:

• oisloader.cpp (modified) (2 diffs)
• tol_oisloader.h (modified) (1 diff)

tol/OIS/oisloader.cpp

@@ -85 +85 @@
     return(NULL);
   }
+}
+
+//--------------------------------------------------------------------
+  BSyntaxObject* BOisLoader::BOffsetObject::ReplaceObject(BSyntaxObject* obj)
+//--------------------------------------------------------------------
+{
+//Std(BText("\nBOisLoader::BOffsetObject::PutObject ")+(int)offset_+",["+(int)obj+"] "+obj->Identify());
+  object_ = obj;
+  obj->PutOisOffset(offset_);
+  return(obj); 
 }
 
@@ -1293 +1303 @@
             object_->SetPos(offset);
             //CALL ReadNextObject
-            BSyntaxObject* r = ReadNextObject(true);
-            if(!r || (r->Grammar()!=GraTimeSet())) 
-            { 
-              return(NullError("FATAL cannot built dating of serie")); 
-            }
-            BUserTimeSet* dating = (BUserTimeSet*)GraTimeSet()->FindOperand(r->Name(), false);
-            if(!dating) { dating = (BUserTimeSet*)r; }
+            BUserTimeSet* dating = NULL;
+            {
+              BINT64 offset_tms = object_->Offset();
+              BSyntaxObject* r = ReadNextObject(false);
+              if(!r || (r->Grammar()!=GraTimeSet())) 
+              { 
+                return(NullError("FATAL cannot built dating of serie")); 
+              }
+              dating = (BUserTimeSet*)GraTimeSet()->FindOperand(r->Name(), false);
+              if(!dating) { dating = (BUserTimeSet*)r; }
+              else if(dating!=r)       
+              { 
+                static BOffsetObject ofob_tms;
+                ofob_tms.PutOffset(offset_tms);
+                int found_tms = readed_.FindSorted(ofob_tms, CompareOffset);
+                readed_[found_tms].ReplaceObject(dating);
+                DESTROY(r);
+              }  
+            }
             BDate first, last, beginCache, endCache;
             ERead(first, serie_);

tol/OIS/tol_oisloader.h

@@ -55 +55 @@
     void PutNullObject() { object_ = NULL; }
     BSyntaxObject* PutObject(BSyntaxObject* obj);
+    BSyntaxObject* ReplaceObject(BSyntaxObject* obj);
     BINT64 Offset() { return(offset_); }
     BSyntaxObject* Object() { return(object_); }