Skip to content

Commit 0c08371

Browse files
author
Rubens F. N. da Silva
committed
updates project XML
1 parent f247913 commit 0c08371

File tree

2 files changed

+39
-34
lines changed

2 files changed

+39
-34
lines changed

port-prod.xml

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -396,7 +396,7 @@ Returns the selected test format. It can be "UDL" or "XML".</Description>
396396
<XMLNamespace>https://github.com/rfns/port</XMLNamespace>
397397
<Data><![CDATA[
398398
<?xml version="1.0" encoding="UTF-8"?>
399-
<MsgFile Language="en-us">
399+
<MsgFile Language="en">
400400
<MsgDomain Domain="Port Errors">
401401
<Message Id="-100" Name="InvalidPhysicalPath">The provided physical path '%1' is not part of the static files directory.</Message>
402402
<Message Id="-101" Name="NamespaceDoesntHaveAppWithPath">There is not an application with a physical path for the namespace %1.</Message>
@@ -967,8 +967,9 @@ Install
967967
quit
968968
969969
Wizard
970-
do ##class(Port.Wizard).Start()
971-
quit
970+
do ##class(Port.Wizard).Start()
971+
quit
972+
972973
]]></Routine>
973974

974975

@@ -2596,17 +2597,21 @@ LoopThroughType(projectName, importedList, group)
25962597
SanitizePackages(items="")
25972598
set sc = $$$OK
25982599
set testPrefix = ##class(Port.Configuration).GetTestClassPrefix()
2599-
if testPrefix '= "" {
2600-
for i=1:1:..Project.Items.Count() {
2601-
set item = ..Project.Items.GetAt(i)
2602-
if $isobject(item) && (item.Type '= "PRJ") && '($extract(item.Name, 1, $length(testPrefix)) = testPrefix && (item.Type = "CLS")) {
2603-
set name = item.Name
2604-
set type = item.Type
2605-
do ##class(%Studio.Project).NormalizeName(.name, .type)
2606-
if type = "CLS" || (type = "PKG") set name = name_"."_type
2607-
set items(name) = ""
2608-
}
2609-
}
2600+
2601+
set s = ##class(%SQL.Statement).%New()
2602+
do s.%PrepareClassQuery("%Studio.Project", "ProjectItemsList")
2603+
2604+
set r = s.%Execute(..Project.Name)
2605+
while r.%Next() {
2606+
set itemName = r.%Get("Name")
2607+
set itemType = r.%Get("Type")
2608+
if itemType '= "CLS" || (itemType = "CLS" && '($extract(itemName, 1, $length(testPrefix)) = testPrefix)) {
2609+
set name = itemName
2610+
set type = itemType
2611+
do ##class(%Studio.Project).NormalizeName(.name, .type)
2612+
if type = "CLS" || (type = "PKG") set name = name_"."_type
2613+
set items(name) = ""
2614+
}
26102615
}
26112616
quit
26122617
]]></Implementation>

port.xml

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -396,7 +396,7 @@ Returns the selected test format. It can be "UDL" or "XML".</Description>
396396
<XMLNamespace>https://github.com/rfns/port</XMLNamespace>
397397
<Data><![CDATA[
398398
<?xml version="1.0" encoding="UTF-8"?>
399-
<MsgFile Language="en-us">
399+
<MsgFile Language="en">
400400
<MsgDomain Domain="Port Errors">
401401
<Message Id="-100" Name="InvalidPhysicalPath">The provided physical path '%1' is not part of the static files directory.</Message>
402402
<Message Id="-101" Name="NamespaceDoesntHaveAppWithPath">There is not an application with a physical path for the namespace %1.</Message>
@@ -967,8 +967,9 @@ Install
967967
quit
968968
969969
Wizard
970-
do ##class(Port.Wizard).Start()
971-
quit
970+
do ##class(Port.Wizard).Start()
971+
quit
972+
972973
]]></Routine>
973974

974975

@@ -2596,17 +2597,21 @@ LoopThroughType(projectName, importedList, group)
25962597
SanitizePackages(items="")
25972598
set sc = $$$OK
25982599
set testPrefix = ##class(Port.Configuration).GetTestClassPrefix()
2599-
if testPrefix '= "" {
2600-
for i=1:1:..Project.Items.Count() {
2601-
set item = ..Project.Items.GetAt(i)
2602-
if $isobject(item) && (item.Type '= "PRJ") && '($extract(item.Name, 1, $length(testPrefix)) = testPrefix && (item.Type = "CLS")) {
2603-
set name = item.Name
2604-
set type = item.Type
2605-
do ##class(%Studio.Project).NormalizeName(.name, .type)
2606-
if type = "CLS" || (type = "PKG") set name = name_"."_type
2607-
set items(name) = ""
2608-
}
2609-
}
2600+
2601+
set s = ##class(%SQL.Statement).%New()
2602+
do s.%PrepareClassQuery("%Studio.Project", "ProjectItemsList")
2603+
2604+
set r = s.%Execute(..Project.Name)
2605+
while r.%Next() {
2606+
set itemName = r.%Get("Name")
2607+
set itemType = r.%Get("Type")
2608+
if itemType '= "CLS" || (itemType = "CLS" && '($extract(itemName, 1, $length(testPrefix)) = testPrefix)) {
2609+
set name = itemName
2610+
set type = itemType
2611+
do ##class(%Studio.Project).NormalizeName(.name, .type)
2612+
if type = "CLS" || (type = "PKG") set name = name_"."_type
2613+
set items(name) = ""
2614+
}
26102615
}
26112616
quit
26122617
]]></Implementation>
@@ -4877,7 +4882,7 @@ Menu
48774882
</Class>
48784883

48794884

4880-
<Project name="port" LastModified="2019-07-03 11:36:59.005325" Target="##class(Port.Project.Manager).Import(&quot;/CacheProjects/DEV/cache-dap&quot;,,,1)" TargetType="2" HttpServer="http://localhost:57772">
4885+
<Project name="port" LastModified="2019-11-19 14:34:55.610809" TargetType="2" HttpServer="http://localhost:57772">
48814886
<Items>
48824887
<ProjectItem name="Port.AutoInstall" type="CLS"></ProjectItem>
48834888
<ProjectItem name="Port.Configuration" type="CLS"></ProjectItem>
@@ -4907,11 +4912,6 @@ Menu
49074912
<ProjectItem name="portmd.INC" type="MAC"></ProjectItem>
49084913
<ProjectItem name="portutils.INC" type="MAC"></ProjectItem>
49094914
</Items>
4910-
<BreakPoints>
4911-
<BreakPoint Routine="Port.Project.Synchronizer.CLS" Offset="Purge+24"></BreakPoint>
4912-
<BreakPoint Routine="Port.Project.Synchronizer.CLS" Offset="Scan+37"></BreakPoint>
4913-
<BreakPoint Routine="Port.Util2.CLS" Offset="GetPathType+1"></BreakPoint>
4914-
</BreakPoints>
49154915
</Project>
49164916

49174917

0 commit comments

Comments
 (0)