Changeset ad4a32d in tol

Timestamp:

Jun 17, 2011, 5:45:19 PM (15 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

41d79a3

Parents:

dc4d2e6

Message:

Fixes #1260
Fixing also for Serie, the other virtual type

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

File:

• tol/OIS/oisloader.cpp (modified) (6 diffs)

tol/OIS/oisloader.cpp

@@ -1309 +1309 @@
           ERead(offset, serie_);
           BUserTimeSerie* x = NULL;  
+          List* tree = NULL;
           if(!offset)
           {
@@ -1350 +1351 @@
             if(loadTree)
             {
-              List* tree = ReadTree(serie_);
+              tree = ReadTree(serie_);
               if(!tree) 
               { 
@@ -1363 +1364 @@
                 x->GetDataBuffer() = d;
                 x->PutFirstCache(beginCache);
-                if(!x->GetOisTree())
-                {
-                  x->PutOisTree(tree);
-                }
-                tree->Destroy();
               }
               else 
@@ -1381 +1377 @@
                               "bounded time series "); 
                #endif  
-                if(tree) { tree->Destroy(); }
               }
             }
@@ -1397 +1392 @@
           else                
           { result = x; }
+          if(tree) 
+          {
+            if(result && !result->GetOisTree()) { result->PutOisTree(tree); }
+            tree->Destroy(); 
+          }
         }
         else if(tol_type == BGI_TimeSet) 
@@ -1402 +1402 @@
           BINT64 offset;
           ERead(offset, object_);
-                    if(name=="Cuatrimestral")
-                      printf("");
-
           timeset_->SetPos(offset);
           BDate inf, sup, beginCache, endCache;