From 17d48ed40f3829266e4554f18650ce0967442368 Mon Sep 17 00:00:00 2001
From: eduard93 <lebeduk93@gmail.com>
Date: Sat, 12 Dec 2015 19:37:18 +0300
Subject: [PATCH 1/2] For
 https://github.com/intersystems-ru/webterminal/issues/41

---
 export/template.xml | 234 ++++++++++++++++++++++----------------------
 1 file changed, 117 insertions(+), 117 deletions(-)

diff --git a/export/template.xml b/export/template.xml
index 825a7ca..b95d0b6 100644
--- a/export/template.xml
+++ b/export/template.xml
@@ -20,130 +20,130 @@ How long to wait for authorization key when connection established</Description>
 <Default>5</Default>
 </Parameter>
 
-<Property name="ConstServerActionExecute">
+<Parameter name="ConstServerActionExecute">
 <Type>%Char</Type>
-<InitialExpression>"EXEC"</InitialExpression>
-</Property>
+<Default>EXEC</Default>
+</Parameter>
 
-<Property name="ConstServerActionExecuteSQL">
+<Parameter name="ConstServerActionExecuteSQL">
 <Type>%Char</Type>
-<InitialExpression>"SQL"</InitialExpression>
-</Property>
+<Default>SQL</Default>
+</Parameter>
 
-<Property name="ConstServerActionGenerateAutocomplete">
+<Parameter name="ConstServerActionGenerateAutocomplete">
 <Type>%Char</Type>
-<InitialExpression>"AC"</InitialExpression>
-</Property>
+<Default>AC</Default>
+</Parameter>
 
-<Property name="ConstServerActionTrace">
+<Parameter name="ConstServerActionTrace">
 <Type>%Char</Type>
-<InitialExpression>"TRACE"</InitialExpression>
-</Property>
+<Default>TRACE</Default>
+</Parameter>
 
-<Property name="ConstServerActionStopTraceAll">
+<Parameter name="ConstServerActionStopTraceAll">
 <Type>%Char</Type>
-<InitialExpression>"STOP_TRACE_ALL"</InitialExpression>
-</Property>
+<Default>STOP_TRACE_ALL</Default>
+</Parameter>
 
-<Property name="ConstServerActionCheckTrace">
+<Parameter name="ConstServerActionCheckTrace">
 <Type>%Char</Type>
-<InitialExpression>"CT"</InitialExpression>
-</Property>
+<Default>CT</Default>
+</Parameter>
 
-<Property name="ConstServerActionReset">
+<Parameter name="ConstServerActionReset">
 <Type>%Char</Type>
-<InitialExpression>"R"</InitialExpression>
-</Property>
+<Default>R</Default>
+</Parameter>
 
-<Property name="ConstServerActionEcho">
+<Parameter name="ConstServerActionEcho">
 <Type>%Char</Type>
-<InitialExpression>"E"</InitialExpression>
-</Property>
+<Default>E</Default>
+</Parameter>
 
-<Property name="ConstServerActionCheckUpdate">
+<Parameter name="ConstServerActionCheckUpdate">
 <Type>%Char</Type>
-<InitialExpression>"CU"</InitialExpression>
-</Property>
+<Default>CU</Default>
+</Parameter>
 
-<Property name="ConstServerActionUpdate">
+<Parameter name="ConstServerActionUpdate">
 <Type>%Char</Type>
-<InitialExpression>"U"</InitialExpression>
-</Property>
+<Default>U</Default>
+</Parameter>
 
-<Property name="ConstClientPrompt">
+<Parameter name="ConstClientPrompt">
 <Type>%String</Type>
-<InitialExpression>"PROMPT#"</InitialExpression>
-</Property>
+<Default>PROMPT#</Default>
+</Parameter>
 
-<Property name="ConstClientStartExec">
+<Parameter name="ConstClientStartExec">
 <Type>%String</Type>
-<InitialExpression>"EST#"</InitialExpression>
-</Property>
+<Default>EST#</Default>
+</Parameter>
 
-<Property name="ConstClientEndExec">
+<Parameter name="ConstClientEndExec">
 <Type>%String</Type>
-<InitialExpression>"END#"</InitialExpression>
-</Property>
+<Default>END#</Default>
+</Parameter>
 
-<Property name="ConstClientOutputMessage">
+<Parameter name="ConstClientOutputMessage">
 <Type>%String</Type>
-<InitialExpression>"O#"</InitialExpression>
-</Property>
+<Default>O#</Default>
+</Parameter>
 
