Index: WS/Prod/OptiBox/OptimizerServer.cls.xml
===================================================================
diff -u -r734 -r995
--- WS/Prod/OptiBox/OptimizerServer.cls.xml	(.../OptimizerServer.cls.xml)	(revision 734)
+++ WS/Prod/OptiBox/OptimizerServer.cls.xml	(.../OptimizerServer.cls.xml)	(revision 995)
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Export generator="Cache" version="9" zv="Cache for Windows NT (Intel/P4) 5.0.21 (Build 6408)" ts="2011-01-27 17:01:14">
+<Export generator="Cache" version="9" zv="Cache for Windows NT (Intel/P4) 5.0.21 (Build 6408)" ts="2011-04-05 12:40:02">
 <Class name="WS.Prod.OptiBox.OptimizerServer">
 <Description><![CDATA[
 <b>OptiBox : Box cutting optimization</b>
 <br>The methods gets called from the Optimizer (server) to the Caché clients]]></Description>
 <IncludeCode>BL.Prod.OptiBox,BL.Sys.Toegang,BL.Sys.Proxy</IncludeCode>
 <ProcedureBlock>1</ProcedureBlock>
 <Super>%SOAP.WebService</Super>
-<TimeChanged>61042,41969.141128</TimeChanged>
+<TimeChanged>62186,45607.676235</TimeChanged>
 <TimeCreated>60207,60267.626363</TimeCreated>
 <ClassDefinitionError>0</ClassDefinitionError>
 
@@ -18,7 +18,7 @@
 <Parameter name="LOCATION">
 <Description>
 URL for invoking the WebService.</Description>
-<Default>http://cache01.vanhoecke.be/vhintra</Default>
+<Default>http://cache02.vanhoecke.be/vhintra</Default>
 </Parameter>
 
 <Parameter name="SERVICENAME">
@@ -31,6 +31,16 @@
 <Default>http://vhintra.vanhoecke.be</Default>
 </Parameter>
 
+<Parameter name="OptiboxSmallAddr">
+<Description>
+IP-address van Optibox die MachineEvents mag versturen</Description>
+<Default>192.168.1.170</Default>
+</Parameter>
+
+<Parameter name="OptiboxBigAddr">
+<Default>192.168.1.38</Default>
+</Parameter>
+
 <UDLText name="T">
 <Content><![CDATA[
 // Testing if the server is ready
@@ -43,8 +53,9 @@
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
 	$$$DebugIP
-	;Do WL^vhDBG("Are your alive req. received from the optimizer")
-	$$$LastLogCreate("I",,,,"AreYouAlive from Optimizer",,"")
+	;Do WLIP^vhDBG(15,..GetServerName()_" : are your alive req. received from the optimizer")
+	$$$LastLogCreate("I","",,,"AreYouAlive from Optimizer",,"")
+	Do ##class(DS.Prod.OptiBox.MachineStatus).SetAlive(..GetServerName())
 	Quit 1
 ]]></Implementation>
 </Method>
@@ -56,6 +67,7 @@
 	$$$WebServiceTrap
 	$$$DebugIP
 	;D WL^vhDBG("webmethod : CardboardsLoaded SINGLE","B-Green")
+
 	;Do WX^vhDBG(CardboardLoaded,1) 
 	$$$LastLogCreate("I","M",,,"CardboardLoaded",,CardboardLoaded)
 	Do ##class(BL.Prod.OptiBox.Diverse).%New().ModifyCardboardLoaded(CardboardLoaded)
@@ -73,9 +85,9 @@
 	$$$WebServiceTrap
 	;
 	$$$DebugIP
-	D WL^vhDBG("webmethod : Optimization result","B-Blue")
-	Do WX^vhDBG(OptiRes,1) 
-	$$$LastLogCreate("I","O",,,"OptimizationResult",,OptiRes)
+	;D WL^vhDBG("webmethod : Optimization result","B-Blue")
+	;Do WX^vhDBG(OptiRes,1) 
+	$$$LastLogCreate("I","C",,,"OptimizationResult",,OptiRes)
 	Do ##class(BL.Prod.OptiBox.Optimize).Instantiate()
 	Do %blProdOptiBoxOptimize.ProcessOptiResult(OptiRes)
 	Quit
@@ -95,8 +107,10 @@
 <Implementation><![CDATA[
 	$$$WebServiceTrap
 	$$$DebugIP
-	D WL^vhDBG("webmethod : Cutting result","B-Blue")
-	Do WX^vhDBG(CutRes,1) 
+	
+	;D WL^vhDBG("webmethod : Cutting result","B-Blue")
+	;Do:$$$debugHide'[$P(CutRes.Reference,".") WX^vhDBG(CutRes,1) 
+	
 	$$$LastLogCreate("I","S",,,"CuttingResult",,CutRes)
 	Do ##class(BL.Prod.OptiBox.Snijden).Instantiate()
 	Do %blProdOptiBoxSnijden.ProcessSnijResult(CutRes)
@@ -119,15 +133,28 @@
 <Implementation><![CDATA[
 	$$$WebServiceTrap
 	$$$DebugIP
-	;D WL^vhDBG("webmethod : EventNotification","B-Green")
-
 	Quit:Status=""
 	Quit:'$isObject(Status)
+	Set Status.ServerName=..GetServerName()
+	;D WLIP^vhDBG(15,"webmethod : EventNotification 2"_..GetServerName(),"B-Green")
+	$$$LastLogCreate("I","E",,,"Event "_Status.Type,,Status)
+	
+	If Status.Type="MACHINE" Do
+	. Do ##class(BL.Prod.OptiBox.Diverse).ChangeMachineStatus(Status)
 
-	$$$LastLogCreate("I","E",,,"EventNotification",,Status)
 	Quit
 ]]></Implementation>
 </Method>
+
+<Method name="GetServerName">
+<ReturnType>BL.Prod.OptiBox.enu.OptiServer</ReturnType>
+<Implementation><![CDATA[
+	Set RemoteAddr=$S($isObject($G(%request)):$G(%request.CgiEnvs("REMOTE_ADDR")),1:"")
+	Set:RemoteAddr=..#OptiboxSmallAddr OptimizerServer=##class(BL.Prod.OptiBox.enu.OptiServer).SmallEnCuts()
+	Set:RemoteAddr=..#OptiboxBigAddr OptimizerServer=##class(BL.Prod.OptiBox.enu.OptiServer).Big()
+	Quit $G(OptimizerServer)
+]]></Implementation>
+</Method>
 </Class>
-<Checksum value="4288196522"/>
+<Checksum value="4014894115"/>
 </Export>