No comments

diff --git a/src/WOKUtils/WOKUtils_Param.cdl b/src/WOKUtils/WOKUtils_Param.cdl
index 13bece6774e8089d8758e348f0a8c86326de7d10..a0f8c7a929ea0171a0debccccc339b89d137037d 100755 (executable)
--- a/src/WOKUtils/WOKUtils_Param.cdl
+++ b/src/WOKUtils/WOKUtils_Param.cdl
@@ -14,6 +14,7 @@ uses
     HAsciiString            from TCollection,
     API                     from EDL,
     Path                    from WOKUtils,
+    SearchList              from WOKUtils,
     HSequenceOfParamItem    from WOKUtils,
     MapOfHAsciiString       from WOKTools,
     HSequenceOfAsciiString  from TColStd,
@@ -32,6 +33,10 @@ is
     SetSearchDirectories(me:out; aseq : HSequenceOfAsciiString from TColStd);
     SearchDirectories(me) returns HSequenceOfAsciiString from TColStd;
 
+    SetSearchDirectories(me:out; aseq : SearchList from WOKUtils);
+
+    SetBasicVariables ( me : out );
+
     SearchFile(me; afilename : HAsciiString from TCollection) 
        returns Path from WOKUtils;
 

diff --git a/src/WOKUtils/WOKUtils_Param.cxx b/src/WOKUtils/WOKUtils_Param.cxx
index 92776beb0be25ba8fe859d3fc238586a9a274271..ee3ca4225e27a419426515aced9dbc5e3698f3c8 100755 (executable)
--- a/src/WOKUtils/WOKUtils_Param.cxx
+++ b/src/WOKUtils/WOKUtils_Param.cxx
@@ -16,11 +16,12 @@
 
 #include <WOKTools_Messages.hxx>
 #include <WOKUtils_Path.hxx>
-
+#include <WOKUtils_HSequenceOfPath.hxx>
 
 #include <WOKUtils_ParamItem.hxx>
 #include <WOKUtils_HSequenceOfParamItem.hxx>
 
+#include <WOKUtils_SearchList.hxx>
 
 #include <WOKUtils_WOKVersion.hxx>
 
@@ -37,11 +38,25 @@
 //function : WOKUtils_Param
 //purpose  : Simply creates the param
 //=======================================================================
-WOKUtils_Param::WOKUtils_Param()
-{
-  myapi  = new EDL_API;
-  myapi->AddVariable("%WOK_VERSION", WOK_VERSION);
-}
+WOKUtils_Param :: WOKUtils_Param () {
+
+ myapi = new EDL_API ();
+ SetBasicVariables ();
+
+}  // end WOKUtils_Param :: WOKUtils_Param
+
+void WOKUtils_Param :: SetBasicVariables ( void ) {
+
+ myapi -> AddVariable ( "%WOK_VERSION", WOK_VERSION );
+#ifdef WNT
+ myapi -> AddVariable ( "%Station",     "wnt"       );
+#elif defined( SOLARIS )
+ myapi -> AddVariable ( "%Station",     "sun"       );
+#elif defined( LIN )
+ myapi -> AddVariable ( "%Station",     "lin"       );
+#endif  // WNT
+
+}  // end WOKUtils_Param :: SetBasicVariables
 
 //=======================================================================
 //function : Clear
@@ -49,8 +64,8 @@ WOKUtils_Param::WOKUtils_Param()
 //=======================================================================
 void WOKUtils_Param::Clear()
 {
-  myapi = new EDL_API;
-  myapi->AddVariable("%WOK_VERSION", WOK_VERSION);
+  myapi = new EDL_API ();
+  SetBasicVariables ();
   mysubs.Nullify();
 }
 
@@ -72,6 +87,21 @@ void WOKUtils_Param::SetSearchDirectories(const Handle(TColStd_HSequenceOfAsciiS
   return;
 }
 
+void WOKUtils_Param :: SetSearchDirectories (  const Handle( WOKUtils_SearchList )& aList  ) {
+
+ Standard_Integer                   i;
+ Handle( WOKUtils_HSequenceOfPath ) pathList = aList -> List ();
+
+ myapi -> ClearIncludes ();
+
+ for (  i = 1; i <= pathList -> Length (); ++i  )
+
+  myapi -> AddIncludeDirectory (
+            pathList -> Value ( i ) -> Name () -> ToCString ()
+           );
+
+}  // end WOKUtils_Param :: SetSearchDirectories
+
 //=======================================================================
 //Author   : Jean Gautier (jga)
 //function : SearchFile
@@ -446,8 +476,8 @@ Standard_Boolean WOKUtils_Param::LoadFile(const Handle(TCollection_HAsciiString)
     case EDL_FILEOPENED:
     case EDL_FILENOTOPENED:
       if(filemaynotexist) return Standard_True;
-//      ErrorMsg << "WOKUtils_Param::LoadParamClass"
-//            << "File " << afile << " could not be opened" << endm;
+      ErrorMsg << "WOKUtils_Param::LoadParamClass"
+              << "File " << afile << " could not be opened" << endm;
       break;
     case EDL_TOOMANYINCLUDELEVEL:
       ErrorMsg << "WOKUtils_Param::LoadParamClass"

diff --git a/src/WOKUtils/WOKUtils_Param_proto.hxx b/src/WOKUtils/WOKUtils_Param_proto.hxx
index aa4cf2ceb008ae31c479af39370bd913751fc858..565a9ffed74ffc93a22d27e2ed8cb529582854e7 100755 (executable)
--- a/src/WOKUtils/WOKUtils_Param_proto.hxx
+++ b/src/WOKUtils/WOKUtils_Param_proto.hxx
@@ -39,6 +39,9 @@
 #ifndef _Handle_TColStd_HSequenceOfHAsciiString_HeaderFile
 #include <Handle_TColStd_HSequenceOfHAsciiString.hxx>
 #endif
+#ifndef _Handle_WOKUtils_SearchList_HeaderFile
+#include <Handle_WOKUtils_SearchList.hxx>
+#endif
 class EDL_API;
 class TColStd_HSequenceOfAsciiString;
 class Standard_ProgramError;
@@ -63,7 +66,9 @@ public:
  // 
 Standard_EXPORT WOKUtils_Param();
 Standard_EXPORT   void Clear() ;
+Standard_EXPORT   void SetBasicVariables ( void );
 Standard_EXPORT   void SetSearchDirectories(const Handle(TColStd_HSequenceOfAsciiString)& aseq) ;
+Standard_EXPORT   void SetSearchDirectories(const Handle(WOKUtils_SearchList)&);
 Standard_EXPORT   Handle_TColStd_HSequenceOfAsciiString SearchDirectories() const;
 Standard_EXPORT   Handle_WOKUtils_Path SearchFile(const Handle(TCollection_HAsciiString)& afilename) const;
 Standard_EXPORT   void SetSubClasses(const Handle(TColStd_HSequenceOfAsciiString)& aseq) ;
@@ -126,7 +131,7 @@ Handle_TColStd_HSequenceOfAsciiString mysubs;
 
 
 
-// other inline functions and methods (like "C++: function call" methods)
+// other Inline functions and methods (like "C++: function call" methods)
 //