instantobjects-cvscommit

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

Update of /cvsroot/instantobjects/Demos/PrimerCross
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14776/Demos/PrimerCross

Modified Files:
	BasicView.pas ContactView.dfm PerformanceView.dfm 
	PerformanceView.pas Primer.cfg Primer.dof Primer.dpr 
	Primer.tst 
Added Files:
	Primer.xml PrimerExternal.dof PrimerExternal.xml 
Log Message:
Primer Demo: simplified compile and run for beginners

Index: PerformanceView.pas
===================================================================
RCS file: /cvsroot/instantobjects/Demos/PrimerCross/PerformanceView.pas,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** PerformanceView.pas	7 Dec 2004 08:45:33 -0000	1.5
--- PerformanceView.pas	10 Feb 2005 13:04:25 -0000	1.6
***************
*** 24,28 ****
  
  type
!   TMeasureType = (mtStore, mtRetrieve, mtDispose);
  
    TTestResult = class(TInstantCollectionItem)
--- 24,28 ----
  
  type
!   TMeasureType = (mtStore, mtRetrieve, mtQuery, mtDispose);
  
    TTestResult = class(TInstantCollectionItem)
***************
*** 72,81 ****
      procedure BeginMeasure;
      procedure EndMeasure(MeasureType: TMeasureType; Count: Integer);
!     procedure Run(Retrieve, Dispose : boolean); virtual; abstract;
      property Stopwatch: TStopwatch read GetStopwatch;
      property TestResult: TTestResult read GetTestResult;
    public
      destructor Destroy; override;
!     procedure Execute(Retrieve, Dispose : boolean);
      function ExtractResult: TTestResult;
      property OnShowStatus: TShowStatusEvent read FOnShowStatus write FOnShowStatus;
--- 72,81 ----
      procedure BeginMeasure;
      procedure EndMeasure(MeasureType: TMeasureType; Count: Integer);
!     procedure Run(Retrieve, Query, Dispose : boolean); virtual; abstract;
      property Stopwatch: TStopwatch read GetStopwatch;
      property TestResult: TTestResult read GetTestResult;
    public
      destructor Destroy; override;
!     procedure Execute(Retrieve, Query, Dispose : boolean);
      function ExtractResult: TTestResult;
      property OnShowStatus: TShowStatusEvent read FOnShowStatus write FOnShowStatus;
***************
*** 92,98 ****
      procedure TestRetrieve;
      procedure TestDispose;
      procedure Operation(Method: TMethod);
    protected
!     procedure Run(Retrieve, Dispose : boolean); override;
      property ObjectList: TStringList read GetObjectList;
    public
--- 92,99 ----
      procedure TestRetrieve;
      procedure TestDispose;
+     procedure TestQuery;
      procedure Operation(Method: TMethod);
    protected
!     procedure Run(Retrieve, Query, Dispose : boolean); override;
      property ObjectList: TStringList read GetObjectList;
    public
***************
*** 122,130 ****
      TestResultRenameItem: TMenuItem;
      TransactionsCheckBox: TCheckBox;
