|
|
@@ -763,20 +763,20 @@ begin
|
|
|
If FRecordCount>0 Then SetCurrentRecord(FRecordCount-1);
|
|
|
Result:=GetRecord(FBuffers[FBufferCount],gmNext,True)=grOK;
|
|
|
|
|
|
- if result then
|
|
|
+ if Result then
|
|
|
begin
|
|
|
If FRecordCount=0 then ActivateBuffers;
|
|
|
if FRecordCount=FBufferCount then
|
|
|
ShiftBuffersBackward
|
|
|
else
|
|
|
begin
|
|
|
- inc(FRecordCount);
|
|
|
+ Inc(FRecordCount);
|
|
|
FCurrentRecord:=FRecordCount - 1;
|
|
|
ExchangeBuffers(FBuffers[FCurrentRecord],FBuffers[FBufferCount]);
|
|
|
end;
|
|
|
end
|
|
|
else
|
|
|
- cursorposchanged;
|
|
|
+ CursorPosChanged;
|
|
|
{$ifdef dsdebug}
|
|
|
Writeln ('Result getting next record : ',Result);
|
|
|
{$endif}
|
|
|
@@ -805,16 +805,16 @@ begin
|
|
|
CheckBiDirectional;
|
|
|
If FRecordCount>0 Then SetCurrentRecord(0);
|
|
|
Result:=GetRecord(FBuffers[FBufferCount],gmPrior,True)=grOK;
|
|
|
- if result then
|
|
|
+ if Result then
|
|
|
begin
|
|
|
If FRecordCount=0 then ActivateBuffers;
|
|
|
ShiftBuffersForward;
|
|
|
|
|
|
if FRecordCount<FBufferCount then
|
|
|
- inc(FRecordCount);
|
|
|
+ Inc(FRecordCount);
|
|
|
end
|
|
|
else
|
|
|
- cursorposchanged;
|
|
|
+ CursorPosChanged;
|
|
|
{$ifdef dsdebug}
|
|
|
Writeln ('Result getting prior record : ',Result);
|
|
|
{$endif}
|
|
|
@@ -894,30 +894,30 @@ begin
|
|
|
else
|
|
|
Insert;
|
|
|
|
|
|
- for i := 0 to ValuesSize-1 do with values[i] do
|
|
|
- fields[i].AssignValue(values[i]);
|
|
|
+ for i := 0 to ValuesSize-1 do
|
|
|
+ Fields[i].AssignValue(Values[i]);
|
|
|
Post;
|
|
|
|
|
|
end;
|
|
|
|
|
|
-procedure TDataSet.InitFieldDefsFromfields;
|
|
|
+procedure TDataSet.InitFieldDefsFromFields;
|
|
|
var i : integer;
|
|
|
|
|
|
begin
|
|
|
- if FieldDefs.count = 0 then
|
|
|
+ if FieldDefs.Count = 0 then
|
|
|
begin
|
|
|
FieldDefs.BeginUpdate;
|
|
|
try
|
|
|
- for i := 0 to Fields.Count-1 do with fields[i] do
|
|
|
+ for i := 0 to Fields.Count-1 do with Fields[i] do
|
|
|
if not (FieldKind in [fkCalculated,fkLookup]) then // Do not add fielddefs for calculated/lookup fields.
|
|
|
begin
|
|
|
FFieldDef:=FieldDefs.FieldDefClass.Create(FieldDefs,FieldName,DataType,Size,Required,FieldDefs.Count+1);
|
|
|
with FFieldDef do
|
|
|
begin
|
|
|
- if Required then Attributes := attributes + [faRequired];
|
|
|
- if ReadOnly then Attributes := attributes + [faReadOnly];
|
|
|
- if DataType = ftBCD then precision := (fields[i] as TBCDField).Precision
|
|
|
- else if DataType = ftFMTBcd then precision := (fields[i] as TFMTBCDField).Precision;
|
|
|
+ if Required then Attributes := Attributes + [faRequired];
|
|
|
+ if ReadOnly then Attributes := Attributes + [faReadOnly];
|
|
|
+ if DataType = ftBCD then Precision := (Fields[i] as TBCDField).Precision
|
|
|
+ else if DataType = ftFMTBcd then Precision := (Fields[i] as TFMTBCDField).Precision;
|
|
|
end;
|
|
|
end;
|
|
|
finally
|
|
|
@@ -1148,7 +1148,7 @@ begin
|
|
|
for j := 0 to TDataSource(FDataSources[i]).DataLinks.Count - 1 do
|
|
|
begin
|
|
|
DataLink:=TDataLink(TDataSource(FDataSources[i]).DataLinks[j]);
|
|
|
- if DataLink.BufferCount>ABufferCount then
|
|
|
+ if ABufferCount<DataLink.BufferCount then
|
|
|
ABufferCount:=DataLink.BufferCount;
|
|
|
end;
|
|
|
|
|
|
@@ -1200,11 +1200,11 @@ begin
|
|
|
{$ifdef dsdebug}
|
|
|
Writeln (' Reallocating memory :',(Value+1)*SizeOf(TRecordBuffer));
|
|
|
{$endif}
|
|
|
- ReAllocMem(FBuffers,(Value+1)*SizeOf(PChar));
|
|
|
+ ReAllocMem(FBuffers,(Value+1)*SizeOf(TRecordBuffer));
|
|
|
{$ifdef dsdebug}
|
|
|
Writeln (' Filling memory :',(Value+1-FBufferCount)*SizeOf(TRecordBuffer));
|
|
|
{$endif}
|
|
|
- inc(FBufferCount); // Cause FBuffers[FBufferCount] is already allocated
|
|
|
+ Inc(FBufferCount); // Cause FBuffers[FBufferCount] is already allocated
|
|
|
FillChar(FBuffers[FBufferCount],(Value+1-FBufferCount)*SizeOf(TRecordBuffer),#0);
|
|
|
{$ifdef dsdebug}
|
|
|
Writeln (' Filled memory');
|
|
|
@@ -1286,7 +1286,7 @@ begin
|
|
|
bfBOF : InternalFirst;
|
|
|
bfEOF : InternalLast;
|
|
|
end;
|
|
|
- FCurrentRecord:=index;
|
|
|
+ FCurrentRecord:=Index;
|
|
|
end;
|
|
|
end;
|
|
|
|
|
|
@@ -2165,7 +2165,7 @@ begin
|
|
|
inc(i);
|
|
|
FActiveRecord := i;
|
|
|
// Fill the rest of the buffer
|
|
|
- getnextrecords;
|
|
|
+ GetNextRecords;
|
|
|
// If the buffer is not full yet, try to fetch some more prior records
|
|
|
if FRecordCount < FBufferCount then inc(FActiveRecord,getpriorrecords);
|
|
|
// That's all folks!
|
marco