Skip to content

Commit 8e50b54

Browse files
committed
Fixed umlyuts and OS Authentication added
1 parent 5b62865 commit 8e50b54

3 files changed

Lines changed: 34 additions & 14 deletions

File tree

Dockerfile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,15 @@ RUN iris start $ISC_PACKAGE_INSTANCENAME quietly EmergencyId=sys,sys && \
3838
" Do ##class(Security.Users).UnExpireUserPasswords(\"*\")\n" \
3939
" Do ##class(Security.Users).AddRoles(\"admin\", \"%ALL\")\n" \
4040
" do \$system.OBJ.Load(\"/opt/app/dswinstaller.cls\",\"ck\")\n" \
41+
" Do ##class(Security.System).Get(,.p)\n" \
42+
" Set p(\"AutheEnabled\")=p(\"AutheEnabled\")+16\n" \
43+
" Do ##class(Security.System).Modify(,.p)\n" \
44+
" set ^%SYS(\"CSP\",\"DefaultFileCharset\")=\"utf-8\"\n" \
4145
# " do \$system.OBJ.Load(\"/tmp/deps/Cache-MDX2JSON-master/MDX2JSON/Installer.cls.xml\",\"ck\")\n" \
4246
# " do \$system.OBJ.Load(\"/tmp/deps/deepseeweb.xml\",\"ck\")\n" \
4347
" s sc=##class(DSWMDX2JSON.Installer).setup()\n" \
4448
" If 'sc do \$zu(4, \$JOB, 1)\n" \
45-
"do CreateDatabase^%SYS.SQLSEC(\"DCANALYTICS\",\"\",,0)\n" \
49+
# "do CreateDatabase^%SYS.SQLSEC(\"DCANALYTICS\",\"\",,0)\n" \
4650
"zn \"DCANALYTICS\"\n" \
4751
" do \$system.OBJ.ImportDir(\"/opt/app/src\",,\"ck\",,1)\n" \
4852
" do ##class(Community.Utils).setup(\"/opt/app/globals.xml\")" \

dswinstaller.cls

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,24 @@
1-
Class DSWMDX2JSON.Installer
1+
Class DSWMDX2JSON.Installer
22
{
33

44
XData setup [ XMLNamespace = INSTALLER ]
55
{
66
<Manifest>
7-
<Var Name="Namespace" Value="MDX2JSON"/>
7+
<Var Name="Namespace" Value="DCANALYTICS"/>
8+
<Log Text="Creating namespace ${Namespace}" Level="0"/>
9+
<Namespace Name="${Namespace}" Create="yes" Code="${Namespace}" Ensemble="" Data="${Namespace}">
10+
<Configuration>
11+
<Database Name="${Namespace}"
12+
Dir="${MGRDIR}${Namespace}"
13+
Create="yes"
14+
Resource="%DB_${Namespace}"
15+
PublicPermissions="RW"
16+
MountAtStartup="true"/>
17+
</Configuration>
18+
</Namespace>
19+
<Log Text="End Creating namespace ${Namespace}" Level="0"/>
20+
<Var Name="Namespace" Value="MDX2JSON"/>
821
<Var Name="Import" Value="0"/>
9-
10-
<If Condition='(##class(Config.Namespaces).Exists("${Namespace}")=0)'>
1122
<Log Text="Creating namespace ${Namespace}" Level="0"/>
1223
<Namespace Name="${Namespace}" Create="yes" Code="${Namespace}" Ensemble="" Data="${Namespace}">
1324
<Configuration>
@@ -20,7 +31,7 @@ XData setup [ XMLNamespace = INSTALLER ]
2031
</Configuration>
2132
</Namespace>
2233
<Log Text="End Creating namespace ${Namespace}" Level="0"/>
23-
</If>
34+
2435

2536
<Namespace Name="${Namespace}">
2637
<Import File="/tmp/deps/Cache-MDX2JSON-master/MDX2JSON/" Flags="ck" Recurse="1"/>
@@ -38,17 +49,12 @@ XData setup [ XMLNamespace = INSTALLER ]
3849
</Manifest>
3950
}
4051

41-
ClassMethod setup(
42-
ByRef pVars,
43-
pLogLevel As %Integer = 3,
44-
pInstaller As %Installer.Installer,
45-
pLogger As %Installer.AbstractLogger
46-
) As %Status [ CodeMode = objectgenerator, Internal ]
52+
ClassMethod setup(ByRef pVars, pLogLevel As %Integer = 3, pInstaller As %Installer.Installer, pLogger As %Installer.AbstractLogger) As %Status [ CodeMode = objectgenerator, Internal ]
4753
{
4854
do %code.WriteLine($char(9)_"set pVars(""CURRENTCLASS"")="""_%classname_"""")
4955
do %code.WriteLine($char(9)_"set pVars(""CURRENTNS"")="""_$namespace_"""")
5056
#; Let our XGL document generate code for this method.
5157
Quit ##class(%Installer.Manifest).%Generate(%compiledclass, %code, "setup")
5258
}
5359

54-
}
60+
}

src/cls/Community/Utils.cls

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@ ClassMethod setup(globalPath As %String = "") As %Status
1717
return sc
1818
}
1919

20+
write "Enabling iKnow",!
21+
set sc=..enableIknow()
22+
return:$$$ISERR(sc) sc
23+
2024
write "Building indices", !
2125
set sc = ..buildIndices()
2226
return:$$$ISERR(sc) sc
@@ -29,6 +33,13 @@ ClassMethod setup(globalPath As %String = "") As %Status
2933
return $$$OK
3034
}
3135

36+
ClassMethod enableIknow() As %Status
37+
{
38+
set app = $System.CSP.GetDefaultApp($znspace) _ "/"
39+
do EnableIKnow^%SYS.cspServer(app)
40+
return $$$OK
41+
}
42+
3243
ClassMethod importXMLGlobal(globalPath As %String) As %Status
3344
{
3445
set s=##class(%Stream.FileBinaryGzip).%New()
@@ -76,4 +87,3 @@ ClassMethod UpdateCubes(verbose = 1) As %Status
7687
}
7788

7889
}
79-

0 commit comments

Comments
 (0)