-     PreparedQueryCheckBox: TCheckBox;
      NumberLabel: TLabel;
      ObjectsEdit: TMaskEdit;
      TestRetrieveCheckBox: TCheckBox;
      TestDisposeCheckBox: TCheckBox;
      procedure RunButtonClick(Sender: TObject);
      procedure TestResultListViewChange(Sender: TObject; Item: TListItem;
--- 123,133 ----
      TestResultRenameItem: TMenuItem;
      TransactionsCheckBox: TCheckBox;
      NumberLabel: TLabel;
      ObjectsEdit: TMaskEdit;
      TestRetrieveCheckBox: TCheckBox;
      TestDisposeCheckBox: TCheckBox;
+     PoolOptionsRadioGroup: TRadioGroup;
+     TestQueryCheckBox: TCheckBox;
+     Series1: TBarSeries;
      procedure RunButtonClick(Sender: TObject);
      procedure TestResultListViewChange(Sender: TObject; Item: TListItem;
***************
*** 141,145 ****
  {$ENDIF}
      procedure TransactionsCheckBoxClick(Sender: TObject);
!     procedure PreparedQueryCheckBoxClick(Sender: TObject);
      procedure TestDisposeCheckBoxClick(Sender: TObject);
      procedure TestRetrieveCheckBoxClick(Sender: TObject);
--- 144,148 ----
  {$ENDIF}
      procedure TransactionsCheckBoxClick(Sender: TObject);
!     procedure PoolOptionsRadioGroupClick(Sender: TObject);
      procedure TestDisposeCheckBoxClick(Sender: TObject);
      procedure TestRetrieveCheckBoxClick(Sender: TObject);
***************
*** 162,165 ****
--- 165,169 ----
      procedure FormCreate(Sender: TObject); override;
      procedure FormHide(Sender: TObject); override;
+     procedure FormShow(Sender: TObject); override;
      destructor Destroy; override;
      procedure UpdateControls; override;
***************
*** 264,270 ****
  end;
  
! procedure TTest.Execute(Retrieve, Dispose : boolean);
  begin
!   Run(Retrieve,Dispose);
  end;
  
--- 268,274 ----
  end;
  
! procedure TTest.Execute(Retrieve, Query, Dispose : boolean);
  begin
!   Run(Retrieve,Query,Dispose);
  end;
  
***************
*** 337,343 ****
  end;
  
! procedure TPersistenceTest.Run(Retrieve, Dispose : boolean);
  begin
!   Stopwatch.Start((1+Ord(Retrieve)+Ord(Dispose)) * Count);
    try
      //Test always store operations (necessary to test retrieve and dispose)
--- 341,347 ----
  end;
  
! procedure TPersistenceTest.Run(Retrieve, Query, Dispose : boolean);
  begin
!   Stopwatch.Start((1+Ord(Retrieve)+Ord(Query)+Ord(Dispose)) * Count);
    try
      //Test always store operations (necessary to test retrieve and dispose)
***************
*** 345,348 ****
--- 349,354 ----
      if Retrieve then
        Operation(TestRetrieve);
+     if Query then
+       Operation(TestQuery);
      if Dispose then
        Operation(TestDispose);
***************
*** 391,394 ****
--- 397,426 ----
  end;
  
+ procedure TPersistenceTest.TestQuery;
+ var
+   InstantQuery : TInstantQuery;
+   i : integer;
+ begin
+   InstantQuery := InstantDefaultConnector.CreateQuery;
+   try
+     InstantQuery.Command := 'SELECT * FROM ANY TCompany WHERE Id = :Id';
+     InstantQuery.FetchParams(InstantQuery.Command, InstantQuery.Params);
+     BeginMeasure;
+     try
+       for I := 0 to Pred(ObjectList.Count) do
+       begin
+         InstantQuery.Params.ParamByName('Id').AsString := ObjectList[I];
+         Stopwatch.Step;
+         InstantQuery.Open;
+         InstantQuery.Close;
+       end;
+     finally
+       EndMeasure(mtQuery, ObjectList.Count);
+     end;
+   finally
+     InstantQuery.Free;
+   end;
+ end;
+ 
  procedure TPersistenceTest.TestStore;
  var
***************
*** 438,444 ****
    TestResultListView.Columns[0].Width := 180;
  {$ENDIF}
- 
-   LoadTestResults;
-   ShowTestResults;
  end;
  
--- 470,473 ----
***************
*** 485,489 ****
      OnShowStatus := TestShowStatus;
      Count := StrToInt(Trim(ObjectsEdit.text));
!     Execute(TestRetrieveCheckBox.Checked, TestDisposeCheckBox.Checked);
      AResult := ExtractResult;
      AResult.Name := ConnectionName;
--- 514,518 ----
      OnShowStatus := TestShowStatus;
      Count := StrToInt(Trim(ObjectsEdit.text));
!     Execute(TestRetrieveCheckBox.Checked, TestQueryCheckBox.Checked, TestDisposeCheckBox.Checked);
      AResult := ExtractResult;
      AResult.Name := ConnectionName;
***************
*** 642,651 ****
    if Assigned(Connector) and (Connector.Broker is TInstantSQLBroker) then
    begin
!     PreparedQueryCheckBox.Visible := True;
!     PreparedQueryCheckBox.Enabled := IsConnected;
!     PreparedQueryCheckBox.Checked := IsConnected and TInstantSQLBroker(Connector.Broker).UsePreparedQuery;
    end
    else
!     PreparedQueryCheckBox.Visible := False;
  
    ConnectionLabel.Caption := 'Connection: ' + ConnectionName;
--- 671,685 ----
    if Assigned(Connector) and (Connector.Broker is TInstantSQLBroker) then
    begin
!     PoolOptionsRadioGroup.Visible := True;
!     PoolOptionsRadioGroup.Enabled := IsConnected;
!     if TInstantSQLBroker(Connector.Broker).UsePreparedQuery then
!       PoolOptionsRadioGroup.ItemIndex := 1
!     else if TInstantSQLBroker(Connector.Broker).StatementCacheCapacity <> 0 then
!       PoolOptionsRadioGroup.ItemIndex := 2
!     else
!       PoolOptionsRadioGroup.ItemIndex := 0;
    end
    else
!     PoolOptionsRadioGroup.Visible := False;
  
    ConnectionLabel.Caption := 'Connection: ' + ConnectionName;
***************
*** 659,667 ****
  end;
  
! procedure TPerformanceViewForm.PreparedQueryCheckBoxClick(Sender: TObject);
  begin
    inherited;
    if Connector.Broker is TInstantSQLBroker then
!     TInstantSQLBroker(Connector.Broker).UsePreparedQuery := PreparedQueryCheckBox.Checked;
  end;
  
--- 693,717 ----
  end;
  
! procedure TPerformanceViewForm.PoolOptionsRadioGroupClick(Sender: TObject);
  begin
    inherited;
    if Connector.Broker is TInstantSQLBroker then
!   case PoolOptionsRadioGroup.ItemIndex of
!     0 :
!     begin
!       TInstantSQLBroker(Connector.Broker).UsePreparedQuery := False;
!       TInstantSQLBroker(Connector.Broker).StatementCacheCapacity := 0;
!     end;
!     1 :
!     begin
!       TInstantSQLBroker(Connector.Broker).UsePreparedQuery := True;
!       TInstantSQLBroker(Connector.Broker).StatementCacheCapacity := 0;
!     end;
!     2 :
!     begin
!       TInstantSQLBroker(Connector.Broker).UsePreparedQuery := False;
!       TInstantSQLBroker(Connector.Broker).StatementCacheCapacity := -1;
!     end;
!   end;  
  end;
  
***************
*** 691,694 ****
--- 741,762 ----
  end;
  
+ procedure TPerformanceViewForm.FormShow(Sender: TObject);
+ begin
+   inherited;
+   Try
+     LoadTestResults;
+     ShowTestResults;
+   Except
+     On E : EReadError do
+     begin
+       ShowMessageFmt('Problems "%s" loading test results File %s: it can be in an older format!',
+         [E.Message,GetTestResultsFileName]);
+       ShowTestResults;
+     end
+     else
+       raise;
+   End;
+ end;
+ 
  initialization
    RegisterClasses([TTestResults, TTestResult]);

Index: Primer.dof
===================================================================
RCS file: /cvsroot/instantobjects/Demos/PrimerCross/Primer.dof,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Primer.dof	7 Dec 2004 08:45:33 -0000	1.4
--- Primer.dof	10 Feb 2005 13:04:33 -0000	1.5
***************
*** 95,99 ****
  PackageDLLOutputDir=
  PackageDCPOutputDir=
! SearchPath=$(DELPHI)\Lib\Debug;..\..\Source\Brokers\DBX;..\..\Source\Brokers\ADO;..\..\Source\Brokers\BDE;..\..\Source\Brokers\IBX;..\..\Source\Brokers\XML;..\..\Source\Brokers\UIB
  Packages=
  Conditionals=
--- 95,99 ----
  PackageDLLOutputDir=
  PackageDCPOutputDir=
! SearchPath=$(DELPHI)\Lib\Debug;..\..\Source\Core;..\..\Source\Brokers\DBX;..\..\Source\Brokers\ADO;..\..\Source\Brokers\BDE;..\..\Source\Brokers\IBX;..\..\Source\Brokers\XML;..\..\Source\Brokers\UIB
  Packages=
  Conditionals=
***************
*** 114,119 ****
  AutoIncBuild=0
  MajorVer=1
! MinorVer=6
! Release=7
  Build=0
  Debug=0
--- 114,119 ----
  AutoIncBuild=0
  MajorVer=1
! MinorVer=7
! Release=0
  Build=0
  Debug=0
***************
*** 127,131 ****
  CompanyName=InstantObjects.org
  FileDescription=Primer Demo
! FileVersion=1.6.7.0
  InternalName=
  LegalCopyright=MPL public license
--- 127,131 ----
  CompanyName=InstantObjects.org
  FileDescription=Primer Demo
! FileVersion=1.7.0.0
  InternalName=
  LegalCopyright=MPL public license
***************
*** 133,136 ****
  OriginalFilename=
  ProductName=
! ProductVersion=1.6.7
  Comments=
--- 133,136 ----
  OriginalFilename=
  ProductName=
! ProductVersion=1.7
  Comments=

--- NEW FILE: PrimerExternal.xml ---
<TInstantConnectionDefs>
  <TInstantIBXConnectionDef>
    <Name>FirebirdDBExternal</Name>
    <IsBuilt>TRUE</IsBuilt>
    <LoginPrompt>FALSE</LoginPrompt>
    <Path>.\FirebirdDB\PRIMERDBEXTERNAL.FDB</Path>
    <NetType>ntLocal</NetType>
    <Options>ibxUseDelimitedIdents</Options>
    <Params>User_Name=SYSDBA
Password=masterkey</Params>
  </TInstantIBXConnectionDef>
</TInstantConnectionDefs>

Index: PerformanceView.dfm
===================================================================
RCS file: /cvsroot/instantobjects/Demos/PrimerCross/PerformanceView.dfm,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** PerformanceView.dfm	23 Aug 2004 09:55:19 -0000	1.3
--- PerformanceView.dfm	10 Feb 2005 13:04:25 -0000	1.4
***************
*** 16,20 ****
        Top = 0
        Width = 745
!       Height = 113
        Align = alTop
        BevelOuter = bvNone
--- 16,20 ----
        Top = 0
        Width = 745
!       Height = 121
        Align = alTop
        BevelOuter = bvNone
***************
*** 30,34 ****
        object InfoBevel: TBevel
          Left = 0
!         Top = 104
          Width = 745
          Height = 9
--- 30,34 ----
        object InfoBevel: TBevel
          Left = 0
!         Top = 112
          Width = 745
          Height = 9
***************
*** 37,41 ****
        end
        object ConnectionLabel: TLabel
!         Left = 188
          Top = 4
          Width = 132
--- 37,41 ----
        end
        object ConnectionLabel: TLabel
!         Left = 280
          Top = 4
          Width = 132
***************
*** 86,91 ****
        end
        object NumberLabel: TLabel
!         Left = 4
!         Top = 68
          Width = 77
          Height = 13
--- 86,91 ----
        end
        object NumberLabel: TLabel
!         Left = 16
!         Top = 72
          Width = 77
          Height = 13
***************
*** 94,110 ****
        end
        object RunButton: TButton
!         Left = 404
!         Top = 68
!         Width = 73
          Height = 25
          Caption = '&Run Now'
!         TabOrder = 6
          OnClick = RunButtonClick
        end
        object InfoMemo: TMemo
          Left = 40
!         Top = 20
!         Width = 697
!         Height = 45
          TabStop = False
          Enabled = False
--- 94,110 ----
        end
        object RunButton: TButton
!         Left = 480
!         Top = 36
!         Width = 105
          Height = 25
          Caption = '&Run Now'
!         TabOrder = 7
          OnClick = RunButtonClick
        end
        object InfoMemo: TMemo
          Left = 40
!         Top = 18
!         Width = 437
!         Height = 51
          TabStop = False
          Enabled = False
***************
*** 112,179 ****
            
              'This page allows you to run a performance test on the current co' +
!             'nnection. The performance test will measure the speed of store, ' +
!             'retrieve and '
            
!             'dispose operations. Test results can be compared to other connec' +
!             'tions in the chart below.')
          ReadOnly = True
          TabOrder = 0
        end
        object TransactionsCheckBox: TCheckBox
!         Left = 233
!         Top = 68
!         Width = 140
          Height = 17
          Caption = 'Use &Transactions'
!         TabOrder = 1
          OnClick = TransactionsCheckBoxClick
        end
-       object PreparedQueryCheckBox: TCheckBox
-         Left = 233
-         Top = 84
-         Width = 140
-         Height = 17
-         Caption = 'Use &Prepared Queries'
-         TabOrder = 2
-         OnClick = PreparedQueryCheckBoxClick
-       end
        object ObjectsEdit: TMaskEdit
!         Left = 4
!         Top = 82
          Width = 73
          Height = 21
          EditMask = '#########;1; '
          MaxLength = 9
!         TabOrder = 3
          Text = '500      '
        end
        object TestRetrieveCheckBox: TCheckBox
          Left = 101
!         Top = 68
!         Width = 100
          Height = 17
          Caption = 'Test Retrieve'
          Checked = True
          State = cbChecked
!         TabOrder = 4
          OnClick = TestRetrieveCheckBoxClick
        end
        object TestDisposeCheckBox: TCheckBox
          Left = 101
!         Top = 84
!         Width = 100
          Height = 17
          Caption = 'Test Dispose'
          Checked = True
          State = cbChecked
!         TabOrder = 5
          OnClick = TestDisposeCheckBoxClick
        end
      end
      object ResultPanel: TPanel
        Left = 0
!       Top = 113
        Width = 745
!       Height = 447
        Align = alClient
        BevelOuter = bvNone
--- 112,197 ----
            
              'This page allows you to run a performance test on the current co' +
!             'nnection.'
            
!             'You can measure the speed of store, retrieve query and dispose o' +
!             'perations.'
!           
!             'Test results can be compared to other connections in the chart b' +
!             'elow.')
          ReadOnly = True
          TabOrder = 0
        end
        object TransactionsCheckBox: TCheckBox
