paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-20 19:29:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

+ Basic implementation of TXPathNSResolver class, Mantis #25183.

Browse Source 
git-svn-id: trunk@25814 -
This commit is contained in:
sergei 2013-10-18 08:36:19 +00:00
parent 5abeb67bff
commit 8afc5b8ebf
2 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
packages/fcl-xml/src/xpath.pp
View File

@ -348,8 +348,13 @@ type
property Value: DOMString read FValue;
end;
TXPathNSResolver = TDOMNode {!!! experimental};
TXPathNSResolver = class
protected
FNode: TDOMNode;
public
constructor Create(aNode: TDOMNode);
function LookupNamespaceURI(const aPrefix: DOMString): DOMString; virtual;
end;
{ XPath lexical scanner }
@ -2815,7 +2820,21 @@ begin
Result := TXPathNumberVariable.Create(num);
end;
{ TXPathNSResolver }
constructor TXPathNSResolver.Create(aNode: TDOMNode);
begin
inherited Create;
FNode := aNode;
end;
function TXPathNSResolver.LookupNamespaceURI(const aPrefix: DOMString): DOMString;
begin
if assigned(FNode) then
result := FNode.LookupNamespaceURI(aPrefix)
else
result := '';
end;
{ TXPathExpression }

12
packages/fcl-xml/tests/xpathts.pp
View File

@ -929,6 +929,7 @@ var
doc: TXMLDocument;
rslt: TXPathVariable;
nsdoc: TXMLDocument;
resolver: TXPathNSResolver;
begin
for i := 0 to High(tests) do
begin
@ -937,11 +938,16 @@ begin
nsdoc := ParseString(tests[i].re);
try
try
rslt := EvaluateXPathExpression(tests[i].expr, doc.DocumentElement, nsdoc.DocumentElement);
resolver := TXPathNSResolver.Create(nsdoc.DocumentElement);
try
CheckResult(tests[i], rslt);
rslt := EvaluateXPathExpression(tests[i].expr, doc.DocumentElement, resolver);
try
CheckResult(tests[i], rslt);
finally
rslt.Free;
end;
finally
rslt.Free;
resolver.Free;
end;
except
writeln;