pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

added converting DOMString to utf8 encoded strings

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@925 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
skalogryz
2009-08-02 13:22:38 +00:00
parent cd19a08e6b
commit 88a6850fe9
1 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
components/svn/svnclasses.pas
View File

@ -305,6 +305,11 @@ const
ActionStrings : array[TCommitAction] of char = ActionStrings : array[TCommitAction] of char =
(' ','M','A','D'); (' ','M','A','D');
function DomToSvn(const ds: DOMString): String;
begin
Result := UTF8Encode(ds);
end;
function GetChildTextContent(ANode: TDomNode; const AName: string) : string; function GetChildTextContent(ANode: TDomNode; const AName: string) : string;
var var
ChildNode: TDOMNode; ChildNode: TDOMNode;
@ -312,7 +317,7 @@ begin
Result := ''; Result := '';
ChildNode := ANode.FindNode(AName); ChildNode := ANode.FindNode(AName);
if assigned(ChildNode) then if assigned(ChildNode) then
Result := ChildNode.TextContent; Result := DomToSvn(ChildNode.TextContent);
end; end;
{ TSvnBase } { TSvnBase }
@ -400,8 +405,8 @@ begin
if ANode.NodeType = ELEMENT_NODE then begin if ANode.NodeType = ELEMENT_NODE then begin
EntryNode := TDomElement(ANode); EntryNode := TDomElement(ANode);
FRevision := StrToIntDef(EntryNode.GetAttribute('revision'),0); FRevision := StrToIntDef(EntryNode.GetAttribute('revision'),0);
FPath := EntryNode.GetAttribute('path'); FPath := DomToSvn(EntryNode.GetAttribute('path'));
KindString := EntryNode.GetAttribute('kind'); KindString := DomToSvn(EntryNode.GetAttribute('kind'));
if KindString = 'file' then if KindString = 'file' then
FKind := ekFile FKind := ekFile
else if KindString = 'dir' then else if KindString = 'dir' then
@ -410,7 +415,7 @@ begin
FKind := ekUnknown; FKind := ekUnknown;
UrlNode := EntryNode.FindNode('url'); UrlNode := EntryNode.FindNode('url');
if assigned(UrlNode) then if assigned(UrlNode) then
FUrl := UrlNode.TextContent; FUrl := DomToSvn(UrlNode.TextContent);
FRepository.LoadFromNode(EntryNode.FindNode('repository')); FRepository.LoadFromNode(EntryNode.FindNode('repository'));
FCommit.LoadFromNode(EntryNode.FindNode('commit')); FCommit.LoadFromNode(EntryNode.FindNode('commit'));
@ -635,9 +640,9 @@ var
ActionStr: string; ActionStr: string;
i: TCommitAction; i: TCommitAction;
begin begin
FPath := ANode.TextContent; FPath := DomToSvn(ANode.TextContent);
FCopyFromRevision := StrToIntDef(ANode.GetAttribute('copyfrom-rev'),0); FCopyFromRevision := StrToIntDef(ANode.GetAttribute('copyfrom-rev'),0);
FCopyFromPath := ANode.GetAttribute('copyfrom-path'); FCopyFromPath := DomToSvn(ANode.GetAttribute('copyfrom-path'));
ActionStr := ANode.GetAttribute('action'); ActionStr := ANode.GetAttribute('action');
FAction := caUnknown; FAction := caUnknown;
for i := low(TCommitAction) to high(TCommitAction) do for i := low(TCommitAction) to high(TCommitAction) do
@ -815,9 +820,9 @@ begin
EntryNode := ANode as TDOMNode; EntryNode := ANode as TDOMNode;
if EntryNode.NodeName = 'target' then if EntryNode.NodeName = 'target' then
FTargetPath := (EntryNode as TDOMElement).GetAttribute('path') FTargetPath := DomToSvn((EntryNode as TDOMElement).GetAttribute('path'))
else if EntryNode.NodeName = 'changelist' then else if EntryNode.NodeName = 'changelist' then
FChangeListName := (EntryNode as TDOMElement).GetAttribute('name'); FChangeListName := DomToSvn((EntryNode as TDOMElement).GetAttribute('name'));
EntryNode := ANode.FirstChild; EntryNode := ANode.FirstChild;
while assigned(EntryNode) do begin while assigned(EntryNode) do begin
@ -862,12 +867,12 @@ var
begin begin
if not Assigned(ANode) then Exit; if not Assigned(ANode) then Exit;
FPath := ANode.GetAttribute('path'); FPath := DomToSvn(ANode.GetAttribute('path'));
StatusNode := ANode.FindNode('wc-status'); StatusNode := ANode.FindNode('wc-status');
if Assigned(StatusNode) and (StatusNode is TDOMElement) then begin if Assigned(StatusNode) and (StatusNode is TDOMElement) then begin
FWorkProps := TDomElement(StatusNode).GetAttribute('props'); FWorkProps := DomToSvn(TDomElement(StatusNode).GetAttribute('props'));
FWorkStatus := TDomElement(StatusNode).GetAttribute('item'); FWorkStatus := DomToSvn(TDomElement(StatusNode).GetAttribute('item'));
FWorkRevision := StrToIntDef(TDomElement(StatusNode).GetAttribute('revision'),0); FWorkRevision := StrToIntDef(TDomElement(StatusNode).GetAttribute('revision'),0);
SubNode := StatusNode.FindNode('commit'); SubNode := StatusNode.FindNode('commit');
@ -882,8 +887,8 @@ begin
StatusNode := ANode.FindNode('repos-status'); StatusNode := ANode.FindNode('repos-status');
if Assigned(StatusNode) and (StatusNode is TDOMElement) then begin if Assigned(StatusNode) and (StatusNode is TDOMElement) then begin
FRepoProps := TDomElement(StatusNode).GetAttribute('props'); FRepoProps := DomToSvn(TDomElement(StatusNode).GetAttribute('props'));
FRepoStatus := TDomElement(StatusNode).GetAttribute('item'); FRepoStatus := DomToSvn(TDomElement(StatusNode).GetAttribute('item'));
SubNode := StatusNode.FindNode('lock'); SubNode := StatusNode.FindNode('lock');
if Assigned(SubNode) then begin if Assigned(SubNode) then begin