Changeset 11ed08d in tol

Timestamp:

Nov 29, 2012, 11:51:03 AM (14 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

4640d1a

Parents:

bfc7e45

Message:

Now TOL can write old OIS formats to ensure backward compatibility with a window of recent TOL versions

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

Location:

tol/OIS

Files:

• ois.cpp (modified) (1 diff)
• oisapitol.cpp (modified) (6 diffs)
• oiscreator.cpp (modified) (1 diff)
• oisxml.cpp (modified) (3 diffs)
• tol_ois.h (modified) (3 diffs)

tol/OIS/ois.cpp

@@ -43 +43 @@
 #endif
 BText BOis::oisCurrentVersion_ = OIS_VERSION;
+BText BOis::oisWriteVersion_   = OIS_VERSION;
 BText BOis::oisDefRoot_        = "";
 int BOis::def_CLv_ = 9;

tol/OIS/oisapitol.cpp

@@ -44 +44 @@
 
 //--------------------------------------------------------------------
+  static BText& GetOisWriteVersion()
+//--------------------------------------------------------------------
+{
+  static BText txt;
+  txt = BOis::WriteVersion();
+  return(txt);
+};
+
+
+//--------------------------------------------------------------------
   static BText& GetOisDefBSE()
 //--------------------------------------------------------------------
@@ -68 +78 @@
   if(addressStr_) { return(false); }
   oisCurrentVersion_ = OIS_VERSION;
+  oisWriteVersion_ = "02.16";
 
   Std(I2("OIS: implemented version: ",
@@ -113 +124 @@
           I2("OIS version identifier",
              "Identificador de la versión de OIS")
+  );
+  BParamText* OIS_def_WriteVersion_ = new BParamText
+  (
+    "Ois.WriteVersion",
+    oisWriteVersion_,
+    I2("This is useful to write OIS of older versions.",
+       "Es útil para escribir OIS de versiones viejas.")
   );
   BParamText* OIS_DefRoot_ = new BParamText
@@ -192 +210 @@
        "Para cambiar el valor úsese la función Ois.PutDefaultSerialEngine")
   );
-  OIS_def_BSE_->PutConstant();
 
   BParamText* OIS_def_BAE_ = new BParamText
@@ -703 +720 @@
   if(ok) 
   {
-    if(ois.control_.oisEngine_.oisVersion_<BOis::CurrentVersion())
+    if(ois.control_.oisEngine_.oisVersion_<BOis::WriteVersion())
     {
       Warning(I2(BText("OIS: version '")<ois.control_.oisEngine_.oisVersion_+
                  "' of \n  "+ois.Path()+"\n"  
-                 " is previous than currently implemented "<<BOis::CurrentVersion(),
+                 " is previous than minimum currently used "<<BOis::WriteVersion(),
                  BText("OIS: La versión ")<<ois.control_.oisEngine_.oisVersion_+
                  " de \n  "+ois.Path()+"\n"  
-                 " es anterior a la actualmente implementada '"<<BOis::CurrentVersion()+"'"));
+                 " es anterior a la mínima actualmente usada '"<<BOis::WriteVersion()+"'"));
     }
     if(ois.control_.oisEngine_.oisVersion_>BOis::CurrentVersion())
@@ -716 +733 @@
       Error(I2(BText("OIS: version '")>ois.control_.oisEngine_.oisVersion_+
                "' of \n  "+ois.Path()+"\n"  
-               " is later than currently implemented "<<BOis::CurrentVersion(),
+               " is later than maximum currently used "<<BOis::CurrentVersion(),
                BText("OIS: La versión ")<<ois.control_.oisEngine_.oisVersion_+
                " de \n  "+ois.Path()+"\n"  
-               " es posterior a la actualmente implementada '"<<BOis::CurrentVersion()+"'"));
+               " es posterior a la máxima actualmente usada '"<<BOis::CurrentVersion()+"'"));
       ok=false;
     }

tol/OIS/oiscreator.cpp

@@ -152 +152 @@
   control_.oisEngine_.curDir_       = BDir::GetCurrent();
   control_.oisEngine_.release_      = DteNow();
-  control_.oisEngine_.oisVersion_   = oisCurrentVersion_;
+  control_.oisEngine_.oisVersion_   = oisWriteVersion_;
  
   control_.machine_.hostName_       = BSys::HostName();

tol/OIS/oisxml.cpp

@@ -31 +31 @@
 BTraceInit("oisxml.cpp");
 
-
 //--------------------------------------------------------------------
 // OIS writing XML functions 
@@ -68 +67 @@
   header_->Print("<tolRelease>%s</tolRelease>\n",                 control_.tolEngine_.tolRelease_.String());
   header_->Print("<tolUserLang>%s</tolUserLang>\n",               control_.tolEngine_.tolUserLang_.String());
-  header_->Print("<globalRequiredPackages>\n");
-  const BRequiredPackage& grp = BNameBlock::GlobalRequiredPackages();
-  int grp_n = grp.CountRequiredPackage();
-  header_->Print("<entries>%ld</entries>\n",grp_n);
-  for(n=1; n<=grp_n; n++)
-  {
-    header_->Print("<package_%ld>%s</package_%ld>\n",
-                   n, grp.GetRequiredPackageVersion(n-1).String(), n);
-  }
-  header_->Print("</globalRequiredPackages>\n");
+  if(oisWriteVersion_>="02.17")
+  {
+    header_->Print("<globalRequiredPackages>\n");
+    const BRequiredPackage& grp = BNameBlock::GlobalRequiredPackages();
+    int grp_n = grp.CountRequiredPackage();
+    header_->Print("<entries>%ld</entries>\n",grp_n);
+    for(n=1; n<=grp_n; n++)
+    {
+      header_->Print("<package_%ld>%s</package_%ld>\n",
+                     n, grp.GetRequiredPackageVersion(n-1).String(), n);
+    }
+    header_->Print("</globalRequiredPackages>\n");
+  }
   header_->Print("</tolEngine>\n");
 
@@ -539 +541 @@
   XMLEnsure(XMLGetNextTagValue(tag_, value_, "entries")); sscanf(value_,"%d",&m); tolSources_.AllocBuffer(m);
   obsoleteSource_ = false;
-  if(control_.oisEngine_.oisVersion_!=OIS_VERSION)
+  if(control_.oisEngine_.oisVersion_<oisWriteVersion_)
   {
     obsoleteSource_ = true;

tol/OIS/tol_ois.h

@@ -555 +555 @@
   static BText oisCurrentVersion_;
 
+//Default OIS write version method
+  static BText oisWriteVersion_;
+
 //Current OIS default root path
   static BText oisDefRoot_;
@@ -560 +563 @@
 //Default OIS archive method
   static BText oisDefArchive_;
+
 
 //Default date format
@@ -646 +650 @@
   static BArchiveEngine       ArchiveEngine      (const BText& txt);
   static const BText& CurrentVersion() { return(oisCurrentVersion_); }
+  static const BText& WriteVersion() { return(oisWriteVersion_); }
+
   static BText AutoPath(const BText& path);
   static BText PlainPath    (const BText& path);