57 |
|
SiteMapper::SiteMapper(const string& siteIndex, const string& siteMap) |
58 |
|
{ |
59 |
|
oldMap(siteMap); |
60 |
< |
index(siteIndex); |
60 |
> |
newIndex(siteIndex); |
61 |
|
newMap(siteMap); |
62 |
|
} |
63 |
|
|
90 |
|
evaluator.destroyXPath(list_); |
91 |
|
} |
92 |
|
|
93 |
< |
void SiteMapper::oldMap(list<Page>& pages, XalanNode* list) |
93 |
> |
void SiteMapper::oldMap(vector<Page>& pages, XalanNode* list_) |
94 |
|
{ |
95 |
< |
NodeRefList nodes = evaluator.selectNodeList(support, list, *item); |
95 |
> |
NodeRefList nodes = evaluator.selectNodeList(support, list_, *item); |
96 |
|
|
97 |
|
for (int index = 0; index < nodes.getLength(); index++) |
98 |
|
{ |
99 |
|
XalanNode* node = nodes.item(index); |
100 |
|
ostringstream url, title; |
101 |
< |
|
101 |
> |
|
102 |
|
url << evaluator.evaluate(support, node, *address)->str(); |
103 |
|
title << evaluator.evaluate(support, node, *link)->str(); |
104 |
|
|
105 |
|
Page page(url.str(), title.str()); |
106 |
< |
XalanNode* list = evaluator.selectSingleNode(support, node, *list_); |
106 |
> |
XalanNode* list = evaluator.selectSingleNode(support, node, |
107 |
> |
*(this->list_)); |
108 |
|
|
109 |
|
if (list != 0) oldMap(page.getChildren(), list); |
110 |
|
|
112 |
|
} |
113 |
|
} |
114 |
|
|
115 |
< |
void SiteMapper::index(const string& siteIndex) |
115 |
> |
void SiteMapper::newIndex(const string& siteIndex) |
116 |
|
{ |
117 |
|
XalanDOMString file(siteIndex.c_str()); |
118 |
|
LocalFileInputSource source(file.c_str()); |
125 |
|
port = evaluator.createXPath(XalanDOMString("port").c_str()); |
126 |
|
path = evaluator.createXPath(XalanDOMString("path").c_str()); |
127 |
|
title = evaluator.createXPath(XalanDOMString("title").c_str()); |
128 |
< |
|
128 |
> |
|
129 |
|
NodeRefList nodes = evaluator.selectNodeList(support, document, |
130 |
|
XalanDOMString("/index/page").c_str()); |
131 |
|
|
149 |
|
title << evaluator.evaluate(support, node, *(this->title))->str(); |
150 |
|
|
151 |
|
Page page(address.str(), path.str(), title.str()); |
152 |
< |
Matcher matcher("^Douglas Thrift's.+Website \\| (.+)$"); |
152 |
> |
Matcher matcher; |
153 |
|
|
154 |
< |
if (page == matcher) |
154 |
> |
if (page == matcher(string("^Douglas\\sThrift's\\sWebsite\\s\\|\\sDou") |
155 |
> |
+ "glas\\sThrift's\\sBlog:\\s(.+)$")) |
156 |
> |
{ |
157 |
> |
if (Matcher("^\\w+\\s\\d\\d\\d\\d\\sArchives$") == matcher[1]) |
158 |
> |
{ |
159 |
> |
page.setTitle(matcher[1]); |
160 |
> |
|
161 |
> |
if (newIndex(pages, page)) continue; |
162 |
> |
} |
163 |
> |
else continue; |
164 |
> |
} |
165 |
> |
else if (page == matcher("^Douglas\\sThrift's.+Website\\s\\|\\s(.+)$")) |
166 |
|
{ |
167 |
|
page.setTitle(matcher[1]); |
168 |
|
|
169 |
< |
newPages.insert(page); |
169 |
> |
if (newIndex(pages, page)) continue; |
170 |
|
} |
171 |
+ |
else continue; |
172 |
+ |
|
173 |
+ |
cerr << page.getTitle() << ' ' << page.getChildOf() << '\n'; |
174 |
+ |
// newPages.insert(page); |
175 |
|
} |
176 |
|
|
177 |
|
evaluator.destroyXPath(address); |
180 |
|
evaluator.destroyXPath(title); |
181 |
|
} |
182 |
|
|
183 |
+ |
bool SiteMapper::newIndex(vector<Page>& pages, Page& page) |
184 |
+ |
{ |
185 |
+ |
for (unsigned index = 0; index < pages.size(); index++) |
186 |
+ |
{ |
187 |
+ |
if (pages[index] == page.getAddress()) |
188 |
+ |
{ |
189 |
+ |
Matcher matcher; |
190 |
+ |
|
191 |
+ |
if (pages[index] == page) |
192 |
+ |
{ |
193 |
+ |
page.setChildren(pages[index].getChildren()); |
194 |
+ |
|
195 |
+ |
pages[index] = page; |
196 |
+ |
|
197 |
+ |
return true; |
198 |
+ |
} |
199 |
+ |
else if (matcher('^' + pages[index].getPath()) == page) |
200 |
+ |
{ |
201 |
+ |
page.setChildOf(matcher[0]); |
202 |
+ |
|
203 |
+ |
if (matcher('^' + pages[index].getTitle() + "\\s\\|\\s(.+)$") |
204 |
+ |
== page) |
205 |
+ |
{ |
206 |
+ |
page.setTitle(matcher[1]); |
207 |
+ |
} |
208 |
+ |
|
209 |
+ |
return newIndex(pages[index].getChildren(), page); |
210 |
+ |
} |
211 |
+ |
} |
212 |
+ |
} |
213 |
+ |
|
214 |
+ |
cerr << "Here!\n"; |
215 |
+ |
|
216 |
+ |
return false; |
217 |
+ |
} |
218 |
+ |
|
219 |
|
void SiteMapper::newMap(const string& siteMap) |
220 |
|
{ |
221 |
|
// |
222 |
|
|
223 |
< |
for (list<Page>::iterator itor = pages.begin(); itor != pages.end(); |
172 |
< |
itor++) |
223 |
> |
for (unsigned index = 0; index < pages.size(); index++) |
224 |
|
{ |
225 |
< |
cout << *itor << '\n'; |
225 |
> |
cout << pages[index] << '\n'; |
226 |
|
} |
227 |
|
} |