From 492c0d58d85d90768722a93e8a01c7515d7d1e27 Mon Sep 17 00:00:00 2001 From: michael Date: Sat, 9 Mar 2019 20:01:27 +0000 Subject: [PATCH] * Use exposed TDOMWriter to create reduced XML (non-humanreadable) git-svn-id: trunk@41664 - --- packages/fcl-web/src/restbridge/sqldbrestado.pp | 16 +++++++++++++++- packages/fcl-web/src/restbridge/sqldbrestcds.pp | 14 ++++++++++++++ packages/fcl-web/src/restbridge/sqldbrestxml.pp | 16 +++++++++++++++- 3 files changed, 44 insertions(+), 2 deletions(-) diff --git a/packages/fcl-web/src/restbridge/sqldbrestado.pp b/packages/fcl-web/src/restbridge/sqldbrestado.pp index 7347c02634..1ea04fa378 100644 --- a/packages/fcl-web/src/restbridge/sqldbrestado.pp +++ b/packages/fcl-web/src/restbridge/sqldbrestado.pp @@ -195,7 +195,21 @@ end; procedure TADOOutputStreamer.FinalizeOutput; begin - xmlwrite.WriteXML(FXML,Stream); +{$IFNDEF VER3_0} + if Not (ooHumanReadable in OutputOptions) then + begin + With TDOMWriter.Create(Stream,FXML) do + try + LineBreak:=''; + IndentSize:=0; + WriteNode(FXML); + finally + Free; + end; + end + else +{$ENDIF} + xmlwrite.WriteXML(FXML,Stream); FreeAndNil(FXML); end; diff --git a/packages/fcl-web/src/restbridge/sqldbrestcds.pp b/packages/fcl-web/src/restbridge/sqldbrestcds.pp index 7549c753dd..5043cd595c 100644 --- a/packages/fcl-web/src/restbridge/sqldbrestcds.pp +++ b/packages/fcl-web/src/restbridge/sqldbrestcds.pp @@ -241,6 +241,20 @@ end; procedure TCDSOutputStreamer.FinalizeOutput; begin +{$IFNDEF VER3_0} + if Not (ooHumanReadable in OutputOptions) then + begin + With TDOMWriter.Create(Stream,FXML) do + try + LineBreak:=''; + IndentSize:=0; + WriteNode(FXML); + finally + Free; + end; + end + else +{$ENDIF} xmlwrite.WriteXML(FXML,Stream); FreeAndNil(FXML); end; diff --git a/packages/fcl-web/src/restbridge/sqldbrestxml.pp b/packages/fcl-web/src/restbridge/sqldbrestxml.pp index 3231d254f6..f3e0b6b9ab 100644 --- a/packages/fcl-web/src/restbridge/sqldbrestxml.pp +++ b/packages/fcl-web/src/restbridge/sqldbrestxml.pp @@ -198,7 +198,21 @@ end; procedure TXMLOutputStreamer.FinalizeOutput; begin - xmlwrite.WriteXML(FXML,Stream); +{$IFNDEF VER3_0} + if Not (ooHumanReadable in OutputOptions) then + begin + With TDOMWriter.Create(Stream,FXML) do + try + LineBreak:=''; + IndentSize:=0; + WriteNode(FXML); + finally + Free; + end; + end + else +{$ENDIF} + xmlwrite.WriteXML(FXML,Stream); FreeAndNil(FXML); end;