4 |
|
// |
5 |
|
// $Id$ |
6 |
|
|
7 |
+ |
#include <menes/cxx/standard.hh> |
8 |
+ |
|
9 |
+ |
#include <menes/api/pcre/regex.hpp> |
10 |
+ |
|
11 |
|
#include "SiteMapper.hpp" |
8 |
– |
#include "Matcher/Matcher.hpp" |
12 |
|
|
13 |
< |
void Page::setUrl(const ext::String& url) |
13 |
> |
void Page::SetUrl(const cse::String& url) |
14 |
|
{ |
15 |
< |
Matcher matcher("^http://(.+)(/.*)?$", (PCRE_UNGREEDY | PCRE_DOTALL)); |
15 |
> |
static api::Pcre::RegEx url_(_B("^http://([^/]+)(/.*)?$")); |
16 |
|
|
17 |
< |
if (url == matcher) |
17 |
> |
if (api::Pcre::RegEx::Match match = url_(url)) |
18 |
|
{ |
19 |
< |
address = matcher[1]; |
20 |
< |
|
18 |
< |
if (matcher.size() > 2) path = matcher[2]; else path = "/"; |
19 |
> |
address = match[1]; |
20 |
> |
path = !match[2].IsEmpty() ? match[2] : cse::String(_B("/")); |
21 |
|
} |
22 |
|
else |
23 |
< |
{ |
22 |
< |
api::Cerr << SiteMapper::program << ": Page.setUrl(" << url << ") failure.\n"; |
23 |
< |
|
24 |
< |
throw; |
25 |
< |
} |
23 |
> |
throw ext::StringException(url); |
24 |
|
} |
25 |
|
|
26 |
< |
bool Page::operator==(const ext::String& thing) |
26 |
> |
bool Page::operator==(const cse::String& thing) |
27 |
|
{ |
28 |
|
return address == thing || path == thing || title == thing; |
29 |
|
} |
30 |
|
|
33 |
– |
bool Page::operator==(Matcher& matcher) |
34 |
– |
{ |
35 |
– |
return address == matcher || path == matcher || title == matcher; |
36 |
– |
} |
37 |
– |
|
31 |
|
bool Page::operator==(const Page& page) const |
32 |
|
{ |
33 |
|
if (address == page.address) |
40 |
|
|
41 |
|
xml::TextWriter& operator<<(xml::TextWriter& xml, Page& page) |
42 |
|
{ |
43 |
< |
xml::ScopeElement item(xml, "item"); |
43 |
> |
xml::ScopeElement item(xml, _B("item")); |
44 |
|
|
45 |
< |
xml.OpenElement("link"); |
46 |
< |
xml.SetAttribute("address", page.getUrl()); |
45 |
> |
xml.OpenElement(_B("link")); |
46 |
> |
xml.SetAttribute(_B("address"), page.GetUrl()); |
47 |
|
xml.OutputText(page.title); |
48 |
|
xml.CloseElement(); |
49 |
|
|
50 |
|
if (!page.children.IsEmpty()) |
51 |
|
{ |
52 |
< |
xml::ScopeElement list(xml, "list"); |
52 |
> |
xml::ScopeElement list(xml, _B("list")); |
53 |
|
|
54 |
|
_foreach (ext::Vector<Page>, child, page.children) xml << *child; |
55 |
|
} |