instantobjects-cvscommit

[Instantobjects-cvscommit] SF.net SVN: instantobjects:[814] trunk/Source/Brokers/XML/InstantXML.pas

[<na...@us...>]

Revision: 814
          http://instantobjects.svn.sourceforge.net/instantobjects/revision/?rev=814&view=rev
Author:   nandod
Date:     2009-08-05 11:44:58 +0000 (Wed, 05 Aug 2009)

Log Message:
-----------
- unused routine.

Modified Paths:
--------------
    trunk/Source/Brokers/XML/InstantXML.pas

Modified: trunk/Source/Brokers/XML/InstantXML.pas
===================================================================
--- trunk/Source/Brokers/XML/InstantXML.pas	2009-08-05 10:57:00 UTC (rev 813)
+++ trunk/Source/Brokers/XML/InstantXML.pas	2009-08-05 11:44:58 UTC (rev 814)
@@ -1182,17 +1182,6 @@
 end;
 {$ENDIF}
 
-function RemoveXmlDeclaration(const xmlString: string): string;
-var
-  nPos: Integer;
-begin
-  nPos := Pos('<?xml', xmlString);
-  if nPos > 0 then
-    Result := Copy(xmlString, Pos('?>', xmlString) + 2, maxint)
-  else
-    Result := xmlString;
-end;
-
 {$IFDEF UNICODE}
 function TXMLFilesAccessor.LoadInstantObjectFromXmlFile(
   const AObject: TInstantObject; const AObjectId, AFileName: string): Boolean;

[Instantobjects-cvscommit] SF.net SVN: instantobjects:[906] trunk/Source/Brokers/XML/InstantXML.pas

[<na...@us...>]

Revision: 906
          http://instantobjects.svn.sourceforge.net/instantobjects/revision/?rev=906&view=rev
Author:   nandod
Date:     2010-09-12 06:20:52 +0000 (Sun, 12 Sep 2010)

Log Message:
-----------
* Fix for XML broker that would duplicate a file on disk if an object changed its Id.

Modified Paths:
--------------
    trunk/Source/Brokers/XML/InstantXML.pas

Modified: trunk/Source/Brokers/XML/InstantXML.pas
===================================================================
--- trunk/Source/Brokers/XML/InstantXML.pas	2010-09-11 16:51:00 UTC (rev 905)
+++ trunk/Source/Brokers/XML/InstantXML.pas	2010-09-12 06:20:52 UTC (rev 906)
@@ -1272,6 +1272,12 @@
 function TXMLFilesAccessor.WriteInstantObject(const AObject: TInstantObject;
   const AStorageName: string; out AObjectUpdateCount: Integer): Boolean;
 begin
+  // Get rid of the previous file if the object already existed and has
+  // changed Id.
+  if (AObject.PersistentId <> '') and AObject.IsIdChanged then
+    DeleteInstantObjectXmlFile(AObject,
+      GetObjectFileName(AStorageName, AObject.ClassName, AObject.PersistentId));
+
   Result := InternalWriteInstantObject(AObject, AStorageName,
     AObjectUpdateCount);
 end;

[Instantobjects-cvscommit] SF.net SVN: instantobjects:[960] trunk/Source/Brokers/XML/InstantXML.pas

[<na...@us...>]

Revision: 960
          http://instantobjects.svn.sourceforge.net/instantobjects/revision/?rev=960&view=rev
Author:   nandod
Date:     2012-10-29 20:37:39 +0000 (Mon, 29 Oct 2012)
Log Message:
-----------
* XML Broker: don't allow opening files that are being written to.

Modified Paths:
--------------
    trunk/Source/Brokers/XML/InstantXML.pas

Modified: trunk/Source/Brokers/XML/InstantXML.pas
===================================================================
--- trunk/Source/Brokers/XML/InstantXML.pas	2012-07-19 05:10:42 UTC (rev 959)
+++ trunk/Source/Brokers/XML/InstantXML.pas	2012-10-29 20:37:39 UTC (rev 960)
@@ -327,6 +327,9 @@
 uses
   SysUtils, InstantConsts,
   TypInfo, InstantXMLCatalog, InstantXMLConnectionDefEdit, InstantUtils,
+{$IFDEF D17+}
+  System.Types,
+{$ENDIF}
 {$IFDEF MSWINDOWS}
 {$IFNDEF D6+}
   FileCtrl,
@@ -358,6 +361,7 @@
   R: Integer;
   PathWithWildCards: string;
 begin
+  
   PathWithWildCards := IncludeTrailingPathDelimiter(Path) + XML_WILDCARD;
   //Find the first file
   R := SysUtils.FindFirst(PathWithWildCards, faAnyFile, SearchRec);
@@ -1200,7 +1204,7 @@
 begin
   if FileExists(AFileName) then
   begin
-    fileStream := TFileStream.Create(AFileName, fmOpenRead);
+    fileStream := TFileStream.Create(AFileName, fmShareDenyWrite);
     try
       InstantReadObject(fileStream, sfXML, AObject);
       Result := True;
@@ -1219,7 +1223,7 @@
   strUtf8: string;
   strstream: TStringStream;
 begin
-  fileStream := TFileStream.Create(AFileName, fmOpenRead);
+  fileStream := TFileStream.Create(AFileName, fmShareDenyWrite);
   try
     SetLength(strUtf8, fileStream.Size);
     Result := fileStream.Read(strUtf8[1], fileStream.Size) <> 0;