Changeset 39d3b97 in tol

Timestamp:

Apr 2, 2012, 5:32:57 PM (15 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

5ee15b9

Parents:

a29d0d06

Message:

Refs #1497

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

Location:

tol/OIS

Files:

• oisloader.cpp (modified) (1 diff)
• oisxml.cpp (modified) (3 diffs)
• tol_ois.h (modified) (2 diffs)

tol/OIS/oisloader.cpp

@@ -1684 +1684 @@
   return(ok);
 }
-
+/*
+//--------------------------------------------------------------------
+  bool BOisLoader::LoadHeader(BSet& info)
+//--------------------------------------------------------------------
+{
+  info.PrepareStore(10);
+  BSet xmlParam;
+  BSet control;
+  BSet options;
+  BSet address;
+  BSet doc;
+  BSet TOLEnvironment;
+  BSet TOLDependencies;
+  BSet RequiredPackages;
+  BSet statistics;
+}
+*/
 //--------------------------------------------------------------------
   bool BOisLoader::Close()

tol/OIS/oisxml.cpp

@@ -68 +68 @@
   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");
   header_->Print("</tolEngine>\n");
 
@@ -242 +252 @@
   header_->Print("</filestats>\n");
   header_->Print("</statistics>\n");
-
   header_->Print("</header>\n");
   header_->Flush();
@@ -374 +383 @@
   XMLEnsure(XMLGetNextTagValue(tag_, value_, "tolRelease" )); control_.tolEngine_.tolRelease_   = value_;
   XMLEnsure(XMLGetNextTagValue(tag_, value_, "tolUserLang")); control_.tolEngine_.tolUserLang_  = value_;
+  if(control_.oisEngine_.oisVersion_>="02.17")
+  {
+    XMLEnsure(XMLGetNextTagTitle(tag_, "globalRequiredPackages"));
+    XMLEnsure(XMLGetNextTagValue(tag_, value_, "entries")); sscanf(value_,"%d",&m); 
+    control_.tolEngine_.globalPackages_.AllocBuffer(m);
+    for(n=0; n<m; n++)
+    {
+      BText fn = BText("package_")+(n+1);
+      XMLEnsure(XMLGetNextTagValue(tag_, value_, fn)); control_.tolEngine_.globalPackages_[n] = value_;
+    }
+    XMLEnsure(XMLEnsureEndTag("globalRequiredPackages"));
+  }
+
   XMLEnsure(XMLEnsureEndTag   ("tolEngine"));
   if(control_.oisEngine_.oisVersion_>="02.02")

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.16"
+#define OIS_VERSION "02.17"
 
 #define OIS_Load_Mode_Header          0 
@@ -159 +159 @@
       BText tolRelease_;         //TOL release date and time
       BText tolUserLang_;        //TOL user language
+      BArray<BText> globalPackages_;
       TolEngine() 
       : cppCompiler_(), 
         tolVersion_(), 
         tolRelease_(), 
-        tolUserLang_() 
+        tolUserLang_(),
+        globalPackages_() 
       {}
       ~TolEngine() {}