diff options
author | joost <joost@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2008-11-26 10:33:39 +0000 |
---|---|---|
committer | joost <joost@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2008-11-26 10:33:39 +0000 |
commit | 1eda7d34d8673ad74dc36be8a2383903dd6b0279 (patch) | |
tree | f75aefa90bdc7aa26b7fbe804c7e6b05c0625970 | |
parent | 58238b0275a9f5026b22d68e8b34394b2fe5f30c (diff) | |
download | fpc-1eda7d34d8673ad74dc36be8a2383903dd6b0279.tar.gz |
* Removed two blocks of commented code
git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@12232 3ad0048d-3df7-0310-abae-a5850022a9f2
-rw-r--r-- | packages/fcl-db/src/base/bufdataset.pas | 95 |
1 files changed, 0 insertions, 95 deletions
diff --git a/packages/fcl-db/src/base/bufdataset.pas b/packages/fcl-db/src/base/bufdataset.pas index 8f9ad7ad08..4c277713ab 100644 --- a/packages/fcl-db/src/base/bufdataset.pas +++ b/packages/fcl-db/src/base/bufdataset.pas @@ -1405,59 +1405,6 @@ begin FCurrentIndex.GotoBookmark(ABookmark); end; -(* -procedure TBufDataset.AddRecordToIndex(var AIndex: TBufIndex; ARecBuf : pchar); -var cp : integer; - NewValueBufLen : Integer; - NewValueBuf,CompValueBuf : pchar; - RecInd : integer; - HighVal,LowVal : Integer; -begin - if not assigned(AIndex.Fields) then - AIndex.Fields := FieldByName(AIndex.FieldsName); - - NewValueBuf:=pchar(ARecBuf); - inc(NewValueBuf,FFieldBufPositions[AIndex.Fields.FieldNo-1]); - - NewValueBufLen:= Length(NewValueBuf); - HighVal := AIndex.FLastRecInd; - LowVal := 0; - - repeat - RecInd := lowval+((HighVal-LowVal) div 2); - CompValueBuf:=AIndex.FRecordArray[RecInd]+FFieldBufPositions[AIndex.Fields.FieldNo-1]; - if AIndex.Fields.DataType = ftString then - begin - cp := DBCompareText(NewValueBuf,CompValueBuf,NewValueBufLen,[]); - if cp >0 then - LowVal := RecInd - else - HighVal := RecInd; - end; - until abs(HighVal-LowVal)<2; - if cp <0 then RecInd:=RecInd else RecInd := RecInd+1; - if recind > AIndex.FLastRecInd then recind := AIndex.FLastRecInd; -{ - Write('New: ' + NewValueBuf); - Write(' Verg: ' + CompValueBuf); - CompValueBuf:=AIndex.FRecordArray[LowVal]+FFieldBufPositions[AIndex.SortField.FieldNo-1]; - Write(' Low: ' + CompValueBuf + '('+inttostr(LowVal)+')'); - CompValueBuf:=AIndex.FRecordArray[HighVal]+FFieldBufPositions[AIndex.SortField.FieldNo-1]; - Write(' High: ' + CompValueBuf + '('+inttostr(HighVal)+')'); - CompValueBuf:=AIndex.FRecordArray[RecInd]+FFieldBufPositions[AIndex.SortField.FieldNo-1]; - Write(' RecIND: ' + CompValueBuf + '('+inttostr(RecInd)+')'); - Writeln(' cp: ' + inttostr(cp)); -} - - if (AIndex.FLastRecInd+1) >= length(AIndex.FRecordArray) then - SetLength(AIndex.FRecordArray,length(AIndex.FRecordArray)+FGrowBuffer); - - move(AIndex.FRecordArray[RecInd],AIndex.FRecordArray[RecInd+1],sizeof(pointer)*(AIndex.FLastRecInd-RecInd+5)); // Let op. Moet zijn +1? - AIndex.FRecordArray[RecInd]:= ARecBuf; - inc(AIndex.FLastRecInd) -end; -*) - function TBufDataset.getnextpacket : integer; var i : integer; @@ -2059,48 +2006,6 @@ begin end; move(ActiveBuffer^,FCurrentIndex.CurrentBuffer^,FRecordSize); -// CurrBuff:=pchar(tmpRecBuffer); -// The next part has to be rewritten. -{ - CurrBuff := FCurrentIndex.CurrentBuffer; - if FCurrentIndex=FIndexes[1] then StartInd := 1 else StartInd := 2; - for i := StartInd to FIndexesCount-1 do - begin - IndNr:=(FIndexes[i] as TDoubleLinkedBufIndex).IndNr; - if (assigned(PBufRecLinkItem(CurrBuff)[IndNr].prior)) and - (IndexCompareRecords(CurrBuff,PBufRecLinkItem(CurrBuff)[IndNr].prior,FIndexes[i].DBCompareStruct) < 0) then - begin - // Remove record from index - RemoveRecordFromIndex(PBufRecLinkItem(CurrBuff),FIndexes[i]); - // iterate to new position - tmpRecBuffer:=PBufRecLinkItem(CurrBuff)[IndNr].prior; - while assigned(tmpRecBuffer[IndNr].prior) and - (IndexCompareRecords(CurrBuff,tmpRecBuffer[indnr].prior,FIndexes[i].DBCompareStruct) < 0) do - begin - tmpRecBuffer:=tmpRecBuffer[IndNr].prior; - end; - // Place record at new position - AddRecordToIndex(PBufRecLinkItem(CurrBuff),tmpRecBuffer,FIndexes[i]); - end - else if (PBufRecLinkItem(CurrBuff)[IndNr].next <> (FIndexes[i] as TDoubleLinkedBufIndex).FLastRecBuf) and - (IndexCompareRecords(CurrBuff,PBufRecLinkItem(CurrBuff)[(FIndexes[i] as TDoubleLinkedBufIndex).IndNr].next,FIndexes[i].DBCompareStruct) > 0) then - begin - // Remove record from index - RemoveRecordFromIndex(PBufRecLinkItem(CurrBuff),FIndexes[i]); - // iterate to new position - tmpRecBuffer:=PBufRecLinkItem(CurrBuff)[IndNr].next; - while (tmpRecBuffer<>(FIndexes[i] as TDoubleLinkedBufIndex).FLastRecBuf) and - (IndexCompareRecords(CurrBuff,tmpRecBuffer[indnr].next,FIndexes[i].DBCompareStruct) > 0) do - begin - tmpRecBuffer:=tmpRecBuffer[IndNr].next; - end; - // The record should be added _after_ the the current record, not before - if (tmpRecBuffer<>(FIndexes[i] as TDoubleLinkedBufIndex).FLastRecBuf) then - tmpRecBuffer:=tmpRecBuffer[IndNr].next; - // Place record at new position - AddRecordToIndex(PBufRecLinkItem(CurrBuff),tmpRecBuffer,FIndexes[i]); - end; - end;} end; procedure TBufDataset.CalcRecordSize; |