ViewVC Help

View File | Revision Log | Show Annotations | Download File | View Changeset | Root Listing

root/repos/SiteMapper/SiteMapper.cpp

Comparing SiteMapper/SiteMapper.cpp (file contents):
Revision 303 by douglas, 2004-12-12T17:58:03-08:00 vs.
Revision 423 by douglas, 2005-03-09T19:23:17-08:00

#	Line 5 | Line 5
5		// $Id$
6
7		#include "SiteMapper.hpp"
8	<	#include "Matcher.hpp"
9	<	#include "Page.hpp"
8	>	#include "Matcher/Matcher.hpp"
9
10		#include <menes-api/exename.hpp>
11		#include <menes-app/application.hpp>
12
14	–	ext::String program;
15	–	bool debug(false);
16	–
13		struct SiteMapperCommand : public app::Application
14		{
15		virtual int Run(const app::ArgumentList& args)
16		{
17	<	program = api::GetExecutablePath().GetName();
17	>	SiteMapper::program = api::GetExecutablePath().GetName();
18
19		ext::String siteIndex, siteMap;
20
21	<	_foreach (app::ArgumentList, arg, args)
21	>	_foreach (const app::ArgumentList, arg, args)
22		{
23		Matcher matcher;
24
#	Line 36 | Line 32 | struct SiteMapperCommand : public app::A
32		}
33		else if (*arg == "-D")
34		{
35	<	if (!debug) debug = true;
35	>	if (!SiteMapper::debug) SiteMapper::debug = true;
36		}
37		}
38
#	Line 46 | Line 42 | struct SiteMapperCommand : public app::A
42		}
43		else
44		{
45	<	api::Cout << "Usage: " << program << " -index=index -map=map [-D]\n";
45	>	api::Cout << "Usage: " << SiteMapper::program << " -index=index -map=map [-D]\n";
46		}
47
48		return 0;
#	Line 60 | Line 56 | SiteMapper::SiteMapper(const ext::String
56		newMap(siteMap);
57		}
58
59	+	ext::String SiteMapper::program;
60	+	bool SiteMapper::debug(false);
61	+
62		void SiteMapper::oldMap(const ext::String& siteMap)
63		{
64		ext::Handle<xml::Document> document(xml::Parse(siteMap));
#	Line 130 | Line 129 | void SiteMapper::newIndex(const ext::Str
129
130		bool SiteMapper::newIndex(ext::Vector<Page>& pages, Page& page)
131		{
132	<	_mforeach (ext::Vector<Page>, page_, pages)
132	>	_foreach (ext::Vector<Page>, page_, pages)
133		{
134		if (*page_ == page.getAddress())
135		{
#	Line 178 | Line 177 | void SiteMapper::newMap(const ext::Strin
177
178		xml::ScopeElement section(xml, "section"), list(xml, "list");
179
180	<	_mforeach (ext::Vector<Page>, page, pages)
180	>	_foreach (ext::Vector<Page>, page, pages)
181		{
182		if (newPages.find(page->getAddress()) != newPages.end()) newMap(page->getChildren(), page->getPath(), newPages.find(page->getAddress())->second);
183
#	Line 188 | Line 187 | void SiteMapper::newMap(const ext::Strin
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);
190	>	_foreach (ext::Vector<Page>, page, pages) newMap(page->getChildren(), page->getPath(), newPages);
191
192		typedef std::multimap<std::string, Page> MultiMap;
193

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines