| 5 |
|
// $Id$ |
| 6 |
|
|
| 7 |
|
#include "SiteMapper.hpp" |
| 8 |
< |
#include "Matcher.hpp" |
| 9 |
< |
#include "Page.hpp" |
| 8 |
> |
#include "Matcher/Matcher.hpp" |
| 9 |
|
|
| 10 |
< |
string program; |
| 10 |
> |
#include <menes-api/exename.hpp> |
| 11 |
> |
#include <menes-app/application.hpp> |
| 12 |
> |
|
| 13 |
> |
ext::String program; |
| 14 |
|
bool debug(false); |
| 15 |
|
|
| 16 |
< |
int main(int argc, char* argv[]) |
| 16 |
> |
struct SiteMapperCommand : public app::Application |
| 17 |
|
{ |
| 18 |
< |
program = argv[0]; |
| 17 |
< |
|
| 18 |
< |
string siteIndex, siteMap; |
| 19 |
< |
|
| 20 |
< |
for (int index(1); index < argc; index++) |
| 18 |
> |
virtual int Run(const app::ArgumentList& args) |
| 19 |
|
{ |
| 20 |
< |
string arg(argv[index]); |
| 21 |
< |
Matcher matcher; |
| 20 |
> |
program = api::GetExecutablePath().GetName(); |
| 21 |
> |
|
| 22 |
> |
ext::String siteIndex, siteMap; |
| 23 |
|
|
| 24 |
< |
if (arg == matcher("^-index=(.*)$")) |
| 24 |
> |
_foreach (app::ArgumentList, arg, args) |
| 25 |
|
{ |
| 26 |
< |
siteIndex = matcher[1]; |
| 26 |
> |
Matcher matcher; |
| 27 |
> |
|
| 28 |
> |
if (*arg == matcher("^-index=(.*)$")) |
| 29 |
> |
{ |
| 30 |
> |
siteIndex = matcher[1]; |
| 31 |
> |
} |
| 32 |
> |
else if (*arg == matcher("^-map=(.*)$")) |
| 33 |
> |
{ |
| 34 |
> |
siteMap = matcher[1]; |
| 35 |
> |
} |
| 36 |
> |
else if (*arg == "-D") |
| 37 |
> |
{ |
| 38 |
> |
if (!debug) debug = true; |
| 39 |
> |
} |
| 40 |
|
} |
| 41 |
< |
else if (arg == matcher("^-map=(.*)$")) |
| 41 |
> |
|
| 42 |
> |
if (!siteIndex.IsEmpty() && !siteMap.IsEmpty()) |
| 43 |
|
{ |
| 44 |
< |
siteMap = matcher[1]; |
| 44 |
> |
SiteMapper mapper(siteIndex, siteMap); |
| 45 |
|
} |
| 46 |
< |
else if (arg == "-D") |
| 46 |
> |
else |
| 47 |
|
{ |
| 48 |
< |
if (!debug) debug = true; |
| 48 |
> |
api::Cout << "Usage: " << program << " -index=index -map=map [-D]\n"; |
| 49 |
|
} |
| 37 |
– |
} |
| 50 |
|
|
| 51 |
< |
if (!siteIndex.empty() && !siteMap.empty()) |
| 40 |
< |
{ |
| 41 |
< |
SiteMapper mapper(siteIndex, siteMap); |
| 42 |
< |
} |
| 43 |
< |
else |
| 44 |
< |
{ |
| 45 |
< |
cout << "Usage: " << program << " -index=index -map=map [-D]\n"; |
| 51 |
> |
return 0; |
| 52 |
|
} |
| 53 |
+ |
} mapper; |
| 54 |
|
|
| 55 |
< |
return 0; |
| 49 |
< |
} |
| 50 |
< |
|
| 51 |
< |
SiteMapper::SiteMapper(const string& siteIndex, const string& siteMap) |
| 55 |
> |
SiteMapper::SiteMapper(const ext::String& siteIndex, const ext::String& siteMap) |
| 56 |
|
{ |
| 57 |
|
oldMap(siteMap); |
| 58 |
|
newIndex(siteIndex); |
| 59 |
|
newMap(siteMap); |
| 60 |
|
} |
| 61 |
|
|
| 62 |
< |
void SiteMapper::oldMap(const string& siteMap) |
| 62 |
> |
void SiteMapper::oldMap(const ext::String& siteMap) |
| 63 |
|
{ |
| 64 |
|
ext::Handle<xml::Document> document(xml::Parse(siteMap)); |
| 65 |
|
ext::Handle<xml::Node> list(*document/"page"/"section"/"list"); |
| 66 |
|
|
| 67 |
|
comment = *document/"comment()"; |
| 68 |
|
|
| 69 |
+ |
if (debug) api::Cerr << "comment = " << comment << ios::NewLine; |
| 70 |
+ |
|
| 71 |
|
oldMap(pages, list); |
| 72 |
|
} |
| 73 |
|
|
| 74 |
< |
void SiteMapper::oldMap(vector<Page>& pages, xml::Node* list) |
| 74 |
> |
void SiteMapper::oldMap(ext::Vector<Page>& pages, xml::Node* list) |
| 75 |
|
{ |
| 76 |
|
xml::NodeSet nodes(*list/"item"); |
| 77 |
|
|
| 78 |
< |
for (xml::NodeSet::Iterator node(nodes.Begin()); node != nodes.End(); |
| 73 |
< |
++node) |
| 78 |
> |
_foreach (xml::NodeSet, node, nodes) |
| 79 |
|
{ |
| 80 |
< |
string url(**node/"link"/"@address"), title(**node/"link"); |
| 80 |
> |
ext::String url(**node/"link"/"@address"), title(**node/"link"); |
| 81 |
|
Page page(url, title); |
| 82 |
|
ext::Handle<xml::Node> list(**node/"list"); |
| 83 |
|
|
| 84 |
|
if (!list.IsEmpty()) oldMap(page.getChildren(), list); |
| 85 |
|
|
| 86 |
< |
pages.push_back(page); |
| 86 |
> |
pages.InsertLast(page); |
| 87 |
|
} |
| 88 |
|
} |
| 89 |
|
|
| 90 |
< |
void SiteMapper::newIndex(const string& siteIndex) |
| 90 |
> |
void SiteMapper::newIndex(const ext::String& siteIndex) |
| 91 |
|
{ |
| 92 |
|
ext::Handle<xml::Document> document(xml::Parse(siteIndex)); |
| 93 |
|
xml::NodeSet nodes(*document/"index"/"page"); |
| 94 |
|
|
| 95 |
< |
for (xml::NodeSet::Iterator node(nodes.Begin()); node != nodes.End(); |
| 91 |
< |
++node) |
| 95 |
> |
_foreach (xml::NodeSet, node, nodes) |
| 96 |
|
{ |
| 97 |
< |
string address(**node/"address"); |
| 98 |
< |
string port(**node/"port"); |
| 97 |
> |
ios::String address(**node/"address"); |
| 98 |
> |
ext::String port(**node/"port"); |
| 99 |
|
|
| 100 |
< |
if (!port.empty()) |
| 97 |
< |
{ |
| 98 |
< |
address += ':' + port; |
| 99 |
< |
} |
| 100 |
> |
if (!port.IsEmpty()) address << ":" << port; |
| 101 |
|
|
| 102 |
< |
string path(**node/"path"), title(**node/"title"); |
| 102 |
> |
ext::String path(**node/"path"), title(**node/"title"); |
| 103 |
|
Page page(address, path, title); |
| 104 |
|
Matcher matcher; |
| 105 |
|
|
| 106 |
< |
if (page == matcher(string("^Douglas\\sThrift's\\sWebsite\\s\\|\\sDou") |
| 106 |
< |
+ "glas\\sThrift's\\sBlog:\\s(.+)$")) |
| 106 |
> |
if (page == matcher("^Douglas\\sThrift's\\sWebsite\\s\\|\\sDouglas\\sThrift's\\sBlog:\\s(.+)$")) |
| 107 |
|
{ |
| 108 |
|
if (Matcher("^\\w+\\s\\d{4}\\sArchives$") == matcher[1]) |
| 109 |
|
{ |
| 121 |
|
} |
| 122 |
|
else continue; |
| 123 |
|
|
| 124 |
< |
multimap<string, Page> items; |
| 124 |
> |
std::multimap<std::string, Page> items; |
| 125 |
|
|
| 126 |
< |
newPages.insert(pair<string, multimap<string, Page> |
| 127 |
< |
>(page.getAddress(), items)).first->second.insert(pair<string, |
| 128 |
< |
Page>(page.getChildOf(), page)); |
| 126 |
> |
newPages.insert(std::pair<std::string, std::multimap<std::string, Page> >(page.getAddress(), items)).first->second.insert(std::pair<std::string, Page>(page.getChildOf(), page)); |
| 127 |
|
} |
| 128 |
|
} |
| 129 |
|
|
| 130 |
< |
bool SiteMapper::newIndex(vector<Page>& pages, Page& page) |
| 130 |
> |
bool SiteMapper::newIndex(ext::Vector<Page>& pages, Page& page) |
| 131 |
|
{ |
| 132 |
< |
for (unsigned index(0); index < pages.size(); ++index) |
| 132 |
> |
_mforeach (ext::Vector<Page>, page_, pages) |
| 133 |
|
{ |
| 134 |
< |
if (pages[index] == page.getAddress()) |
| 134 |
> |
if (*page_ == page.getAddress()) |
| 135 |
|
{ |
| 136 |
|
Matcher matcher; |
| 137 |
|
|
| 138 |
< |
if (pages[index] == page) |
| 138 |
> |
if (*page_ == page) |
| 139 |
|
{ |
| 140 |
< |
page.setChildren(pages[index].getChildren()); |
| 140 |
> |
page.setChildren(page_->getChildren()); |
| 141 |
|
|
| 142 |
< |
pages[index] = page; |
| 142 |
> |
*page_ = page; |
| 143 |
|
|
| 144 |
< |
cout << "Updated: " << page.getUrl() << '\n'; |
| 144 |
> |
api::Cout << "Updated: " << page.getUrl() << ios::NewLine; |
| 145 |
|
|
| 146 |
|
return true; |
| 147 |
|
} |
| 148 |
< |
else if (matcher('^' + pages[index].getPath()) == page) |
| 148 |
> |
else if (matcher("^" + page_->getPath()) == page) |
| 149 |
|
{ |
| 150 |
|
page.setChildOf(matcher[0]); |
| 151 |
|
|
| 152 |
< |
if (matcher('^' + pages[index].getTitle() + "\\s\\|\\s(.+)$") |
| 155 |
< |
== page) |
| 156 |
< |
{ |
| 157 |
< |
page.setTitle(matcher[1]); |
| 158 |
< |
} |
| 152 |
> |
if (matcher("^" + page_->getTitle() + "\\s\\|\\s(.+)$") == page) page.setTitle(matcher[1]); |
| 153 |
|
|
| 154 |
< |
return newIndex(pages[index].getChildren(), page); |
| 154 |
> |
return newIndex(page_->getChildren(), page); |
| 155 |
|
} |
| 156 |
|
} |
| 157 |
|
} |
| 159 |
|
return false; |
| 160 |
|
} |
| 161 |
|
|
| 162 |
< |
void SiteMapper::newMap(const string& siteMap) |
| 162 |
> |
void SiteMapper::newMap(const ext::String& siteMap) |
| 163 |
|
{ |
| 164 |
< |
ofstream fout(siteMap.c_str()); |
| 164 |
> |
api::FileWriter file(siteMap); |
| 165 |
> |
ios::FormatWriter fout(file); |
| 166 |
> |
xml::TextWriter xml(file); |
| 167 |
|
|
| 168 |
< |
fout << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" |
| 173 |
< |
<< "<?xml-stylesheet type=\"text/xsl\" href=\"stylesheets/sitemap.xsl" |
| 174 |
< |
<< "\"?>\n" |
| 175 |
< |
<< "<!DOCTYPE page SYSTEM \"stylesheets/page.dtd\">\n" |
| 176 |
< |
<< "<!--" << comment << "-->\n" |
| 177 |
< |
<< "<page>\n" |
| 178 |
< |
<< "\t<title>Sitemap</title>\n" |
| 179 |
< |
<< "\t<section>\n" |
| 180 |
< |
<< "\t\t<list>\n"; |
| 168 |
> |
fout << ios::NewLine << "<?xml-stylesheet type=\"text/xsl\" href=\"stylesheets/sitemap.xsl\"?>" << ios::NewLine << "<!DOCTYPE page SYSTEM \"stylesheets/page.dtd\">"; |
| 169 |
|
|
| 170 |
< |
for (unsigned index(0); index < pages.size(); ++index) |
| 183 |
< |
{ |
| 184 |
< |
if (newPages.find(pages[index].getAddress()) != newPages.end()) |
| 185 |
< |
{ |
| 186 |
< |
newMap(pages[index].getChildren(), pages[index].getPath(), |
| 187 |
< |
newPages.find(pages[index].getAddress())->second); |
| 188 |
< |
} |
| 170 |
> |
xml.OutputComment(comment); |
| 171 |
|
|
| 172 |
< |
fout << pages[index](3) << '\n'; |
| 191 |
< |
} |
| 172 |
> |
xml::ScopeElement page(xml, "page"); |
| 173 |
|
|
| 174 |
< |
fout << "\t\t</list>\n" |
| 175 |
< |
<< "\t</section>\n" |
| 176 |
< |
<< "</page>\n"; |
| 174 |
> |
xml.OpenElement("title"); |
| 175 |
> |
xml.OutputText("Sitemap"); |
| 176 |
> |
xml.CloseElement(); |
| 177 |
|
|
| 178 |
< |
fout.close(); |
| 198 |
< |
} |
| 178 |
> |
xml::ScopeElement section(xml, "section"), list(xml, "list"); |
| 179 |
|
|
| 180 |
< |
void SiteMapper::newMap(vector<Page>& pages, const string& childOf, |
| 201 |
< |
multimap<string, Page>& newPages) |
| 202 |
< |
{ |
| 203 |
< |
for (unsigned index(0); index < pages.size(); ++index) |
| 180 |
> |
_mforeach (ext::Vector<Page>, page, pages) |
| 181 |
|
{ |
| 182 |
< |
newMap(pages[index].getChildren(), pages[index].getPath(), newPages); |
| 182 |
> |
if (newPages.find(page->getAddress()) != newPages.end()) newMap(page->getChildren(), page->getPath(), newPages.find(page->getAddress())->second); |
| 183 |
> |
|
| 184 |
> |
xml << *page; |
| 185 |
|
} |
| 186 |
+ |
} |
| 187 |
+ |
|
| 188 |
+ |
void SiteMapper::newMap(ext::Vector<Page>& pages, const ext::String& childOf, std::multimap<std::string, Page>& newPages) |
| 189 |
+ |
{ |
| 190 |
+ |
_mforeach (ext::Vector<Page>, page, pages) newMap(page->getChildren(), page->getPath(), newPages); |
| 191 |
+ |
|
| 192 |
+ |
typedef std::multimap<std::string, Page> MultiMap; |
| 193 |
|
|
| 194 |
< |
for (multimap<string, Page>::iterator itor(newPages.lower_bound(childOf)); |
| 209 |
< |
itor != newPages.upper_bound(childOf); itor++) |
| 194 |
> |
_for (MultiMap::const_iterator, itor, newPages.lower_bound(childOf), newPages.upper_bound(childOf)) |
| 195 |
|
{ |
| 196 |
< |
cout << "Added: " << itor->second.getUrl() << '\n'; |
| 196 |
> |
api::Cout << "Added: " << itor->second.getUrl() << ios::NewLine; |
| 197 |
|
|
| 198 |
< |
pages.push_back(itor->second); |
| 198 |
> |
pages.InsertLast(itor->second); |
| 199 |
|
} |
| 200 |
|
|
| 201 |
|
newPages.erase(childOf); |
