0: xml logger should expand return properly.

remobjects · Apr 18, 2012 · d49f019 · d49f019
1 parent eb5379e
commit d49f019
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 4 deletions.
diff --git a/RemObjects.Train/API/Logging.pas b/RemObjects.Train/API/Logging.pas
@@ -85,6 +85,7 @@ interface
     method LogInfo(s: String); locked;
     method Enter(aImportant: Boolean := false; aScript: String; params args: array of Object);locked;
     method &Exit(aImportant: Boolean := false; aScript: String; aFailMode: FailMode; aResult: Object);locked;
+    class method MyToString(s: Object): String;
   end;
 
 
@@ -201,7 +202,7 @@ constructor XmlLogger(aTargetXML, aTargetHTML, aXSLT: String);
   else '0';
   end));
   if (aResult <> nil) and (aResult <> Undefined.Instance) then
-    fXmlData.Add(new XElement('return', aResult:ToString));
+    fXmlData.Add(new XElement('return', Filter(MyToString(aResult))));
   fXmlData := fXmlData.Parent;
 end;
 
@@ -258,6 +259,16 @@ constructor BaseXmlLogger;
   FindFailNodes(var lFailElement, fXmlData.Document.Root.Elements);
 end;
 
+class method BaseXmlLogger.MyToString(s: Object): String;
+begin
+  if s = nil then exit '';
+  if s is array of Object then 
+    exit String.Join(', ', array of Object(s).Select(a->MyToString(a)).ToArray);
+  if s is EcmaScriptObject then  
+    exit coalesce(EcmaScriptObject(s).Root.JSONStringify(EcmaScriptObject(s).Root.ExecutionContext, nil, s):ToString, '');
+  exit s.ToString;
+end;
+
 constructor MultiLogger;
 begin
 

diff --git a/RemObjects.Train/API/MSBuild.pas b/RemObjects.Train/API/MSBuild.pas
@@ -144,7 +144,7 @@ implementation
     end;
    end ,a-> begin
     if not String.IsNullOrEmpty(a) then begin
-      if a.StartsWith('MSBUILD : error') then
+      if a.Contains(': error ') then
         lTmp.LogError(a);
       locking lOutput do lOutput.AppendLine(a);
     end;
@@ -236,7 +236,7 @@ implementation
     end;
    end ,a-> begin
     if not String.IsNullOrEmpty(a) then begin
-      if a.StartsWith('MSBUILD : error') then
+      if a.Contains(': error ') then
         lTmp.LogError(a);
       locking lOutput do lOutput.AppendLine(a);
     end;

diff --git a/RemObjects.Train/API/Wrapper.pas b/RemObjects.Train/API/Wrapper.pas
@@ -114,7 +114,7 @@ constructor Wrapper(aServices: IApiRegistrationServices; aMethod: System.Reflect
     end;
   finally
     if not String.IsNullOrEmpty(fWrapInfo.LogName) then
-      fServices.Logger.Exit(fWrapInfo.Important, fWrapInfo.LogName, if lFail then RemObjects.Train.FailMode.Yes else RemObjects.Train.FailMode.No, aArgs );
+      fServices.Logger.Exit(fWrapInfo.Important, fWrapInfo.LogName, if lFail then RemObjects.Train.FailMode.Yes else RemObjects.Train.FailMode.No, result);
   end;
 end;