paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-09-11 10:29:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

* RemoveAttributeNode bugfix

Browse Source
This commit is contained in:
sg 2000-06-29 08:45:05 +00:00
parent a4096f2886
commit 621080a9f8
1 changed files with 36 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
fcl/xml/dom.pp
View File

@ -281,16 +281,16 @@ type
TDOMNamedNodeMap = class(TList) TDOMNamedNodeMap = class(TList)
protected protected
OwnerDocument: TDOMDocument; OwnerDocument: TDOMDocument;
function GetItem(index: LongWord): TDOMNode; function GetItem(index: LongWord): TDOMNode;
procedure SetItem(index: LongWord; AItem: TDOMNode); procedure SetItem(index: LongWord; AItem: TDOMNode);
function GetLength: LongInt; function GetLength: LongInt;
constructor Create(AOwner: TDOMDocument); constructor Create(AOwner: TDOMDocument);
public public
function GetNamedItem(const name: DOMString): TDOMNode; function GetNamedItem(const name: DOMString): TDOMNode;
function SetNamedItem(arg: TDOMNode): TDOMNode; function SetNamedItem(arg: TDOMNode): TDOMNode;
function RemoveNamedItem(const name: DOMString): TDOMNode; function RemoveNamedItem(const name: DOMString): TDOMNode;
property Item[index: LongWord]: TDOMNode read GetItem write SetItem; property Item[index: LongWord]: TDOMNode read GetItem write SetItem; default;
property Length: LongInt read GetLength; property Length: LongInt read GetLength;
end; end;
@ -303,9 +303,9 @@ type
protected protected
function GetLength: LongInt; function GetLength: LongInt;
public public
property Data: DOMString read FNodeValue; property Data: DOMString read FNodeValue;
property Length: LongInt read GetLength; property Length: LongInt read GetLength;
function SubstringData(offset, count: LongWord): DOMString; function SubstringData(offset, count: LongWord): DOMString;
procedure AppendData(const arg: DOMString); procedure AppendData(const arg: DOMString);
procedure InsertData(offset: LongWord; const arg: DOMString); procedure InsertData(offset: LongWord; const arg: DOMString);
procedure DeleteData(offset, count: LongWord); procedure DeleteData(offset, count: LongWord);
@ -428,6 +428,9 @@ type
// Free NodeList with TDOMNodeList.Release! // Free NodeList with TDOMNodeList.Release!
function GetElementsByTagName(const name: DOMString): TDOMNodeList; function GetElementsByTagName(const name: DOMString): TDOMNodeList;
procedure Normalize; procedure Normalize;
property AttribStrings[const Name: DOMString]: DOMString
read GetAttribute write SetAttribute; default;
end; end;
@ -1238,7 +1241,7 @@ begin
{As the attributes are _not_ childs of the element node, we have to free {As the attributes are _not_ childs of the element node, we have to free
them manually here:} them manually here:}
for i := 0 to FAttributes.Count - 1 do for i := 0 to FAttributes.Count - 1 do
FAttributes.Item[i].Free; FAttributes[i].Free;
FAttributes.Free; FAttributes.Free;
inherited Destroy; inherited Destroy;
end; end;
@ -1250,7 +1253,7 @@ begin
Result := TDOMElement.Create(ACloneOwner); Result := TDOMElement.Create(ACloneOwner);
Result.FNodeName := FNodeName; Result.FNodeName := FNodeName;
for i := 0 to FAttributes.Count - 1 do for i := 0 to FAttributes.Count - 1 do
TDOMElement(Result).FAttributes.Add(FAttributes.Item[i].CloneNode(True, ACloneOwner)); TDOMElement(Result).FAttributes.Add(FAttributes[i].CloneNode(True, ACloneOwner));
if deep then if deep then
CloneChildren(Result, ACloneOwner); CloneChildren(Result, ACloneOwner);
end; end;
@ -1265,9 +1268,9 @@ var
i: Integer; i: Integer;
begin begin
for i := 0 to FAttributes.Count - 1 do for i := 0 to FAttributes.Count - 1 do
if FAttributes.Item[i].NodeName = name then if FAttributes[i].NodeName = name then
begin begin
Result := FAttributes.Item[i].NodeValue; Result := FAttributes[i].NodeValue;
exit; exit;
end; end;
SetLength(Result, 0); SetLength(Result, 0);
@ -1279,9 +1282,9 @@ var
attr: TDOMAttr; attr: TDOMAttr;
begin begin
for i := 0 to FAttributes.Count - 1 do for i := 0 to FAttributes.Count - 1 do
if FAttributes.Item[i].NodeName = name then if FAttributes[i].NodeName = name then
begin begin
FAttributes.Item[i].NodeValue := value; FAttributes[i].NodeValue := value;
exit; exit;
end; end;
attr := TDOMAttr.Create(FOwnerDocument); attr := TDOMAttr.Create(FOwnerDocument);
@ -1295,10 +1298,10 @@ var
i: Integer; i: Integer;
begin begin
for i := 0 to FAttributes.Count - 1 do for i := 0 to FAttributes.Count - 1 do
if FAttributes.Item[i].NodeName = name then if FAttributes[i].NodeName = name then
begin begin
FAttributes[i].Free;
FAttributes.Delete(i); FAttributes.Delete(i);
FAttributes.Item[i].Free;
exit; exit;
end; end;
end; end;
@ -1308,8 +1311,11 @@ var
i: Integer; i: Integer;
begin begin
for i := 0 to FAttributes.Count - 1 do for i := 0 to FAttributes.Count - 1 do
if FAttributes.Item[i].NodeName = name then if FAttributes[i].NodeName = name then
exit(TDOMAttr(FAttributes.Item[i])); begin
Result := TDOMAttr(FAttributes[i]);
exit;
end;
Result := nil; Result := nil;
end; end;
@ -1318,9 +1324,10 @@ var
i: Integer; i: Integer;
begin begin
for i := 0 to FAttributes.Count - 1 do for i := 0 to FAttributes.Count - 1 do
if FAttributes.Item[i].NodeName = NewAttr.NodeName then begin if FAttributes[i].NodeName = NewAttr.NodeName then
FAttributes.Item[i].Free; begin
FAttributes.Item[i] := NewAttr; FAttributes[i].Free;
FAttributes[i] := NewAttr;
exit; exit;
end; end;
end; end;
@ -1332,10 +1339,12 @@ var
begin begin
for i := 0 to FAttributes.Count - 1 do for i := 0 to FAttributes.Count - 1 do
begin begin
node := FAttributes.Item[i]; node := FAttributes[i];
if node = OldAttr then begin if node = OldAttr then
begin
FAttributes.Delete(i); FAttributes.Delete(i);
exit(TDOMAttr(node)); Result := TDOMAttr(node);
exit;
end; end;
end; end;
end; end;
@ -1347,6 +1356,7 @@ end;
procedure TDOMElement.Normalize; procedure TDOMElement.Normalize;
begin begin
// !!!: Not implemented
end; end;
@ -1489,7 +1499,10 @@ end.
{ {
$Log$ $Log$
Revision 1.14 2000-05-04 18:24:22 sg Revision 1.15 2000-06-29 08:45:05 sg
* RemoveAttributeNode bugfix
Revision 1.14 2000/05/04 18:24:22 sg
* Bugfixes: In some cases the DOM node tree was invalid * Bugfixes: In some cases the DOM node tree was invalid
* Simplifications * Simplifications
* Minor optical improvements * Minor optical improvements