-<Property name="ConstClientOutputLocalized">
+<Parameter name="ConstClientOutputLocalized">
 <Type>%String</Type>
-<InitialExpression>"OL#"</InitialExpression>
-</Property>
+<Default>OL#</Default>
+</Parameter>
 
-<Property name="ConstClientChangeNamespace">
+<Parameter name="ConstClientChangeNamespace">
 <Type>%String</Type>
-<InitialExpression>"NS#"</InitialExpression>
-</Property>
+<Default>NS#</Default>
+</Parameter>
 
-<Property name="ConstClientLoadAutocomplete">
+<Parameter name="ConstClientLoadAutocomplete">
 <Type>%String</Type>
-<InitialExpression>"AC#"</InitialExpression>
-</Property>
+<Default>AC#</Default>
+</Parameter>
 
-<Property name="ConstClientReadString">
+<Parameter name="ConstClientReadString">
 <Type>%String</Type>
-<InitialExpression>"R#"</InitialExpression>
-</Property>
+<Default>R#</Default>
+</Parameter>
 
-<Property name="ConstClientReadChar">
+<Parameter name="ConstClientReadChar">
 <Type>%String</Type>
-<InitialExpression>"RC#"</InitialExpression>
-</Property>
+<Default>RC#</Default>
+</Parameter>
 
-<Property name="ConstClientAuthorizationStatus">
+<Parameter name="ConstClientAuthorizationStatus">
 <Type>%String</Type>
-<InitialExpression>"AUTH#"</InitialExpression>
-</Property>
+<Default>AUTH#</Default>
+</Parameter>
 
-<Property name="ConstClientTrace">
+<Parameter name="ConstClientTrace">
 <Type>%String</Type>
-<InitialExpression>"TRACE#"</InitialExpression>
-</Property>
+<Default>TRACE#</Default>
+</Parameter>
 
-<Property name="ConstClientStopTrace">
+<Parameter name="ConstClientStopTrace">
 <Type>%String</Type>
-<InitialExpression>"STOP_TRACE#"</InitialExpression>
-</Property>
+<Default>STOP_TRACE#</Default>
+</Parameter>
 
-<Property name="ConstClientLoginInfo">
+<Parameter name="ConstClientLoginInfo">
 <Type>%String</Type>
-<InitialExpression>"I#"</InitialExpression>
-</Property>
+<Default>I#</Default>
+</Parameter>
 
-<Property name="ConstClientClearScreen">
+<Parameter name="ConstClientClearScreen">
 <Type>%String</Type>
-<InitialExpression>"CLRSCR#"</InitialExpression>
-</Property>
+<Default>CLRSCR#</Default>
+</Parameter>
 
-<Property name="ConstClientPromptUpdate">
+<Parameter name="ConstClientPromptUpdate">
 <Type>%String</Type>
-<InitialExpression>"PROMPT_UPDATE#"</InitialExpression>
-</Property>
+<Default>PROMPT_UPDATE#</Default>
+</Parameter>
 
 <UDLText name="T">
 <Content><![CDATA[
@@ -437,7 +437,7 @@ Returns status of this operation</Description>
             set ..Watches = ..Watches _ $LISTBUILD(name)
             set ..WatchesCaret(name,0) = $QUERY(@name@(""),-1) // last
             set ..WatchesCaret(name,1) = "?"
-            do ..SendData(name, ..ConstClientTrace)
+            do ..SendData(name, ..#ConstClientTrace)
             q 1
         }
     } else { // watch file
@@ -446,7 +446,7 @@ Returns status of this operation</Description>
             set file = ##class(%File).%New(name)
             set ..WatchesCaret(name,0) = file.Size // current watch cursor position
             set ..WatchesCaret(name,1) = file.DateModified
-            do ..SendData(name, ..ConstClientTrace)
+            do ..SendData(name, ..#ConstClientTrace)
             q 1
         }
     }
@@ -469,7 +469,7 @@ Returns success status</Description>
     set ..Watches = $LISTFROMSTRING($EXTRACT(newWatches, 2, *-1), s)
     if (watches '= newWatches) {
         k ..WatchesCaret(name) // really removed
-        do ..SendData(name, ..ConstClientStopTrace)
+        do ..SendData(name, ..#ConstClientStopTrace)
     }
     quit watches '= newWatches
 ]]></Implementation>
