Index: APPS/PM/OL/ZoektermLogItem.cls.xml
===================================================================
diff -u -r1073 -r1313
--- APPS/PM/OL/ZoektermLogItem.cls.xml	(.../ZoektermLogItem.cls.xml)	(revision 1073)
+++ APPS/PM/OL/ZoektermLogItem.cls.xml	(.../ZoektermLogItem.cls.xml)	(revision 1313)
@@ -34,8 +34,7 @@
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
-	
-	Set ..Identifier = $$$Server_"_"_$$$NSpace_"_"_..GetUniqueNr()
+	Set ..Identifier = ..GetUniqueNr()
 	Set ..Zoekterm = Zoekterm
 	Set ..IsHerkendAlsAlias = IsHerkendAlsAlias
 	Set ..Tijd = $zdt(Tijd,3)
@@ -47,20 +46,20 @@
 <Private>1</Private>
 <ReturnType>%Integer</ReturnType>
 <Implementation><![CDATA[
-	Lock +^APPS.PM.OL.ZoektermLogItemD
-	set result = $increment(^APPS.PM.OL.ZoektermLogItemD)
-	Lock -^APPS.PM.OL.ZoektermLogItemD 
+	Lock +^Log.PM.OL.ZoektermLogItemD
+	set result = $increment(^Log.PM.OL.ZoektermLogItemD)
+	Lock -^Log.PM.OL.ZoektermLogItemD 
 	quit result
 ]]></Implementation>
 </Method>
 
 <Storage name="Default">
 <Type>%Library.CacheStorage</Type>
-<DataLocation>^APPS.PM.OL.ZoektermLogItemD</DataLocation>
+<DataLocation>^Log.PM.OL.ZoektermLogItemD</DataLocation>
 <DefaultData>ZoektermLogItemDefaultData</DefaultData>
-<IdLocation>^APPS.PM.OL.ZoektermLogItemD</IdLocation>
-<IndexLocation>^APPS.PM.OL.ZoektermLogItemI</IndexLocation>
-<StreamLocation>^APPS.PM.OL.ZoektermLogItemS</StreamLocation>
+<IdLocation>^Log.PM.OL.ZoektermLogItemD</IdLocation>
+<IndexLocation>^Log.PM.OL.ZoektermLogItemI</IndexLocation>
+<StreamLocation>^Log.PM.OL.ZoektermLogItemS</StreamLocation>
 <Data name="ZoektermLogItemDefaultData">
 <Value name="1">
 <Value>%%CLASSNAME</Value>
Index: vhDeploy/Deploy201105260848.cls.xml
===================================================================
diff -u
--- vhDeploy/Deploy201105260848.cls.xml	(revision 0)
+++ vhDeploy/Deploy201105260848.cls.xml	(revision 1313)
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="9">
+<Class name="vhDeploy.Deploy201105260848">
+<Description>
+JCL + 2011-05-26</Description>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>svn.Deploy</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
+
+<Method name="ExecCode">
+<ClassMethod>1</ClassMethod>
+<Implementation><![CDATA[
+	write "Verplaatsen van logging data naar nieuwe globals",!
+	
+	if $data(^APPS.PM.OL.ZoektermLogItemD) {
+		set ^LOG.PM.OL.ZoektermLogItemD = ^APPS.PM.OL.ZoektermLogItemD+1000
+		set idx=""
+		for  { set idx=$order(^APPS.PM.OL.ZoektermLogItemD(idx)) quit:idx=""
+			merge ^LOG.PM.OL.ZoektermLogItemD(idx)=^APPS.PM.OL.ZoektermLogItemD(idx)
+		}
+		kill ^APPS.PM.OL.ZoektermLogItemD
+	
+		do ##class(APPS.PM.OL.ZoektermLogItem).%BuildIndices()
+	
+	}
+	
+	if $data(^vhLib.LoggingD) {
+		merge ^LOG.vhLib.LoggingD=^vhLib.LoggingD
+		merge ^LOG.vhLib.LoggingI=^vhLib.LoggingI
+		merge ^LOG.vhLib.LoggingS=^vhLib.LoggingS
+		
+		do ##class(vhLib.Logging).%BuildIndices()
+		
+		kill ^vhLib.LoggingD
+		kill ^vhLib.LoggingI
+		kill ^vhLib.LoggingS
+	}
+]]></Implementation>
+</Method>
+</Class>
+</Export>
Index: vhLib/Logging.cls.xml
===================================================================
diff -u -r1074 -r1313
--- vhLib/Logging.cls.xml	(.../Logging.cls.xml)	(revision 1074)
+++ vhLib/Logging.cls.xml	(.../Logging.cls.xml)	(revision 1313)
@@ -104,13 +104,6 @@
 <Unique>1</Unique>
 </Index>
 