!         Left = 479
!         Top = 16
!         Width = 112
          Height = 17
          Caption = 'Use &Transactions'
!         TabOrder = 6
          OnClick = TransactionsCheckBoxClick
        end
        object ObjectsEdit: TMaskEdit
!         Left = 16
!         Top = 86
          Width = 73
          Height = 21
          EditMask = '#########;1; '
          MaxLength = 9
!         TabOrder = 1
          Text = '500      '
        end
        object TestRetrieveCheckBox: TCheckBox
          Left = 101
!         Top = 66
!         Width = 95
          Height = 17
          Caption = 'Test Retrieve'
          Checked = True
          State = cbChecked
!         TabOrder = 2
          OnClick = TestRetrieveCheckBoxClick
        end
        object TestDisposeCheckBox: TCheckBox
          Left = 101
!         Top = 96
!         Width = 95
          Height = 17
          Caption = 'Test Dispose'
          Checked = True
          State = cbChecked
!         TabOrder = 4
          OnClick = TestDisposeCheckBoxClick
        end
+       object PoolOptionsRadioGroup: TRadioGroup
+         Left = 200
+         Top = 68
+         Width = 385
+         Height = 47
+         Caption = 'SQL brokers features'
+         Columns = 3
+         ItemIndex = 0
+         Items.Strings = (
+           'No cache'
+           'Prepared queries'
+           'Statements cache')
+         TabOrder = 5
+         OnClick = PoolOptionsRadioGroupClick
+       end
+       object TestQueryCheckBox: TCheckBox
+         Left = 101
+         Top = 81
+         Width = 95
+         Height = 17
+         Caption = 'Test Query'
+         Checked = True
+         State = cbChecked
+         TabOrder = 3
+       end
      end
      object ResultPanel: TPanel
        Left = 0
