Merge pull request #4 from alexandrov-nikita/master

.

Author: evshvarov

README.md

@@ -21,11 +21,11 @@ Installation
 
 Installation without fs access to server
 -----------
-1. Download Installer.cls.xml (from MDX2JSON folder in repository or releases page) into Caché Studio (any namespace)
+1. Download Installer.cls.xml (from cls/kutac/monitor/utils folder in repository or releases page) into Caché Studio (any namespace)
 2. Run in terminal (any namespace) under user with %All role: 
 
         set pVars("Namespace")="{Namespace}"
-        do ##class(MDX2JSON.Installer).setup(.pVars)
+        do ##class(kutac.monitor.utils.Installer).setup(.pVars)
 
     where: 
 
@@ -38,7 +38,7 @@ Offline Installation
 1. Download zip and unpack it.
 2. Run in terminal (any namespace) under user with %All role:
 
-        do ##class(%Installer.Installer).InstallFromCommandLine("{SourceDir}cls\kutac\monitor\utils\Installer.cls.xml","Namespace={Namespace},SourceDir={SourceDir}")
+        do ##class(%Installer.Installer).InstallFromCommandLine("{SourceDir}\cls\kutac\monitor\utils\Installer.cls.xml","Namespace={Namespace},SourceDir={SourceDir}")
 
 On this step installer would create (if needed) Namespace and corresponding database, import source code and compile it, create required web application (named /cls/{Namespace}) if one does not exist (skipping web application creation process if one does exist), and map kutac package to %All namespace (which will be created if it does not exist).
 

cls/kutac/monitor/utils/Installer.cls.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Export generator="Cache" version="25" zv="Cache for Windows (x86-32) 2015.1 (Build 429U)" ts="2015-07-24 13:06:58">
-<Class name="cls.kutac.monitor.utils.Installer">
-<TimeChanged>63757,47200.76574</TimeChanged>
+<Export generator="Cache" version="25" zv="Cache for Windows (x86-32) 2015.1 (Build 429U)" ts="2015-07-24 16:07:29">
+<Class name="kutac.monitor.utils.Installer">
+<TimeChanged>63757,58028.937681</TimeChanged>
 <TimeCreated>63732,50627.865496</TimeCreated>
 
 <XData name="Install">
@@ -19,7 +19,7 @@
 <Database Name="${Namespace}" Dir="${MGRDIR}/${Namespace}" Create="yes" MountRequired="true" Resource="%DB_${Namespace}" PublicPermissions="RW" MountAtStartup="true"/>
 </Configuration>
 <Log Text="Creating web application /csp/${Namespace}" Level="0"/>
-<CSPApplication Url="/csp/${Namespace}" Directory="#{##class(%DeepSee.Report.UI.reportModelServer).GetCSPDirectory()}/${Namespace}" AuthenticationMethods="64" IsNamespaceDefault="true" />
+<CSPApplication Url='#{$ZCONVERT("/csp/${Namespace}", "L")}' Directory="#{##class(%DeepSee.Report.UI.reportModelServer).GetCSPDirectory()}/${Namespace}" AuthenticationMethods="64" IsNamespaceDefault="true" />
 <RunInstall Class="kutac.monitor.utils.Installer" Method="EnableDeepSee"/>
 </Namespace>
  <Log Text="End Creating namespace ${Namespace} and web application /csp/${Namespace}" Level="0"/>
@@ -88,7 +88,7 @@ do ##class(kutac.monitor.utils.Installer).setup(.pVars)</Description>
 <FormalSpec>pVars,pLogLevel,tInstaller</FormalSpec>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
-	do EnableDeepSee^%SYS.cspServer("/csp/"_pVars("Namespace")_"/")
+	do EnableDeepSee^%SYS.cspServer("/csp/"_$ZCONVERT(pVars("Namespace"), "L")_"/")
 	quit $$$OK
 ]]></Implementation>
 </Method>