Index: Sys/SQLGCWrapper.cls.xml
===================================================================
diff -u -r1074 -r1855
--- Sys/SQLGCWrapper.cls.xml	(.../SQLGCWrapper.cls.xml)	(revision 1074)
+++ Sys/SQLGCWrapper.cls.xml	(.../SQLGCWrapper.cls.xml)	(revision 1855)
@@ -8,39 +8,46 @@
 Connect
 CloseCursor
 Disconnect</Description>
-<IncludeCode>%Const</IncludeCode>
+<IncludeCode>%Const,vhLib.Macro</IncludeCode>
 <Super>%RegisteredObject</Super>
 <ClassDefinitionError>0</ClassDefinitionError>
 
-<Parameter name="DoLogging">
-<Default>0</Default>
-</Parameter>
-
 <Parameter name="DoTransactions">
 <Default>0</Default>
 </Parameter>
 
-<Parameter name="conDSN">
-</Parameter>
+<Property name="DoLogging">
+<Type>%String</Type>
+</Property>
 
-<Parameter name="conPassword">
-</Parameter>
+<Property name="conDSN">
+<Type>%String</Type>
+</Property>
 
-<Parameter name="conUserName">
-</Parameter>
+<Property name="conPassword">
+<Type>%String</Type>
+</Property>
 
-<Parameter name="logFileDir">
-<Default>c:\vhlogs\</Default>
-</Parameter>
+<Property name="conUserName">
+<Type>%String</Type>
+</Property>
 
-<Parameter name="logFileExt">
-<Default>txt</Default>
-</Parameter>
+<Property name="logFileDir">
+<Type>%String</Type>
+<Final>1</Final>
+<Calculated>1</Calculated>
+</Property>
 
-<Parameter name="logFileName">
-<Default>SQLGCLog</Default>
-</Parameter>
+<Property name="logFileName">
+<Type>%String</Type>
+<InitialExpression>"SQLGCLog"</InitialExpression>
+</Property>
 
+<Property name="logFileExt">
+<Type>%String</Type>
+<InitialExpression>"txt"</InitialExpression>
+</Property>
+
 <Property name="AutoShowErrorMsg">
 <Type>%Library.Boolean</Type>
 <InitialExpression>0</InitialExpression>
@@ -107,27 +114,54 @@
 ]]></Implementation>
 </Method>
 
+<Method name="logFileDirGet">
+<Final>1</Final>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+ 
+	quit ##class(TECH.Config.ConfigMgr).Instance().GetString("Sys.SQLGCWrapper_logFileDir")
+]]></Implementation>
+</Method>
+
+<Method name="InitParams">
+<Implementation><![CDATA[
+ set ..conDSN = ##class(TECH.Config.ConfigMgr).Instance().GetString("EWMS.SQLGCWrapper_ConnectionDataSourceName")
+ set ..conUserName = ##class(TECH.Config.ConfigMgr).Instance().GetString("EWMS.SQLGCWrapper_UserName")
+ set ..conUserName = ##class(TECH.Config.ConfigMgr).Instance().GetString("EWMS.SQLGCWrapper_Password")
+ 
+ set ..DoLogging = ##class(TECH.Config.ConfigMgr).Instance().GetBoolean("EWMS.SQLGCWrapper_LoggingEnabled")
+ 
+ set ..logFileName = "EWMS_SQLGCLog"
+ 
+ quit
+]]></Implementation>
+</Method>
+
 <Method name="%OnNew">
 <FormalSpec><![CDATA[&initvalue:%Library.String]]></FormalSpec>
 <ReturnType>%Library.Status</ReturnType>
 <Implementation><![CDATA[
  //Gateway Connection
+ 
+ do ..InitParams()
+
  Set ..SQLGC=##class(%Library.SQLGatewayConnection).%New()
 
  New tmpStatus
  Set tmpStatus=$S(..SQLGC=$$$NULLOREF:$$$ERROR($$$GeneralError,"Kan geen nieuw SQLGatewayConnection object aanmaken."),1:$$$OK)
 
  //File logging
- If ..#DoLogging Do
- . New LF,Index
- . Set Index=0
- . For  Set Index=Index+1, LF=..#logFileDir_..#logFileName_Index_"."_..#logFileExt Quit:('##class(%File).Exists(LF))  Do
- . Set ..FLogFile=##class(%File).%New(LF)
+ If ..DoLogging Do
+ . New LogFile,Index
+ . for  do  Quit:('##class(%File).Exists(LogFile))  hang 0.01
+ . . Set Index=$translate($$$Timestamp($zutil(188)),":- ","")
+ . . Set LogFile=##class(TECH.Files).AppendFile(..logFileDir,..logFileName_Index_"."_..logFileExt) 
+ . Set ..FLogFile=##class(%File).%New(LogFile)
  . If ..FLogFile=$$$NULLOREF Do
- ..  Set ..LastErrorMsg="LogFailed: Kan geen nieuw %File object aanmaken ('"_$G(LF,"filename is missing")_"')."
- ..  Set tmpStatus=$$$ERROR($$$GeneralError,..LastErrorMsg)
+ . .  Set ..LastErrorMsg="LogFailed: Kan geen nieuw %File object aanmaken ('"_$G(LogFile,"filename is missing")_"')."
+ . .  Set tmpStatus=$$$ERROR($$$GeneralError,..LastErrorMsg)
  . Else  Do
- ..  Set tmpStatus=..FLogFile.Open("WSN")
+ . .  Set tmpStatus=..FLogFile.Open("WSN")
  Else  Do
  . Set ..FLogFile=$$$NULLOREF
 
@@ -223,11 +257,11 @@
  If ..Connected Do  Quit 0
  . Set ..LastErrorMsg="Verbinding is reeds gemaakt, gelieve deze eerst te verbreken."
 
- Do ..AddToLog("Connecting to "_..#conDSN_" (UserName: "_..#conUserName_") - "_$zdt($h,2,2))
+ Do ..AddToLog("Connecting to "_..conDSN_" (UserName: "_..conUserName_") - "_$zdt($h,2,2))
 
  ;Connect
  New tmpStatus
- Set tmpStatus=..SQLGC.Connect(..#conDSN,..#conUserName,..#conPassword)
+ Set tmpStatus=..SQLGC.Connect(..conDSN,..conUserName,..conPassword)
 
  If $$$ISERR(tmpStatus) Do  Quit 0
  . Set ..Connected=0
@@ -276,7 +310,7 @@
 
  Do:(..HStmt'=0) ..DropStatement()
 
- Do ..AddToLog("Disconnecting from "_..#conDSN_" - "_$zdt($h,2,2))
+ Do ..AddToLog("Disconnecting from "_..conDSN_" - "_$zdt($h,2,2))
 
  New tmpStatus
  Set tmpStatus=..SQLGC.Disconnect()