Skip to content

Commit c00791b

Browse files
Add support for 2019.* ISC products, fixes #24
1 parent 63f31a6 commit c00791b

File tree

4 files changed

+42
-11
lines changed

4 files changed

+42
-11
lines changed

.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
/node_modules/
2+
/build
3+
/package-lock.json

import.bat

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
@echo off
77

88
:: CHANGE THIS PATH TO YOUR CACHÉ INSTALLATION PATH ON WINDOWS (folder that contains bin, CSP, mgr and other folders)
9-
set CACHE_DIR=C:\Program Files\InterSystems\Ensemble
9+
set CACHE_DIR=C:\Program Files\Ensemble-2017
1010
:: NAMESPACE TO IMPORT PACKAGE TO
1111
set NAMESPACE=USER
1212
:: Other variables

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "CacheClassExplorer",
3-
"version": "1.21.0",
3+
"version": "1.21.1",
44
"description": "Class Explorer for InterSystems Caché",
55
"directories": {
66
"test": "test"

src/cls/ClassExplorer/ClassView.cls

+37-9
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,13 @@ ClassMethod fillClassData(oData As %ZEN.proxyObject, className As %String, level
9494
set props = ##class(%Dictionary.ClassDefinition).%OpenId("%Dictionary.ClassDefinition")
9595
for j=1:1:props.Properties.Count() {
9696
set pname = props.Properties.GetAt(j).Name
97-
set:((pname '= "parent")
98-
&& ('props.Properties.GetAt(j).Private)
99-
&& ('$IsObject($PROPERTY(classDefinition, pname)))) $PROPERTY(oClass, pname) = $PROPERTY(classDefinition, pname)
97+
try {
98+
set:((pname '= "parent")
99+
&& ('props.Properties.GetAt(j).Private)
100+
&& ('$IsObject($PROPERTY(classDefinition, pname)))) $PROPERTY(oClass, pname) = $PROPERTY(classDefinition, pname)
101+
} catch (e) {
102+
// Skip private properties that InterSystems may add in any future versions
103+
}
100104
}
101105
if (oClass.TimeChanged) { set oClass.TimeChanged = $zdatetime(oClass.TimeChanged) }
102106
if (oClass.TimeCreated) { set oClass.TimeCreated = $zdatetime(oClass.TimeCreated) }
@@ -117,7 +121,11 @@ ClassMethod fillClassData(oData As %ZEN.proxyObject, className As %String, level
117121
do oProperties.%DispatchSetProperty(p.Name, oProp)
118122
for j=1:1:props.Properties.Count() {
119123
set pname = props.Properties.GetAt(j).Name
120-
set:(pname '= "parent") $PROPERTY(oProp, pname) = $PROPERTY(p, pname)
124+
try {
125+
set:(pname '= "parent") $PROPERTY(oProp, pname) = $PROPERTY(p, pname)
126+
} catch (e) {
127+
// Skip private properties that InterSystems may add in any future versions
128+
}
121129
}
122130
if (..classExists(package _ "." _ p.Type)) {
123131
set oProp.Type = package _ "." _ p.Type
@@ -140,7 +148,11 @@ ClassMethod fillClassData(oData As %ZEN.proxyObject, className As %String, level
140148
do oMethods.%DispatchSetProperty(met.Name, oMeth)
141149
for j=1:1:props.Properties.Count() {
142150
set pname = props.Properties.GetAt(j).Name
143-
set:((pname '= "parent") && (pname '= "Implementation")) $PROPERTY(oMeth, pname) = $PROPERTY(met, pname)
151+
try {
152+
set:((pname '= "parent") && (pname '= "Implementation")) $PROPERTY(oMeth, pname) = $PROPERTY(met, pname)
153+
} catch (e) {
154+
// Skip private properties that InterSystems may add in any future versions
155+
}
144156
}
145157
}
146158

@@ -153,7 +165,11 @@ ClassMethod fillClassData(oData As %ZEN.proxyObject, className As %String, level
153165
set p = classDefinition.Parameters.GetAt(i)
154166
for j=1:1:props.Properties.Count() {
155167
set pname = props.Properties.GetAt(j).Name
156-
set:(pname '= "parent") $PROPERTY(oPar, pname) = $PROPERTY(p, pname)
168+
try {
169+
set:(pname '= "parent") $PROPERTY(oPar, pname) = $PROPERTY(p, pname)
170+
} catch (e) {
171+
// Skip private properties that InterSystems may add in any future versions
172+
}
157173
}
158174
do oParameters.%DispatchSetProperty(p.Name, oPar)
159175
}
@@ -166,7 +182,11 @@ ClassMethod fillClassData(oData As %ZEN.proxyObject, className As %String, level
166182
set q = classDefinition.Queries.GetAt(i)
167183
for j=1:1:props.Properties.Count() {
168184
set pname = props.Properties.GetAt(j).Name
169-
set:(pname '= "parent") $PROPERTY(oProp, pname) = $PROPERTY(q, pname)
185+
try {
186+
set:(pname '= "parent") $PROPERTY(oProp, pname) = $PROPERTY(q, pname)
187+
} catch (e) {
188+
// Skip private properties that InterSystems may add in any future versions
189+
}
170190
}
171191
do oQueries.%DispatchSetProperty(q.Name, oProp)
172192
}
@@ -179,7 +199,11 @@ ClassMethod fillClassData(oData As %ZEN.proxyObject, className As %String, level
179199
set xd = classDefinition.XDatas.GetAt(i)
180200
for j=1:1:props.Properties.Count() {
181201
set pname = props.Properties.GetAt(j).Name
182-
set:((pname '= "parent") && (pname '= "Object")) $PROPERTY(oProp, pname) = $PROPERTY(xd, pname)
202+
try {
203+
set:((pname '= "parent") && (pname '= "Object")) $PROPERTY(oProp, pname) = $PROPERTY(xd, pname)
204+
} catch (e) {
205+
// Skip private properties that InterSystems may add in any future versions
206+
}
183207
}
184208
do oXDatas.%DispatchSetProperty(xd.Name, oProp)
185209
}
@@ -192,7 +216,11 @@ ClassMethod fillClassData(oData As %ZEN.proxyObject, className As %String, level
192216
set ind = classDefinition.Indices.GetAt(i)
193217
for j=1:1:props.Properties.Count() {
194218
set pname = props.Properties.GetAt(j).Name
195-
set:(pname '= "parent") $PROPERTY(oProp, pname) = $PROPERTY(ind, pname)
219+
try {
220+
set:(pname '= "parent") $PROPERTY(oProp, pname) = $PROPERTY(ind, pname)
221+
} catch (e) {
222+
// Skip private properties that InterSystems may add in any future versions
223+
}
196224
}
197225
do oIndices.%DispatchSetProperty(ind.Name, oProp)
198226
}

0 commit comments

Comments
 (0)