Prefix Support for Addons and Themes

Author: Jakcpto

MDX2JSON/REST.cls

@@ -123,7 +123,6 @@ ClassMethod Test() As %Status
 	set obj.Parent = ##class(MDX2JSON.Tests).#LastCommit
 	set obj.ParentTS = ##class(MDX2JSON.Tests).#LastCommitTS
 	set obj.DefaultApp = $System.CSP.GetDefaultApp($Namespace)
-	set obj.CurrentApp = $get(%request.Application)
 	set obj.Mappings = ..GetMappings()
 	if $$$Debug {
 		set obj.Roles = $Roles
@@ -155,6 +154,7 @@ ClassMethod saveWidget() As %Status
 	return ##class(MDX2JSON.Utils).AddWidget(widgetData,dashboardData,key)
 }
 
+
 /// Get all data sources including "pivot", "kpi", "worksheets","metrics"
 ClassMethod GetListDataSources(Source) As %Status
 {
@@ -193,6 +193,7 @@ ClassMethod GetListDataSources(Source) As %Status
 	quit tSC
 }
 
+
 ClassMethod GetDataSource() As %Status
 {
 	return ##class(MDX2JSON.Utils).GetDataSource($$$R("DataSource"))
@@ -281,7 +282,7 @@ ClassMethod WriteFiltersForDataSource() As %Status
   	return st
 }
 
-/// Execute requests from kpi
+///Execute requests from kpi
 ClassMethod KPIExecute() As %Status
 {
 	try{
@@ -420,14 +421,20 @@ ClassMethod WritePivotVariablesForCube(Cube As %String) As %Status
 ClassMethod WriteAddons() As %Status
 {
 	#dim sc As %Status = $$$OK
-	
-	set defaultApp = $System.CSP.GetDefaultApp($Namespace)
-	set prefix = $piece(defaultApp, "/csp", 1)
+
+	set currentApp =  $ZConvert($Get(%request.CgiEnvs("SCRIPT_NAME"), ""), "L")
+	set prefix = $piece(currentApp, "/mdx2json", 1)
 	set app = prefix _ "/dsw"
 	set path = $system.CSP.GetFileName(app _ "/")
 	set path = ##class(%File).NormalizeDirectory(path)
 	set path = ##class(%File).SubDirectoryName(path, "addons", $$$YES)	
 	set url = app _ "/addons/"
+
+	// Check if path exists
+	if '##class(%File).Exists(path) {
+		set sc = $$$ERROR($$$GeneralError, "Addons directory does not exist: "_path_". Probably different prefixes for MDX2JSON and DSW applications.")
+		quit sc
+	}
 
 	#dim rs As %SQL.ClassQueryResultSet = ##class(%File).FileSetFunc(path, "*.js")
 
@@ -448,14 +455,20 @@ ClassMethod WriteThemes() As %Status
 {
 	#dim sc As %Status = $$$OK
 
-	set defaultApp = $System.CSP.GetDefaultApp($Namespace)
-	set prefix = $piece(defaultApp, "/csp", 1)
+	set currentApp =  $ZConvert($Get(%request.CgiEnvs("SCRIPT_NAME"), ""), "L")
+	set prefix = $piece(currentApp, "/mdx2json", 1)
 	set app = prefix _ "/dsw"
 	set path = $system.CSP.GetFileName(app _ "/")
 	set path = ##class(%File).NormalizeDirectory(path)
 	set path = ##class(%File).SubDirectoryName(path, "themes", $$$YES)	
 	set url = app _ "/themes/"
 
+	// Check if path exists
+	if '##class(%File).Exists(path) {
+		set sc = $$$ERROR($$$GeneralError, "Themes directory does not exist: "_path_". Probably different prefixes for MDX2JSON and DSW applications.")
+		quit sc
+	}
+
 	#dim rs As %SQL.ClassQueryResultSet = ##class(%File).FileSetFunc(path, "*.css")
 
 	set list = $$$NewDynDTList
@@ -477,4 +490,4 @@ ClassMethod WriteJSONfromKPI() As %Status [ CodeMode = objectgenerator ]
 	do %code.Write(base)
 }
 
-}
+}