Skip to content

Commit 6a0e019

Browse files
committed
[FIX] FIX DFI installation
1 parent a2e9e74 commit 6a0e019

File tree

6 files changed

+35
-857
lines changed

6 files changed

+35
-857
lines changed

Installer.xml

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<Export generator="Cache" version="25" zv="Cache for Windows (x86-64) 2017.1 (Build 730U)" ts="2017-09-10 21:43:33">
2+
<Export generator="Cache" version="25" zv="Cache for Windows (x86-64) 2017.1 (Build 730U)" ts="2017-11-06 20:47:48">
33
<Class name="kutac.monitor.utils.Installer">
4-
<TimeChanged>64536,78183.96318</TimeChanged>
4+
<TimeChanged>64593,74404.434052</TimeChanged>
55
<TimeCreated>63732,50627.865496</TimeCreated>
66

77
<XData name="Install">
@@ -300,41 +300,49 @@ do ##class(kutac.monitor.utils.Installer).setup(.pVars)</Description>
300300
<FormalSpec>pVars,pLogLevel,tInstaller</FormalSpec>
301301
<Implementation><![CDATA[
302302
set sc = $$$OK
303-
304303
set i = 0
304+
305305
while 1 {
306306
set id = "SYSMON.DFIData||File" _ i
307307
if (##class(%Dictionary.CompiledXData).%ExistsId(id) = 0) Q
308308
set dfi = ##class(%Dictionary.CompiledXData).%OpenId(id)
309-
310309
set data = ##class(%GlobalCharacterStream).%New()
311310
do data.Clear()
312-
do data.Write($zconvert(dfi.Data.Read(dfi.Data.Size), "O", "UTF8"))
313-
314-
set dfiName = $piece(dfi.Description,".",1)
315311
312+
do data.Write(
313+
$System.Encryption.Base64Decode(
314+
$zconvert(
315+
dfi.Data.Read(dfi.Data.Size),
316+
"O",
317+
"UTF8"
318+
)
319+
)
320+
)
321+
322+
set dfiName = dfi.Description
323+
316324
set Namespace = tInstaller.Evaluate("${Namespace}")
317325
do tInstaller.PushNS(Namespace)
318326
319327
if '##class(%DeepSee.UI.FolderItemDocument).%ExistsId(dfiName) {
320328
try {
321329
set tDoc = ##class(%DeepSee.UI.FolderItemDocument).%New(dfiName)
322330
set sc = tDoc.ImportFromXML(data)
323-
324331
set sc = tDoc.Save()
325332
do tInstaller.Log(pLogLevel, "Creating DFI", dfiName)
326333
} Catch e {
327334
set sc = e.AsStatus()
335+
quit
328336
}
329337
} else {
330338
try {
331339
set tDoc = ##class(%DeepSee.UI.FolderItemDocument).%OpenId(dfiName)
332340
set sc = tDoc.ImportFromXML(data)
333-
334341
set sc = tDoc.Save()
335342
do tInstaller.Log(pLogLevel, "Creating DFI", dfiName)
336343
} Catch e {
337344
set sc = e.AsStatus()
345+
quit
338346
}
339347
}
340348
@@ -343,7 +351,7 @@ do ##class(kutac.monitor.utils.Installer).setup(.pVars)</Description>
343351
set i = i + 1
344352
}
345353
346-
quit $$$OK
354+
quit sc
347355
]]></Implementation>
348356
</Method>
349357

0 commit comments

Comments
 (0)