instantobjects-cvscommit

[Carlo B. <car...@us...>]

Update of /cvsroot/instantobjects/Source/Brokers/XML
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7129/Source/Brokers/XML

Modified Files:
	InstantXML.pas InstantXMLConnectionDefEdit.pas 
Log Message:
Bug fixing for D5: Application.HandleException

Index: InstantXML.pas
===================================================================
RCS file: /cvsroot/instantobjects/Source/Brokers/XML/InstantXML.pas,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** InstantXML.pas	21 Mar 2005 02:33:06 -0000	1.4
--- InstantXML.pas	5 Jun 2005 20:30:00 -0000	1.5
***************
*** 29,44 ****
  unit InstantXML;
  
! {$I InstantDefines.inc}
  
  interface
  
  uses
- {$IFDEF MSWINDOWS}
-   FileCtrl,
- {$ENDIF}
    Classes, DB, InstantPersistence, InstantCommand, Contnrs;
  
  const
!   XMLHEADER = '<?xml version="1.0" encoding="UTF-8"?>';
    XML_EXT = 'xml';
    DOT_XML_EXT = '.'+XML_EXT;
--- 29,42 ----
  unit InstantXML;
  
! {$I ../../Core/InstantDefines.inc}
  
  interface
  
  uses
    Classes, DB, InstantPersistence, InstantCommand, Contnrs;
  
  const
!   XML_UTF8_HEADER = '<?xml version="1.0" encoding="UTF-8"?>';
!   XML_ISO_HEADER = '<?xml version="1.0" encoding="ISO-8859-1"?>';
    XML_EXT = 'xml';
    DOT_XML_EXT = '.'+XML_EXT;
***************
*** 218,223 ****
  
  uses
-   InstantXMLConnectionDefEdit, InstantPresentation,
    SysUtils, InstantConsts, InstantClasses, TypInfo,
  {$IFDEF MSWINDOWS}
    Controls;
--- 216,221 ----
  
  uses
    SysUtils, InstantConsts, InstantClasses, TypInfo,
+   InstantXMLConnectionDefEdit,
  {$IFDEF MSWINDOWS}
    Controls;
***************
*** 579,583 ****
    StorageName : string;
  begin
-   { TODO: Build database from Scheme }
    CheckConnection;
    //build RootFolder if not exists
--- 577,580 ----
***************
*** 918,940 ****
    strstream: TStringStream;
    fileStream: TFileStream;
!   strUtf8: string;
  begin
    strstream := TStringStream.Create('');
    try
-     strStream.Write(XMLHEADER, Length(XMLHEADER));
      InstantWriteObject(strStream, sfXML, AObject);
  {$IFNDEF VER130}
      if FXMLFileFormat in [xffUtf8, xffUtf8Bot] then
!       strUtf8 := AnsiToUtf8 (strStream.DataString);
  {$ELSE}
!     strUtf8 := strStream.DataString;
  {$ENDIF}
    finally
      strStream.Free;
    end;
- 
    fileStream := TFileStream.Create(FileName, fmCreate);
    try
!     Result := fileStream.Write (strUtf8[1], Length (strUtf8)) <> 0;
    finally
      fileStream.Free;
--- 915,937 ----
    strstream: TStringStream;
    fileStream: TFileStream;
!   DataStr : string;
  begin
    strstream := TStringStream.Create('');
    try
      InstantWriteObject(strStream, sfXML, AObject);
  {$IFNDEF VER130}
      if FXMLFileFormat in [xffUtf8, xffUtf8Bot] then
!       DataStr := AnsiToUtf8(XML_UTF8_HEADER+strStream.DataString)
!     else
!       DataStr := XML_ISO_HEADER+strStream.DataString;
  {$ELSE}
!     DataStr := strStream.DataString;
  {$ENDIF}
    finally
      strStream.Free;
    end;
    fileStream := TFileStream.Create(FileName, fmCreate);
    try
!     Result := fileStream.Write (DataStr[1], Length (DataStr)) <> 0;
    finally
      fileStream.Free;

Index: InstantXMLConnectionDefEdit.pas
===================================================================
RCS file: /cvsroot/instantobjects/Source/Brokers/XML/InstantXMLConnectionDefEdit.pas,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** InstantXMLConnectionDefEdit.pas	21 Mar 2005 02:32:47 -0000	1.3
--- InstantXMLConnectionDefEdit.pas	5 Jun 2005 20:30:00 -0000	1.4
***************
*** 28,33 ****
  
  unit InstantXMLConnectionDefEdit;
  
! {$I InstantDefines.inc}
  
  interface
--- 28,36 ----
  
  unit InstantXMLConnectionDefEdit;
+ {$IFNDEF VER130}
+ {$WARN UNIT_PLATFORM OFF}
+ {$ENDIF}
  
! {$I ../../Core/InstantDefines.inc}
  
  interface
***************
*** 39,43 ****
  {$ENDIF}
  {$IFDEF LINUX}
!   QForms, QStdCtrls, QControls, QExtCtrls, QDialogs;
  {$ENDIF}
  
--- 42,46 ----
  {$ENDIF}
  {$IFDEF LINUX}
!   QForms, QStdCtrls, QControls, QExtCtrls;
  {$ENDIF}
  
***************
*** 73,79 ****
  {$R *.dfm}
  
- {$IFDEF MSWINDOWS}
  uses
    FileCtrl;
  {$ENDIF}
  
--- 76,84 ----
  {$R *.dfm}
  
  uses
+ {$IFDEF MSWINDOWS}
    FileCtrl;
+ {$ELSE}
+   QDialogs;
  {$ENDIF}