!       Top = 121
        Width = 745
!       Height = 439
        Align = alClient
        BevelOuter = bvNone
***************
*** 183,187 ****
          Top = 0
          Width = 209
!         Height = 447
          Align = alLeft
          BevelOuter = bvNone
--- 201,205 ----
          Top = 0
          Width = 209
!         Height = 439
          Align = alLeft
          BevelOuter = bvNone
***************
*** 192,196 ****
            Top = 4
            Width = 201
!           Height = 439
            Align = alClient
            Checkboxes = True
--- 210,214 ----
            Top = 4
            Width = 201
!           Height = 431
            Align = alClient
            Checkboxes = True
***************
*** 211,215 ****
          Top = 0
          Width = 536
!         Height = 447
          Align = alClient
          BevelOuter = bvNone
--- 229,233 ----
          Top = 0
          Width = 536
!         Height = 439
          Align = alClient
          BevelOuter = bvNone
***************
*** 219,223 ****
            Top = 0
            Width = 536
!           Height = 447
            BackWall.Brush.Color = clWhite
            LeftWall.Color = clWhite
--- 237,241 ----
            Top = 0
            Width = 536
!           Height = 439
            BackWall.Brush.Color = clWhite
            LeftWall.Color = clWhite
***************
*** 262,265 ****
--- 280,297 ----
              YValues.Order = loNone
            end
