From 9c93fb29cf492c9a3041b9a678da2c725fa31c59 Mon Sep 17 00:00:00 2001 From: Sam Gamgee Date: Thu, 26 Jul 2018 11:00:49 +1000 Subject: [PATCH 1/2] Add IRIS compatibility to installer --- src/cls/WebTerminal/Installer.cls | 30 +++++++++++++++++++++++------- 1 file changed, 23 insertions(+), 7 deletions(-) diff --git a/src/cls/WebTerminal/Installer.cls b/src/cls/WebTerminal/Installer.cls index 969e97a..f1ffb72 100644 --- a/src/cls/WebTerminal/Installer.cls +++ b/src/cls/WebTerminal/Installer.cls @@ -81,7 +81,12 @@ ClassMethod CreateProjection(cls As %String, ByRef params) As %Status set cspProperties("Description") = "An application representing the open socket for /terminal application." set cspProperties("DispatchClass") = "" set role = ..GetDBRole(dbdir) - set cspProperties("MatchRoles")=":%DB_CACHESYS" _ $case($get(role)'="", 1: ":"_role, :"") + if ($system.Version.GetISCProduct() = 4) { + set cspProperties("MatchRoles")=":%DB_IRISSYS" _ $case($get(role)'="", 1: ":"_role, :"") + } else { + set cspProperties("MatchRoles")=":%DB_CACHESYS" _ $case($get(role)'="", 1: ":"_role, :"") + } + set st = ..RegisterWebApplication("/terminalsocket", .cspProperties) do:($$$ISERR(st)) ##class(WebTerminal.Analytics).ReportInstallStatus(st) return:$$$ISERR(st) st @@ -178,12 +183,23 @@ ClassMethod CreateAllNamespace() As %Status set ns = "%All" set st = $$$OK if ('##Class(Config.Namespaces).Exists(ns)) { - set Properties("Globals") = "CACHETEMP" - set Properties("Library") = "CACHELIB" - set Properties("Routines") = "CACHETEMP" - set Properties("SysGlobals") = "CACHESYS" - set Properties("SysRoutines") = "CACHESYS" - set Properties("TempGlobals") = "CACHETEMP" + + if ($system.Version.GetISCProduct() = 4) { + set Properties("Globals") = "IRISTEMP" + set Properties("Library") = "IRISLIB" + set Properties("Routines") = "IRISTEMP" + set Properties("SysGlobals") = "IRISSYS" + set Properties("SysRoutines") = "IRISSYS" + set Properties("TempGlobals") = "IRISTEMP" + } else { + set Properties("Globals") = "CACHETEMP" + set Properties("Library") = "CACHELIB" + set Properties("Routines") = "CACHETEMP" + set Properties("SysGlobals") = "CACHESYS" + set Properties("SysRoutines") = "CACHESYS" + set Properties("TempGlobals") = "CACHETEMP" + } + set st = ##Class(Config.Namespaces).Create(ns, .Properties) if ($$$ISERR(st)) { do $System.Status.DisplayError(st) From d0933a9ac5b5f16db465bbdd3391dac880bc8dd6 Mon Sep 17 00:00:00 2001 From: Sam Gemgee Date: Fri, 27 Jul 2018 01:46:12 +1000 Subject: [PATCH 2/2] Change condition --- src/cls/WebTerminal/Installer.cls | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/cls/WebTerminal/Installer.cls b/src/cls/WebTerminal/Installer.cls index f1ffb72..ffd1d0b 100644 --- a/src/cls/WebTerminal/Installer.cls +++ b/src/cls/WebTerminal/Installer.cls @@ -81,7 +81,7 @@ ClassMethod CreateProjection(cls As %String, ByRef params) As %Status set cspProperties("Description") = "An application representing the open socket for /terminal application." set cspProperties("DispatchClass") = "" set role = ..GetDBRole(dbdir) - if ($system.Version.GetISCProduct() = 4) { + if ($system.Version.GetISCProduct() >= 4) { set cspProperties("MatchRoles")=":%DB_IRISSYS" _ $case($get(role)'="", 1: ":"_role, :"") } else { set cspProperties("MatchRoles")=":%DB_CACHESYS" _ $case($get(role)'="", 1: ":"_role, :"") @@ -184,7 +184,7 @@ ClassMethod CreateAllNamespace() As %Status set st = $$$OK if ('##Class(Config.Namespaces).Exists(ns)) { - if ($system.Version.GetISCProduct() = 4) { + if ($system.Version.GetISCProduct() >= 4) { set Properties("Globals") = "IRISTEMP" set Properties("Library") = "IRISLIB" set Properties("Routines") = "IRISTEMP"