Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Detect IRIS-based Health* platforms correctly #149

Merged
merged 2 commits into from
Jul 6, 2022
Merged

Detect IRIS-based Health* platforms correctly #149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8f663fd
exclude .vscode/* from git
gjsjohnmurray Jul 5, 2022
893fa47
Detect Cache or IRIS base by checing $zversion (fixes #141)
gjsjohnmurray Jul 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
.vscode/
build/
node_modules/
package-lock.json
13 changes: 4 additions & 9 deletions src/cls/WebTerminal/Installer.cls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,8 @@ Projection Reference As Installer;

Parameter VERSION = "<!-- @echo package.version -->";

/// In older Cache versions, method "GetISCProduct" does not exists
Parameter iscProductVersion = {$case(
##class(%Dictionary.CompiledMethod).IDKEYExists("%SYSTEM.Version", "GetISCProduct"),
1: $CLASSMETHOD("%SYSTEM.Version", "GetISCProduct"),
: 2
)};
/// Cache or IRIS
Parameter iscProductBase = {$piece($zversion," ")};

ClassMethod RegisterWebApplication(name As %String, spec) As %Status
{
Expand Down Expand Up @@ -98,7 +94,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 requiredRole = $case(..#iscProductVersion >= 4, 1: "%DB_IRISSYS", : "%DB_CACHESYS")
set requiredRole = $case(..#iscProductBase = "IRIS", 1: "%DB_IRISSYS", : "%DB_CACHESYS")
set roles = ..GetDBRole(dbdir)
set extractedRoles = $case($get(roles) '= "", 1: ":" _ roles, : "")
set cspProperties("MatchRoles") = ":" _ $case(
Expand Down Expand Up @@ -205,7 +201,7 @@ ClassMethod CreateAllNamespace() As %Status

if ('##Class(Config.Namespaces).Exists(ns)) {

set dbPrefix = $case(..#iscProductVersion >= 4, 1: "IRIS", : "CACHE")
set dbPrefix = $case(..#iscProductBase = "IRIS", 1: "IRIS", : "CACHE")
set Properties("Globals") = dbPrefix _ "TEMP"
set Properties("Library") = dbPrefix _ "LIB"
set Properties("Routines") = dbPrefix _ "TEMP"
Expand All @@ -223,7 +219,6 @@ ClassMethod CreateAllNamespace() As %Status
}

return st

}

ClassMethod Map(fromNS = "") As %Status
Expand Down