@@ -635,11 +635,11 @@ system classes generates one time and forever.
 <Implementation><![CDATA[
     set trueNs = $case(genSystem, 1:"%", :namespace)
 
-    do ..SendData("29", ..ConstClientOutputLocalized)
+    do ..SendData("29", ..#ConstClientOutputLocalized)
     do ..SendData(" " _ trueNs _ $C(13, 10))
 
     if ('##class(%SYS.Namespace).Exists(namespace)) {
-        do ..SendData("30", ..ConstClientOutputLocalized)
+        do ..SendData("30", ..#ConstClientOutputLocalized)
         do ..SendData(" " _ namespace _ $C(13, 10))
         quit $$$NOTOK
     }
@@ -671,7 +671,7 @@ system classes generates one time and forever.
     */
 
     do ..SendData($C(13, 10))
-    do ..SendData("32", ..ConstClientOutputLocalized)
+    do ..SendData("32", ..#ConstClientOutputLocalized)
 
     set ac = "{""class"":{" // string with autocomplete
     set first = ""
@@ -728,9 +728,9 @@ system classes generates one time and forever.
     set ^%WebTerminal.Autocomplete(trueNs) = ac
 
     do ..SendData($C(13, 10))
-    do ..SendData("33", ..ConstClientOutputLocalized)
+    do ..SendData("33", ..#ConstClientOutputLocalized)
     do ..SendData($C(13, 10))
-    //do ..SendData(namespace, ..ConstClientLoadAutocomplete)
+    //do ..SendData(namespace, ..#ConstClientLoadAutocomplete)
 
     quit $$$OK
 ]]></Implementation>
@@ -754,7 +754,7 @@ Function sends data derectly to server with specified action</Description>
 <FormalSpec>query:%String="",action:%String=""</FormalSpec>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
-    if (action = "") { set action = ..ConstClientOutputMessage }
+    if (action = "") { set action = ..#ConstClientOutputMessage }
     do ..Write(action _ query)
 ]]></Implementation>
 </Method>
@@ -788,7 +788,7 @@ Sends to client new namespace if last was changed</Description>
 <Implementation><![CDATA[
     if (..CurrentNamespace '= $Znspace) { // change client namespace
         set ..CurrentNamespace = $Znspace
-        do ..SendData(..CurrentNamespace,..ConstClientChangeNamespace)
+        do ..SendData(..CurrentNamespace,..#ConstClientChangeNamespace)
     }
 ]]></Implementation>
 </Method>
@@ -798,7 +798,7 @@ Sends to client new namespace if last was changed</Description>
 Starts clear I/O mode</Description>
 <Implementation><![CDATA[
     write *-3
-    do ..Write(..ConstClientStartExec)
+    do ..Write(..#ConstClientStartExec)
     write *-3
     do ##class(%Device).ReDirectIO($$$YES)
 ]]></Implementation>
@@ -810,7 +810,7 @@ Ends clear I/O mode</Description>
 <Implementation><![CDATA[
     //write *-3
     do ##class(%Device).ReDirectIO($$$NO)
-    do ..SendData("",..ConstClientEndExec)
+    do ..SendData("",..#ConstClientEndExec)
     write *-3
 ]]></Implementation>
 </Method>
@@ -834,7 +834,7 @@ This method transforms error </Description>
 <Implementation><![CDATA[
     set httprequest = ##class(%Net.HttpRequest).%New()
     set httprequest.Server = "intersystems-ru.github.io"
-    do ..SendData("34", ..ConstClientOutputLocalized)
+    do ..SendData("34", ..#ConstClientOutputLocalized)
     do ..SendData(" http://intersystems-ru.github.io/webterminal/files/WebTerminal-"
         _ version _ ".xml ")
     do httprequest.Get("/webterminal/files/WebTerminal-" _ version _ ".xml")
@@ -846,7 +846,7 @@ This method transforms error </Description>
     do ..SendData($C(27)_"[32mOK" _ $C(27) _ "[0m")
     if ($isobject(httprequest.HttpResponse.Data)) {
         do ..SendData($C(13,10))
-        do ..SendData("35", ..ConstClientOutputLocalized)
+        do ..SendData("35", ..#ConstClientOutputLocalized)
         do ..SendData($C(13,10))
         set stload = $system.OBJ.LoadStream(httprequest.HttpResponse.Data,"",.error,.items)
         if $$$ISERR(stload) { do ..SendData(System.Status.GetErrorText(stload)) quit $$$NOTOK }
@@ -873,7 +873,7 @@ This method transforms error </Description>
         quit $$$NOTOK
     }
     if ($isobject(httprequest.HttpResponse.Data)) {
-        do ..SendData(httprequest.HttpResponse.Data.Read(), ..ConstClientPromptUpdate)
+        do ..SendData(httprequest.HttpResponse.Data.Read(), ..#ConstClientPromptUpdate)
     }
     quit $$$OK
 ]]></Implementation>
@@ -977,7 +977,7 @@ Main method for every new client.</Description>
 
     kill // clear junk vars
 
-    do ..SendData($NAMESPACE, ..ConstClientPrompt)
+    do ..SendData($NAMESPACE, ..#ConstClientPrompt)
 
     for {
 
@@ -986,7 +986,7 @@ Main method for every new client.</Description>
         if $$$ISERR(status) {
 
             try {
-                do ..SendData("40", ..ConstClientOutputLocalized)
+                do ..SendData("40", ..#ConstClientOutputLocalized)
             } catch e { }
             quit:($$$GETERRORCODE(status)=$$$CSPWebSocketClosed)
 
@@ -996,78 +996,78 @@ Main method for every new client.</Description>
         set action = $EXTRACT(data, 1, pos-2)
         set data = $EXTRACT(data, pos, *)
 
-        if (action = ..ConstServerActionExecute) {
+        if (action = ..#ConstServerActionExecute) {
 
             do ..ExecuteCommand(data)
-            do ..SendData($NAMESPACE, ..ConstClientPrompt)
+            do ..SendData($NAMESPACE, ..#ConstClientPrompt)
 
-        } elseif (action = ..ConstServerActionCheckTrace) {
+        } elseif (action = ..#ConstServerActionCheckTrace) {
 
             set changes = ..CheckTracing()
             if (changes '= "") {
                 do ..SendData(changes)
             }
 
-        } elseif (action = ..ConstServerActionTrace) { // add/remove
+        } elseif (action = ..#ConstServerActionTrace) { // add/remove
 
             set result = ..Trace(data)
             if ('$$$ISOK(result)) {
                 set result = ..StopTracing(data)
                 if ('$$$ISOK(result)) {
-                    do ..SendData("!" _ data, ..ConstClientTrace)
+                    do ..SendData("!" _ data, ..#ConstClientTrace)
                 }
             }
-            do ..SendData($NAMESPACE, ..ConstClientPrompt)
+            do ..SendData($NAMESPACE, ..#ConstClientPrompt)
 
-        } elseif (action = ..ConstServerActionStopTraceAll) { // add/remove
+        } elseif (action = ..#ConstServerActionStopTraceAll) { // add/remove
 
             for i=1:1:$LISTLENGTH(..Watches) {
                 d ..StopTracing($LIST(..Watches, i))
             }
-            do ..SendData($NAMESPACE, ..ConstClientPrompt)
+            do ..SendData($NAMESPACE, ..#ConstClientPrompt)
 
-        } elseif (action = ..ConstServerActionExecuteSQL) { // sql
+        } elseif (action = ..#ConstServerActionExecuteSQL) { // sql
 
             do ..ExecuteSQL(data)
-            do ..SendData($NAMESPACE, ..ConstClientPrompt)
+            do ..SendData($NAMESPACE, ..#ConstClientPrompt)
 
-        } elseif (action = ..ConstServerActionGenerateAutocomplete) {
+        } elseif (action = ..#ConstServerActionGenerateAutocomplete) {
 
             // data shows if system classes required
 
             if ('..AutocompleteExists("%")) || (data = "1") {
                 do ..GenerateAutocomplete("%SYS", 1)
-                do ..SendData("%", ..ConstClientLoadAutocomplete)
+                do ..SendData("%", ..#ConstClientLoadAutocomplete)
             }
             do ..GenerateAutocomplete(..CurrentNamespace, 0)
-            do ..SendData(..CurrentNamespace, ..ConstClientLoadAutocomplete)
+            do ..SendData(..CurrentNamespace, ..#ConstClientLoadAutocomplete)
 
-        } elseif (action = ..ConstServerActionReset) {
+        } elseif (action = ..#ConstServerActionReset) {
 
             do ..Reset()
-            do ..SendData($NAMESPACE, ..ConstClientPrompt)
+            do ..SendData($NAMESPACE, ..#ConstClientPrompt)
 
-        } elseif (action = ..ConstServerActionEcho) {
+        } elseif (action = ..#ConstServerActionEcho) {
 
             do ..StartClearIO()
             write data
             do ..EndClearIO()
-            do ..SendData($NAMESPACE, ..ConstClientPrompt)
+            do ..SendData($NAMESPACE, ..#ConstClientPrompt)
 
-        } elseif (action = ..ConstServerActionCheckUpdate) {
+        } elseif (action = ..#ConstServerActionCheckUpdate) {
 
             do ..CheckUpdate()
 
-        } elseif (action = ..ConstServerActionUpdate) {
+        } elseif (action = ..#ConstServerActionUpdate) {
 
             do ..Update(data)
-            do ..SendData("39", ..ConstClientOutputLocalized)
+            do ..SendData("39", ..#ConstClientOutputLocalized)
 
         } else { // something scary
 
-            do ..SendData("38", ..ConstClientOutputLocalized)
+            do ..SendData("38", ..#ConstClientOutputLocalized)
             do ..SendData(" " _ action)
-            do ..SendData($NAMESPACE, ..ConstClientPrompt)
+            do ..SendData($NAMESPACE, ..#ConstClientPrompt)
 
         }
 
@@ -1086,15 +1086,15 @@ New connection established: require auth key, login and start client loop.</Desc
 
         set ..CurrentNamespace = $Znspace
 
-        do ..SendData("1", ..ConstClientAuthorizationStatus)
-        do ..SendData(..CurrentNamespace, ..ConstClientChangeNamespace)
+        do ..SendData("1", ..#ConstClientAuthorizationStatus)
+        do ..SendData(..CurrentNamespace, ..#ConstClientChangeNamespace)
 
         use $io:(/NOXY:/BREAK):"^" _ ..InitialZName
         do ..ClientLoop()
 
     } else {
 
-        do ..SendData("0", ..ConstClientAuthorizationStatus)
+        do ..SendData("0", ..#ConstClientAuthorizationStatus)
         do ..EndServer()
 
     }

From e8590f25d3f9ac5f87f6e89604ddd935832af046 Mon Sep 17 00:00:00 2001
From: eduard93 <lebeduk93@gmail.com>
Date: Sun, 13 Dec 2015 14:31:13 +0300
Subject: [PATCH 2/2] $System usage unification

---
 export/template.xml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/export/template.xml b/export/template.xml
index b95d0b6..72f6318 100644
--- a/export/template.xml
+++ b/export/template.xml
@@ -848,10 +848,10 @@ This method transforms error </Description>
         do ..SendData($C(13,10))
         do ..SendData("35", ..#ConstClientOutputLocalized)
         do ..SendData($C(13,10))
-        set stload = $system.OBJ.LoadStream(httprequest.HttpResponse.Data,"",.error,.items)
-        if $$$ISERR(stload) { do ..SendData(System.Status.GetErrorText(stload)) quit $$$NOTOK }
-        set st2 = $system.OBJ.CompileList(.items)
-        if $$$ISERR(st2) { do ..SendData(System.Status.GetErrorText(st2)) quit $$$NOTOK }
+        set stload = $System.OBJ.LoadStream(httprequest.HttpResponse.Data,"",.error,.items)
+        if $$$ISERR(stload) { do ..SendData($System.Status.GetErrorText(stload)) quit $$$NOTOK }
+        set st2 = $System.OBJ.CompileList(.items)
+        if $$$ISERR(st2) { do ..SendData($System.Status.GetErrorText(st2)) quit $$$NOTOK }
         if $$$ISERR(error) {
             do ..SendData($C(27)_"[31mFAILED" _ $C(27) _ "[0m" _ $C(13,10))
             quit $$$NOTOK
@@ -942,7 +942,7 @@ the client - it includes authorization key.</Description>
             continue:($order(userProps("")) = "")
 
             set namespace = $case(namespace, "":userProps("NameSpace"), :namespace)
-            set loginStatus = ##class(%SYSTEM.Security).Login(username) // login user
+            set loginStatus = $System.Security.Login(username) // login user
 
             kill ^%WebTerminal.AuthUser(key)
 
@@ -952,7 +952,7 @@ the client - it includes authorization key.</Description>
 
         // kill "old" auth tickets
         set time = $LISTGET(lb, 2)
-        if (time '= "") && ($SYSTEM.SQL.DATEDIFF("s", time, $h) > 100) { // if older than 100 sec
+        if (time '= "") && ($System.SQL.DATEDIFF("s", time, $h) > 100) { // if older than 100 sec
             kill ^%WebTerminal.AuthUser(key)
         }
 
@@ -1163,7 +1163,7 @@ This method is invoked when a class is compiled.</Description>
         set Properties("TempGlobals") = "CACHETEMP"
         set status = ##Class(Config.Namespaces).Create("%All", .Properties)
         if ($$$ISERR(status)) {
-            do $SYSTEM.Status.DisplayError(status)
+            do $System.Status.DisplayError(status)
             quit status
         } else {
             w !, "%All namespace is created."