[Quantproject-developers] QuantDownloader/Downloader/Validate ValidateDataTable.cs,1.8,1.9

[<gla...@pr...>]

Update of /cvsroot/quantproject/QuantDownloader/Downloader/Validate
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17813/Downloader/Validate

Modified Files:
	ValidateDataTable.cs 
Log Message:
- Fixed CVS conflict
- Added the CloseToCloseHasBeenVisuallyValidated boolean column

Index: ValidateDataTable.cs
===================================================================
RCS file: /cvsroot/quantproject/QuantDownloader/Downloader/Validate/ValidateDataTable.cs,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** ValidateDataTable.cs	26 Jan 2004 15:57:15 -0000	1.8
--- ValidateDataTable.cs	26 Jan 2004 23:01:31 -0000	1.9
***************
*** 20,24 ****
--- 20,45 ----
      public ValidateDataTable()
      {
+ //<<<<<<< ValidateDataTable.cs
+ //      this.selectStatement =
+ //        "select * from quotes where 1=2";
+ //      this.oleDbDataAdapter =
+ //        new OleDbDataAdapter( selectStatement , ConnectionProvider.OleDbConnection );
+ //      this.oleDbCommandBuilder = new OleDbCommandBuilder( oleDbDataAdapter );
+ //      this.oleDbDataAdapter.UpdateCommand = this.oleDbCommandBuilder.GetUpdateCommand();
+ //      this.oleDbDataAdapter.Fill( this );
+ //      this.Columns.Add( new DataColumn( "CloseToCloseHasBeenVisuallyValidated" ,
+ //        System.Type.GetType( "System.Boolean" ) ) );
+ //
+ //      this.TableName = "quotes";
+ ////<<<<<<< ValidateDataTable.cs
+ //      this.Columns.Add( "ValidationWarning" ,
+ //        ValidationWarning.OpenHighLowCloseLogicalInconsistency.GetType() );
+       
+ //=======
+ //      
+ //>>>>>>> 1.6
+ //=======
        initializeValidateDataTable();
+ //>>>>>>> 1.8
      }
  
***************
*** 35,39 ****
  		private void initializeValidateDataTable()
  		{
! 			this.selectStatement =
  				"select * from quotes where 1=2";
  			this.oleDbDataAdapter =
--- 56,60 ----
  		private void initializeValidateDataTable()
  		{
!       this.selectStatement =
  				"select * from quotes where 1=2";
  			this.oleDbDataAdapter =
***************
*** 42,46 ****
  			this.oleDbDataAdapter.UpdateCommand = this.oleDbCommandBuilder.GetUpdateCommand();
  			this.oleDbDataAdapter.Fill( this );
! 			this.TableName = "quotes";
  			//<<<<<<< ValidateDataTable.cs
  			this.Columns.Add( "ValidationWarning" ,
--- 63,69 ----
  			this.oleDbDataAdapter.UpdateCommand = this.oleDbCommandBuilder.GetUpdateCommand();
  			this.oleDbDataAdapter.Fill( this );
!       this.Columns.Add( new DataColumn( "CloseToCloseHasBeenVisuallyValidated" ,
!         System.Type.GetType( "System.Boolean" ) ) );
!       this.TableName = "quotes";
  			//<<<<<<< ValidateDataTable.cs
  			this.Columns.Add( "ValidationWarning" ,