+           object Series1: TBarSeries
+             Marks.ArrowLength = 20
+             Marks.Visible = False
+             SeriesColor = 16744576
+             Title = 'Query'
+             XValues.DateTime = False
+             XValues.Name = 'X'
+             XValues.Multiplier = 1.000000000000000000
+             XValues.Order = loAscending
+             YValues.DateTime = False
+             YValues.Name = 'Bar'
+             YValues.Multiplier = 1.000000000000000000
+             YValues.Order = loNone
+           end
            object TestResultDisposeSeries: TBarSeries
              Marks.ArrowLength = 20

Index: Primer.tst
===================================================================
RCS file: /cvsroot/instantobjects/Demos/PrimerCross/Primer.tst,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
Binary files /tmp/cvs82fpSj and /tmp/cvsrQhoEN differ

Index: Primer.cfg
===================================================================
RCS file: /cvsroot/instantobjects/Demos/PrimerCross/Primer.cfg,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Primer.cfg	7 Dec 2004 08:45:33 -0000	1.3
--- Primer.cfg	10 Feb 2005 13:04:33 -0000	1.4
***************
*** 34,41 ****
  -LE"c:\programmi\borland\delphi7\Projects\Bpl"
  -LN"c:\programmi\borland\delphi7\Projects\Bpl"
