Merge pull request #11 from daimor/master

some fixes for running with docker

Author: evshvarov

.vscode/settings.json

@@ -0,0 +1,10 @@
+{
+  "objectscript.conn": {
+    "active": true,
+    "port": 52774,
+    "user": "admin",
+    "password": "SYS",
+    "ns": "DCANALYTICS"
+  },
+  "objectscript.conn.version": 3
+}

Dockerfile

@@ -32,22 +32,21 @@ RUN mkdir -p /tmp/deps \
   | wget -O - -i - \
   | gunzip > /opt/app/globals.xml 
 
-
 RUN iris start $ISC_PACKAGE_INSTANCENAME quietly EmergencyId=sys,sys && \
     /bin/echo -e "sys\nsys\n" \
             " Do ##class(Security.Users).UnExpireUserPasswords(\"*\")\n" \
             " Do ##class(Security.Users).AddRoles(\"admin\", \"%ALL\")\n" \
             " do \$system.OBJ.Load(\"/opt/app/dswinstaller.cls\",\"ck\")\n" \
             " Do ##class(Security.System).Get(,.p)\n" \
-            " Set p(\"AutheEnabled\")=p(\"AutheEnabled\")+16\n" \
+            " Set p(\"AutheEnabled\")=\$zb(p(\"AutheEnabled\"),16,7)\n" \
             " Do ##class(Security.System).Modify(,.p)\n" \
             " set ^%SYS(\"CSP\",\"DefaultFileCharset\")=\"utf-8\"\n" \
             # " do \$system.OBJ.Load(\"/tmp/deps/Cache-MDX2JSON-master/MDX2JSON/Installer.cls.xml\",\"ck\")\n" \
             # " do \$system.OBJ.Load(\"/tmp/deps/deepseeweb.xml\",\"ck\")\n" \
             " s sc=##class(DSWMDX2JSON.Installer).setup()\n" \
             " If 'sc do \$zu(4, \$JOB, 1)\n" \
             # "do CreateDatabase^%SYS.SQLSEC(\"DCANALYTICS\",\"\",,0)\n" \
-            "zn \"DCANALYTICS\"\n" \
+            " zn \"DCANALYTICS\"\n" \
             " do \$system.OBJ.ImportDir(\"/opt/app/src\",,\"ck\",,1)\n" \
             " do ##class(Community.Utils).setup(\"/opt/app/globals.xml\")" \
             " halt" \
@@ -57,4 +56,6 @@ RUN iris start $ISC_PACKAGE_INSTANCENAME quietly EmergencyId=sys,sys && \
 
 COPY ./other/dcanalytics.json /usr/irissys/csp/dsw/configs/
 
-CMD [ "-l", "/usr/irissys/mgr/messages.log" ]
+COPY ./buildiknow.sh ./
+
+CMD [ "-l", "/usr/irissys/mgr/messages.log", "-a", "/opt/app/buildiknow.sh" ]

buildiknow.sh

@@ -0,0 +1,6 @@
+#!/bin/sh
+
+/bin/echo -e '' \
+        ' do $system.DeepSee.BuildCube("POST", 1, 1)' \
+        ' halt' \
+| iris session $ISC_PACKAGE_INSTANCENAME -UDCANALYTICS

src/cls/Community/Utils.cls

@@ -35,8 +35,12 @@ ClassMethod setup(globalPath As %String = "") As %Status
 
 ClassMethod enableIknow() As %Status
 {
-	set app = $System.CSP.GetDefaultApp($znspace) _ "/"
-	do EnableIKnow^%SYS.cspServer(app)
+	set app = $System.CSP.GetDefaultApp($znspace)
+	new $NAMESPACE
+	set $NAMESPACE = "%SYS"
+	set props("DeepSeeEnabled") = 1
+	set props("iKnowEnabled") = 1
+	do ##class(Security.Applications).Modify(app, .props)
 	return $$$OK
 }
 
@@ -62,28 +66,20 @@ ClassMethod buildIndices() As %Status
 
 ClassMethod UpdateCubes(verbose = 1) As %Status
 {
- set st = ##class(%DeepSee.Utils).%GetCubeList(.list, "cubes")
- return:$$$ISERR(st) st
+	set st = ##class(%DeepSee.Utils).%GetCubeList(.list, "cubes")
+	return:$$$ISERR(st) st
 
- set cube=""
- for {
-   set cube=$Order(list(cube)) 
-   
-   quit:cube=""
-   Set st1 = ##class(%DeepSee.Utils).%BuildCube(cube, $$$YES, verbose)
-   
-   // TODO Fix that hack
-   if ((cube="POST") && 
-    ($SYSTEM.Status.GetErrorCodes(st1) = 5001/*GeneralError*/) && 
-    ($SYSTEM.Status.GetErrorText(st1) [ "Insert into dimension table failed")) {
-     /// Reported as prodlog 141297
-     set st1 = $$$OK
-   }
-   if (cube="POST") continue
-   
-   set st = $$$ADDSC(st, st1) 
- }
- return st
+	set cube=""
+	for {
+		set cube=$Order(list(cube)) 
+		if (cube="POST") continue
+		quit:cube=""
+
+		Set st1 = ##class(%DeepSee.Utils).%BuildCube(cube, $$$YES, verbose)
+		
+		set st = $$$ADDSC(st, st1) 
+	}
+	return st
 }
 
 }