-<UDLText name="T">
-<Content><![CDATA[
-//Index PrimKey On ( Datum, SubID ) [ IdKey, PrimaryKey, Unique ];
-
-]]></Content>
-</UDLText>
-
 <Index name="IndexOnServer">
 <Properties>Server</Properties>
 </Index>
@@ -143,31 +136,10 @@
 <Properties>SubID</Properties>
 </Index>
 
-<UDLText name="T">
-<Content><![CDATA[
-//Method AAACompilerFirst() moet eerst staan in alfabetische lijst, want moet als eerste gecompileerd worden!
-
-]]></Content>
-</UDLText>
-
 <Method name="AAACompilerFirst">
 <ClassMethod>1</ClassMethod>
 <CodeMode>objectgenerator</CodeMode>
-<Implementation><![CDATA[
-	/*Do %code.WriteLine("#define StorageGlobal(%v)  ^vhLib.LoggingD(..MainIndex,%v) ") 
-	Quit $$$OK
-	
-    if %class.Name = "vhLib.Logging" do  quit $$$OK
-    . Do %code.WriteLine("#define StorageGlobal(%v)  ^vhLib.LoggingD(..MainIndex,%v) ") 
-	
-		; Generate a Macro definition for the class storage Global name
-    SET sc=##class(vhLib.Compile).GetGlobalName(%class.Name,.GlobalName)   ; $$acfGetGlobalName(.GlobalName)
-	QUIT:($G(GlobalName)="") sc
-    DO ##class(vhLib.Compile).GeneratorDefineMacro("StorageGlobal",GlobalName)   ; generate: #define StorageGlobal   "_GlobalName
-	DO %code.WriteLine(" Quit")
-	*/
-	
-	Quit $$$OK
+<Implementation><![CDATA[	Quit $$$OK
 ]]></Implementation>
 </Method>
 
@@ -226,13 +198,11 @@
 		Set ..Detail = Detail	
 		do ..Info.WriteLine(Detail)
 	}
-	//Set ..LessDetail = $extract($translate(..Detail,$$$CRLF,""),1,250)
 	Set ..ProgLabel = $G(ProgLabel)
 	
 	if ($IsObject($get(%request)))&&(%request.%IsA("%CSP.Request")) {
  	 set ..RemoteIP =$get(%request.CgiEnvs("REMOTE_ADDR"))
 	}
-
 	
 	Quit
 ]]></Implementation>
@@ -250,7 +220,7 @@
 	Quit Logging
 aelSendErrorMail()   ; Mail versturen van de fout
 	Set Body=$$aelErrorMailBody()
-	Do Logging.GetMailFields(.From,.lbTo,.Subj,"Error")   ; Do ##class(VHSys.Scheduler.LoggingAbstract).GetMailFields(...)
+	Do Logging.GetMailFields(.From,.lbTo,.Subj,"Error")
 	Set:($ZError="<LIST>islist+2^%occRun")&&($$$GETERRORCODE(Error)=$$$GeneralError) lbTo=$LB("ICT_Meldingen@vanhoecke.be")   ; Does not provide any extra information 
 	Set sc=$$SendMiniMail^vhLib(From,lbTo,Subj,Body,,,,,)
 	Quit