! -U"c:\programmi\borland\delphi7\Lib\Debug;..\..\Source\Brokers\DBX;..\..\Source\Brokers\ADO;..\..\Source\Brokers\BDE;..\..\Source\Brokers\IBX;..\..\Source\Brokers\XML;..\..\Source\Brokers\UIB"
! -O"c:\programmi\borland\delphi7\Lib\Debug;..\..\Source\Brokers\DBX;..\..\Source\Brokers\ADO;..\..\Source\Brokers\BDE;..\..\Source\Brokers\IBX;..\..\Source\Brokers\XML;..\..\Source\Brokers\UIB"
! -I"c:\programmi\borland\delphi7\Lib\Debug;..\..\Source\Brokers\DBX;..\..\Source\Brokers\ADO;..\..\Source\Brokers\BDE;..\..\Source\Brokers\IBX;..\..\Source\Brokers\XML;..\..\Source\Brokers\UIB"
! -R"c:\programmi\borland\delphi7\Lib\Debug;..\..\Source\Brokers\DBX;..\..\Source\Brokers\ADO;..\..\Source\Brokers\BDE;..\..\Source\Brokers\IBX;..\..\Source\Brokers\XML;..\..\Source\Brokers\UIB"
  -w-UNIT_PLATFORM
  -w-UNSAFE_TYPE
