Skip to content

Commit 16bcd52

Browse files
committed
Merge branch 'master' of ssh://37.139.21.238/diffusion/MDXTOJSON/mdx-json
2 parents 07a1316 + 7a9cb29 commit 16bcd52

1 file changed

Lines changed: 16 additions & 6 deletions

File tree

MDX2JSON/Installer.cls.xml

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ todo add optional parameter WEBAPP to Alter web app name if it needs to have ano
2727
<Namespace Name="${Namespace}" Create="no">
2828
<IfDef Var="SourceDir">
2929
<Log Text="SourceDir defined - offline install from ${SourceDir}" Level="0"/>
30-
<Import Recurse="1" File="${SourceDir}"/>
30+
<Import File="${SourceDir}"/>
3131
</IfDef>
3232
<IfNotDef Var="SourceDir">
3333
<Log Text="SourceDir undefined - online install from GitHub" Level="0"/>
@@ -43,11 +43,7 @@ todo add optional parameter WEBAPP to Alter web app name if it needs to have ano
4343
4444
<If Condition='(##class(Config.Namespaces).Exists("%All")=0)'>
4545
<Log Text="Creating namespace %All" Level="0"/>
46-
<Namespace Name="%All" Create="yes" Code="All" Data="All">
47-
<Configuration>
48-
<Database Name="All" Dir="${MGRDIR}/All" Create="yes" MountRequired="true" MountAtStartup="true"/>
49-
</Configuration>
50-
</Namespace>
46+
<RunInstall Class="MDX2JSON.Installer" Method="CreateAllNamespace"/>
5147
</If>
5248
5349
<Log Text="Mapping MDX2JSON package to %All namespace" Level="0"/>
@@ -116,6 +112,20 @@ do ##class(MDX2JSON.Installer).setup(.pVars)</Description>
116112
]]></Implementation>
117113
</Method>
118114

115+
<Method name="CreateAllNamespace">
116+
<ClassMethod>1</ClassMethod>
117+
<FormalSpec>pVars,pLogLevel,tInstaller</FormalSpec>
118+
<ReturnType>%Status</ReturnType>
119+
<Implementation><![CDATA[
120+
Do tInstaller.PushNS("%SYS")
121+
Do tInstaller.CreateNamespace("%All","CACHETEMP","CACHETEMP")
122+
Set tSC = (##class(Config.Namespaces).Exists("%All")=1)
123+
Do tInstaller.PopNS()
124+
Quit:tSC $$$OK
125+
Quit $$$ERROR($$$GeneralError,"Error creating %All Namespace")
126+
]]></Implementation>
127+
</Method>
128+
119129
<Method name="DeleteNamespace">
120130
<ClassMethod>1</ClassMethod>
121131
<FormalSpec>Namespace=$Namespace</FormalSpec>

0 commit comments

Comments
 (0)