| 4 |
|
// |
| 5 |
|
// $Id$ |
| 6 |
|
|
| 7 |
– |
#ifdef _WIN32 |
| 8 |
– |
#pragma warning(disable:4503) |
| 9 |
– |
#endif |
| 10 |
– |
|
| 7 |
|
#include "SiteMapper.hpp" |
| 8 |
|
#include "Matcher.hpp" |
| 9 |
|
#include "Page.hpp" |
| 10 |
|
|
| 11 |
|
string program; |
| 12 |
< |
bool debug = false; |
| 12 |
> |
bool debug(false); |
| 13 |
|
|
| 14 |
|
int main(int argc, char* argv[]) |
| 15 |
|
{ |
| 17 |
|
|
| 18 |
|
string siteIndex, siteMap; |
| 19 |
|
|
| 20 |
< |
for (int index = 1; index < argc; index++) |
| 20 |
> |
for (int index(1); index < argc; index++) |
| 21 |
|
{ |
| 22 |
|
string arg(argv[index]); |
| 23 |
|
Matcher matcher; |
| 36 |
|
} |
| 37 |
|
} |
| 38 |
|
|
| 39 |
< |
if (siteIndex != "" && siteMap != "") |
| 39 |
> |
if (!siteIndex.empty() && !siteMap.empty()) |
| 40 |
|
{ |
| 45 |
– |
XMLPlatformUtils::Initialize(); |
| 46 |
– |
XPathEvaluator::initialize(); |
| 47 |
– |
|
| 41 |
|
SiteMapper mapper(siteIndex, siteMap); |
| 49 |
– |
|
| 50 |
– |
XPathEvaluator::terminate(); |
| 51 |
– |
XMLPlatformUtils::Terminate(); |
| 42 |
|
} |
| 43 |
|
else |
| 44 |
|
{ |
| 57 |
|
|
| 58 |
|
void SiteMapper::oldMap(const string& siteMap) |
| 59 |
|
{ |
| 60 |
< |
support.setParserLiaison(&liaison); |
| 61 |
< |
|
| 72 |
< |
XalanDOMString file(siteMap.c_str()); |
| 73 |
< |
LocalFileInputSource source(file.c_str()); |
| 74 |
< |
|
| 75 |
< |
XalanDocument* document = liaison.parseXMLStream(source); |
| 76 |
< |
|
| 77 |
< |
if (document == 0) return; |
| 60 |
> |
ext::Handle<xml::Document> document(xml::Parse(siteMap)); |
| 61 |
> |
ext::Handle<xml::Node> list(*document/"page"/"section"/"list"); |
| 62 |
|
|
| 63 |
< |
XalanNode* list = evaluator.selectSingleNode(support, document, |
| 80 |
< |
XalanDOMString("/page/section/list").c_str()); |
| 81 |
< |
|
| 82 |
< |
if (list == 0) return; |
| 83 |
< |
|
| 84 |
< |
item = evaluator.createXPath(XalanDOMString("item").c_str()); |
| 85 |
< |
address = evaluator.createXPath(XalanDOMString("link/@address").c_str()); |
| 86 |
< |
link = evaluator.createXPath(XalanDOMString("link").c_str()); |
| 87 |
< |
this->list = evaluator.createXPath(XalanDOMString("list").c_str()); |
| 63 |
> |
comment = ext::String(*document/"comment()"); |
| 64 |
|
|
| 65 |
|
oldMap(pages, list); |
| 90 |
– |
|
| 91 |
– |
evaluator.destroyXPath(item); |
| 92 |
– |
evaluator.destroyXPath(address); |
| 93 |
– |
evaluator.destroyXPath(link); |
| 94 |
– |
evaluator.destroyXPath(this->list); |
| 66 |
|
} |
| 67 |
|
|
| 68 |
< |
void SiteMapper::oldMap(vector<Page>& pages, XalanNode* list) |
| 68 |
> |
void SiteMapper::oldMap(vector<Page>& pages, xml::Node* list) |
| 69 |
|
{ |
| 70 |
< |
NodeRefList nodes = evaluator.selectNodeList(support, list, *item); |
| 70 |
> |
xml::NodeSet nodes(*list/"item"); |
| 71 |
|
|
| 72 |
< |
for (int index = 0; index < nodes.getLength(); index++) |
| 72 |
> |
for (xml::NodeSet::Iterator node(nodes.Begin()); node != nodes.End(); |
| 73 |
> |
++node) |
| 74 |
|
{ |
| 75 |
< |
XalanNode* node = nodes.item(index); |
| 76 |
< |
ostringstream url, title; |
| 77 |
< |
|
| 78 |
< |
url << evaluator.evaluate(support, node, *address)->str(); |
| 107 |
< |
title << evaluator.evaluate(support, node, *link)->str(); |
| 108 |
< |
|
| 109 |
< |
Page page(url.str(), title.str()); |
| 110 |
< |
XalanNode* list = evaluator.selectSingleNode(support, node, |
| 111 |
< |
*(this->list)); |
| 75 |
> |
string url(ext::String(**node/"link"/"@address")), |
| 76 |
> |
title(ext::String(**node/"link")); |
| 77 |
> |
Page page(url, title); |
| 78 |
> |
ext::Handle<xml::Node> list(**node/"list"); |
| 79 |
|
|
| 80 |
< |
if (list != 0) oldMap(page.getChildren(), list); |
| 80 |
> |
if (!list.IsEmpty()) oldMap(page.getChildren(), list); |
| 81 |
|
|
| 82 |
|
pages.push_back(page); |
| 83 |
|
} |
| 85 |
|
|
| 86 |
|
void SiteMapper::newIndex(const string& siteIndex) |
| 87 |
|
{ |
| 88 |
< |
XalanDOMString file(siteIndex.c_str()); |
| 89 |
< |
LocalFileInputSource source(file.c_str()); |
| 88 |
> |
ext::Handle<xml::Document> document(xml::Parse(siteIndex)); |
| 89 |
> |
xml::NodeSet nodes(*document/"index"/"page"); |
| 90 |
|
|
| 91 |
< |
XalanDocument* document = liaison.parseXMLStream(source); |
| 92 |
< |
|
| 126 |
< |
if (document == 0) return; |
| 127 |
< |
|
| 128 |
< |
address = evaluator.createXPath(XalanDOMString("address").c_str()); |
| 129 |
< |
port = evaluator.createXPath(XalanDOMString("port").c_str()); |
| 130 |
< |
path = evaluator.createXPath(XalanDOMString("path").c_str()); |
| 131 |
< |
title = evaluator.createXPath(XalanDOMString("title").c_str()); |
| 132 |
< |
|
| 133 |
< |
NodeRefList nodes = evaluator.selectNodeList(support, document, |
| 134 |
< |
XalanDOMString("/index/page").c_str()); |
| 135 |
< |
|
| 136 |
< |
for (int index = 0; index < nodes.getLength(); index++) |
| 91 |
> |
for (xml::NodeSet::Iterator node(nodes.Begin()); node != nodes.End(); |
| 92 |
> |
++node) |
| 93 |
|
{ |
| 94 |
< |
XalanNode* node = nodes.item(index); |
| 95 |
< |
ostringstream address; |
| 140 |
< |
|
| 141 |
< |
address << evaluator.evaluate(support, node, *(this->address))->str(); |
| 142 |
< |
|
| 143 |
< |
double port = evaluator.evaluate(support, node, *(this->port))->num(); |
| 94 |
> |
string address(ext::String(**node/"address")); |
| 95 |
> |
string port(ext::String(**node/"port")); |
| 96 |
|
|
| 97 |
< |
if (port >= 0 && port <= 65535) |
| 97 |
> |
if (!port.empty()) |
| 98 |
|
{ |
| 99 |
< |
address << ':' << int(port); |
| 99 |
> |
address += ':' + port; |
| 100 |
|
} |
| 101 |
|
|
| 102 |
< |
ostringstream path, title; |
| 103 |
< |
|
| 104 |
< |
path << evaluator.evaluate(support, node, *(this->path))->str(); |
| 153 |
< |
title << evaluator.evaluate(support, node, *(this->title))->str(); |
| 154 |
< |
|
| 155 |
< |
Page page(address.str(), path.str(), title.str()); |
| 102 |
> |
string path(ext::String(**node/"path")), |
| 103 |
> |
title(ext::String(**node/"title")); |
| 104 |
> |
Page page(address, path, title); |
| 105 |
|
Matcher matcher; |
| 106 |
|
|
| 107 |
|
if (page == matcher(string("^Douglas\\sThrift's\\sWebsite\\s\\|\\sDou") |
| 108 |
|
+ "glas\\sThrift's\\sBlog:\\s(.+)$")) |
| 109 |
|
{ |
| 110 |
< |
if (Matcher("^\\w+\\s\\d\\d\\d\\d\\sArchives$") == matcher[1]) |
| 110 |
> |
if (Matcher("^\\w+\\s\\d{4}\\sArchives$") == matcher[1]) |
| 111 |
|
{ |
| 112 |
|
page.setTitle(matcher[1]); |
| 113 |
|
|
| 129 |
|
>(page.getAddress(), items)).first->second.insert(pair<string, |
| 130 |
|
Page>(page.getChildOf(), page)); |
| 131 |
|
} |
| 183 |
– |
|
| 184 |
– |
evaluator.destroyXPath(address); |
| 185 |
– |
evaluator.destroyXPath(port); |
| 186 |
– |
evaluator.destroyXPath(path); |
| 187 |
– |
evaluator.destroyXPath(title); |
| 132 |
|
} |
| 133 |
|
|
| 134 |
|
bool SiteMapper::newIndex(vector<Page>& pages, Page& page) |
| 135 |
|
{ |
| 136 |
< |
for (unsigned index = 0; index < pages.size(); index++) |
| 136 |
> |
for (unsigned index(0); index < pages.size(); ++index) |
| 137 |
|
{ |
| 138 |
|
if (pages[index] == page.getAddress()) |
| 139 |
|
{ |
| 145 |
|
|
| 146 |
|
pages[index] = page; |
| 147 |
|
|
| 148 |
+ |
cout << "Updated: " << page.getUrl() << '\n'; |
| 149 |
+ |
|
| 150 |
|
return true; |
| 151 |
|
} |
| 152 |
|
else if (matcher('^' + pages[index].getPath()) == page) |
| 175 |
|
<< "<?xml-stylesheet type=\"text/xsl\" href=\"stylesheets/sitemap.xsl" |
| 176 |
|
<< "\"?>\n" |
| 177 |
|
<< "<!DOCTYPE page SYSTEM \"stylesheets/page.dtd\">\n" |
| 178 |
< |
<< "<!-- /sitemap.xml -->\n" |
| 178 |
> |
<< "<!--" << comment << "-->\n" |
| 179 |
|
<< "<page>\n" |
| 180 |
|
<< "\t<title>Sitemap</title>\n" |
| 181 |
|
<< "\t<section>\n" |
| 182 |
|
<< "\t\t<list>\n"; |
| 183 |
|
|
| 184 |
< |
for (unsigned index = 0; index < pages.size(); index++) |
| 184 |
> |
for (unsigned index(0); index < pages.size(); ++index) |
| 185 |
|
{ |
| 186 |
|
if (newPages.find(pages[index].getAddress()) != newPages.end()) |
| 187 |
|
{ |
| 202 |
|
void SiteMapper::newMap(vector<Page>& pages, const string& childOf, |
| 203 |
|
multimap<string, Page>& newPages) |
| 204 |
|
{ |
| 205 |
< |
for (unsigned index = 0; index < pages.size(); index++) |
| 205 |
> |
for (unsigned index(0); index < pages.size(); ++index) |
| 206 |
|
{ |
| 207 |
|
newMap(pages[index].getChildren(), pages[index].getPath(), newPages); |
| 208 |
|
} |
| 209 |
|
|
| 210 |
< |
for (multimap<string, Page>::iterator itor = newPages.lower_bound(childOf); |
| 210 |
> |
for (multimap<string, Page>::iterator itor(newPages.lower_bound(childOf)); |
| 211 |
|
itor != newPages.upper_bound(childOf); itor++) |
| 212 |
|
{ |
| 213 |
+ |
cout << "Added: " << itor->second.getUrl() << '\n'; |
| 214 |
+ |
|
| 215 |
|
pages.push_back(itor->second); |
| 216 |
|
} |
| 217 |
|
|