--- 34,41 ----
  -LE"c:\programmi\borland\delphi7\Projects\Bpl"
  -LN"c:\programmi\borland\delphi7\Projects\Bpl"
! -U"c:\programmi\borland\delphi7\Lib\Debug;..\..\Source\Core;..\..\Source\Brokers\DBX;..\..\Source\Brokers\ADO;..\..\Source\Brokers\BDE;..\..\Source\Brokers\IBX;..\..\Source\Brokers\XML;..\..\Source\Brokers\UIB"
! -O"c:\programmi\borland\delphi7\Lib\Debug;..\..\Source\Core;..\..\Source\Brokers\DBX;..\..\Source\Brokers\ADO;..\..\Source\Brokers\BDE;..\..\Source\Brokers\IBX;..\..\Source\Brokers\XML;..\..\Source\Brokers\UIB"
! -I"c:\programmi\borland\delphi7\Lib\Debug;..\..\Source\Core;..\..\Source\Brokers\DBX;..\..\Source\Brokers\ADO;..\..\Source\Brokers\BDE;..\..\Source\Brokers\IBX;..\..\Source\Brokers\XML;..\..\Source\Brokers\UIB"
! -R"c:\programmi\borland\delphi7\Lib\Debug;..\..\Source\Core;..\..\Source\Brokers\DBX;..\..\Source\Brokers\ADO;..\..\Source\Brokers\BDE;..\..\Source\Brokers\IBX;..\..\Source\Brokers\XML;..\..\Source\Brokers\UIB"
  -w-UNIT_PLATFORM
  -w-UNSAFE_TYPE

Index: ContactView.dfm
===================================================================
RCS file: /cvsroot/instantobjects/Demos/PrimerCross/ContactView.dfm,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ContactView.dfm	29 Jul 2004 20:43:09 -0000	1.2
--- ContactView.dfm	10 Feb 2005 13:04:25 -0000	1.3
***************
*** 148,152 ****
            Top = 0
            Action = ExplorerAction
-           Down = True
            Style = tbsCheck
          end
--- 148,151 ----

--- NEW FILE: Primer.xml ---
<TInstantConnectionDefs>
  <TInstantBDEConnectionDef>
    <Name>ParadoxDB</Name>
    <IsBuilt>TRUE</IsBuilt>
    <BlobStreamFormat>sfXML</BlobStreamFormat>
    <LoginPrompt>FALSE</LoginPrompt>
    <DriverName>STANDARD</DriverName>
    <Parameters>PATH=.\ParadoxDB
DEFAULT DRIVER=PARADOX
ENABLE BCD=TRUE
</Parameters>
  </TInstantBDEConnectionDef>
  <TInstantIBXConnectionDef>
    <Name>FirebirdDB</Name>
    <IsBuilt>TRUE</IsBuilt>
    <BlobStreamFormat>sfXML</BlobStreamFormat>
    <LoginPrompt>FALSE</LoginPrompt>
    <Path>.\FirebirdDB\PRIMERDB.FDB</Path>
    <NetType>ntLocal</NetType>
    <Options>ibxUseDelimitedIdents</Options>
    <Params>User_Name=SYSDBA
Password=masterkey</Params>
  </TInstantIBXConnectionDef>
</TInstantConnectionDefs>

Index: Primer.dpr
===================================================================
RCS file: /cvsroot/instantobjects/Demos/PrimerCross/Primer.dpr,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Primer.dpr	7 Dec 2004 08:45:33 -0000	1.4
--- Primer.dpr	10 Feb 2005 13:04:33 -0000	1.5
***************
*** 30,33 ****
--- 30,35 ----
   * - cross-platform porting for Delphi & Kilix
   * - PerformanceView form changed to make tests with UsePreparedQuery
+  * - PerformanceView form changed to make tests with Statement Cache
+  * - PerformanceView form changed to make tests of Queries
   * Salary attribute of type Currency added to Person
   * PersonEdit form and random data form changed to test Graphic support

Index: BasicView.pas
===================================================================
RCS file: /cvsroot/instantobjects/Demos/PrimerCross/BasicView.pas,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** BasicView.pas	29 Jul 2004 20:43:09 -0000	1.2
--- BasicView.pas	10 Feb 2005 13:04:25 -0000	1.3
***************
*** 31,34 ****
--- 31,35 ----
      procedure FormCreate(Sender: TObject); virtual;
      procedure FormHide(Sender: TObject); virtual;
+     procedure FormShow(Sender: TObject); virtual;
      procedure Connect; virtual;
      procedure Disconnect; virtual;
***************
*** 69,72 ****
--- 70,78 ----
  end;
  
+ procedure TBasicViewForm.FormShow(Sender: TObject);
+ begin
+   Self.Show;
+ end;
+ 
  function TBasicViewForm.GetConnectionName: string;
  begin

--- NEW FILE: PrimerExternal.dof ---
[FileVersion]
Version=7.0
[Compiler]
A=8
B=0
C=1
D=1
E=0
F=0
G=1
H=1
I=1
J=1
K=0
L=1
M=0
N=1
O=0
P=1
Q=0
R=0
S=0
T=0
U=0
V=1
W=1
X=1
Y=1
Z=1
ShowHints=1
ShowWarnings=1
UnitAliases=WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;
NamespacePrefix=
SymbolDeprecated=1
SymbolLibrary=1
SymbolPlatform=1
UnitLibrary=1
UnitPlatform=0
UnitDeprecated=1
HResultCompat=1
HidingMember=1
HiddenVirtual=1
Garbage=1
BoundsError=1
ZeroNilCompat=1
StringConstTruncated=1
ForLoopVarVarPar=1
TypedConstVarPar=1
AsgToTypedConst=1
CaseLabelRange=1
ForVariable=1
ConstructingAbstract=1
ComparisonFalse=1
ComparisonTrue=1
ComparingSignedUnsigned=1
CombiningSignedUnsigned=1
UnsupportedConstruct=1
FileOpen=1
FileOpenUnitSrc=1
BadGlobalSymbol=1
DuplicateConstructorDestructor=1
InvalidDirective=1
PackageNoLink=1
PackageThreadVar=1
ImplicitImport=1
HPPEMITIgnored=1
NoRetVal=1
UseBeforeDef=1
ForLoopVarUndef=1
UnitNameMismatch=1
NoCFGFileFound=1
MessageDirective=1
ImplicitVariants=1
UnicodeToLocale=1
LocaleToUnicode=1
ImagebaseMultiple=1
SuspiciousTypecast=1
PrivatePropAccessor=1
UnsafeType=0
UnsafeCode=0
UnsafeCast=0
[Linker]
MapFile=0
OutputObjs=0
ConsoleApp=1
DebugInfo=0
RemoteSymbols=0
MinStackSize=16384
MaxStackSize=1048576
ImageBase=4194304
ExeDescription=
[Directories]
OutputDir=
UnitOutputDir=
PackageDLLOutputDir=
PackageDCPOutputDir=
SearchPath=$(DELPHI)\Lib\Debug;..\..\Source\Core;..\..\Source\Brokers\DBX;..\..\Source\Brokers\ADO;..\..\Source\Brokers\BDE;..\..\Source\Brokers\IBX;..\..\Source\Brokers\XML;..\..\Source\Brokers\UIB
Packages=
Conditionals=
DebugSourceDirs=
UsePackages=0
[Parameters]
RunParams=
HostApplication=
Launcher=
UseLauncher=0
DebugCWD=
[Language]
ActiveLang=
ProjectLang=$00000406
RootDir=
[Version Info]
IncludeVerInfo=1
AutoIncBuild=0
MajorVer=1
MinorVer=6
Release=7
Build=0
Debug=0
PreRelease=0
Special=0
Private=0
DLL=0
Locale=1030
CodePage=1252
[Version Info Keys]
CompanyName=InstantObjects.org
FileDescription=Primer Demo
FileVersion=1.6.7.0
InternalName=
LegalCopyright=MPL public license
LegalTrademarks=
OriginalFilename=
ProductName=
ProductVersion=1.6.7
Comments=
[Excluded Packages]