@@ -283,10 +253,7 @@
 <ClassMethod>1</ClassMethod>
 <FormalSpec>blnMultiLine:%String,Indent:%String</FormalSpec>
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[
-	;Set Body=Body_$$$CRLF_"Device: "_$I_"  Job: "_$J
-	;Set Body=Body_$$$CRLF_"Server: "_$$$Server_"  NameSpace: "_$$$NSpace
-	Quit $$GetJobInfo^vhLib.System(.blnMultiLine,.Indent)
+<Implementation><![CDATA[	Quit $$GetJobInfo^vhLib.System(.blnMultiLine,.Indent)
 ]]></Implementation>
 </Method>
 
@@ -301,7 +268,7 @@
 
 <Method name="SetSubID">
 <Implementation><![CDATA[
-	#define StorageGlobal(%v)  ^vhLib.LoggingD(..MainIndex,%v)
+	#define StorageGlobal(%v)  ^LOG.vhLib.LoggingD(..MainIndex,%v)
 	
 	Quit:(..SubID'="")
 	Set ..SubID=$I($$$StorageGlobal(..Datum))
@@ -344,32 +311,17 @@
 
 <Method name="CollectLogs">
 <ClassMethod>1</ClassMethod>
-<Implementation><![CDATA[
-	/*
-	
-	For NSPACE = "WSS" Do
-	. Set MainIndex = ""
-	. For  Set MainIndex = $O(^[NSPACE]vhLib.LoggingD(MainIndex)) Quit:MainIndex=""  Do
-	. . 
-	. . Set Datum = $G(^vhLib.LoggingMergeD(MainIndex))
-	. . Set Datum = Datum -1
-	. . For  Set Datum = $O(^[NSPACE]vhLib.LoggingD(MainIndex,Datum))  Quit:Datum=""  Do
-	. . . Set ^["DEV-ADMIN1"]vhLib.LoggingMergeD(MainIndex) = Datum
-	. . . Merge ^["DEV-ADMIN1"]vhLib.LoggingD(MainIndex,Datum) = ^[NSPACE]vhLib.LoggingD(MainIndex,Datum)
-	Do ##class(vhLib.Logging).%BuildIndices()
-	
-	*/
-	Quit
+<Implementation><![CDATA[	Quit
 ]]></Implementation>
 </Method>
 
 <Storage name="Default">
 <Type>%Library.CacheStorage</Type>
-<DataLocation>^vhLib.LoggingD</DataLocation>
+<DataLocation>^LOG.vhLib.LoggingD</DataLocation>
 <DefaultData>LoggingDefaultData</DefaultData>
-<IdLocation>^vhLib.LoggingD</IdLocation>
-<IndexLocation>^vhLib.LoggingI</IndexLocation>
-<StreamLocation>^vhLib.LoggingS</StreamLocation>
+<IdLocation>^LOG.vhLib.LoggingD</IdLocation>
+<IndexLocation>^LOG.vhLib.LoggingI</IndexLocation>
+<StreamLocation>^LOG.vhLib.LoggingS</StreamLocation>
 <Data name="LoggingDefaultData">
 <Value name="1">
 <Value>%%CLASSNAME</Value>
@@ -412,46 +364,5 @@
 </Value>
 </Data>
 </Storage>
-
-<Storage name="LogNSpace">
-<Type>%Library.CacheStorage</Type>
-<DataLocation>^["LOG"]vhLib.LoggingD</DataLocation>
-<DefaultData>LoggingDefaultData</DefaultData>
-<IdLocation>^["LOG"]vhLib.LoggingD</IdLocation>
-<IndexLocation>^["LOG"]vhLib.LoggingI</IndexLocation>
-<StreamLocation>^["LOG"]vhLib.LoggingS</StreamLocation>
-<Data name="LoggingDefaultData">
-<Value name="1">
-<Value>%%CLASSNAME</Value>
-</Value>
-<Value name="2">
-<Value>Actie</Value>
-</Value>
-<Value name="3">
-<Value>Detail</Value>
-</Value>
-<Value name="4">
-<Value>Groep</Value>
-</Value>
-<Value name="5">
-<Value>Namespace</Value>
-</Value>
-<Value name="6">
-<Value>Niveau</Value>
-</Value>
-<Value name="7">
-<Value>ProgLabel</Value>
-</Value>
-<Value name="8">
-<Value>Server</Value>
-</Value>
-<Value name="9">
-<Value>Tijd</Value>
-</Value>
-<Value name="10">
-<Value>JobID</Value>
-</Value>
-</Data>
-</Storage>
 </Class>
 </Export>