ViewVC Help
View File | Revision Log | Show Annotations | Download File | View Changeset | Root Listing
root/repos/SiteMapper/Page.cpp
(Generate patch)

Comparing SiteMapper/Page.cpp (file contents):
Revision 141 by Douglas Thrift, 2004-03-25T19:21:58-08:00 vs.
Revision 332 by douglas, 2004-12-13T20:50:07-08:00

# Line 4 | Line 4
4   //
5   // $Id$
6  
7 < #include "Matcher.hpp"
8 < #include "Page.hpp"
7 > #include "SiteMapper.hpp"
8 > #include "Matcher/Matcher.hpp"
9  
10 < Page::Page(const string& address, const string& path, const string& title)
10 > void Page::setUrl(const ext::String& url)
11   {
12 <        setAddress(address);
13 <        setPath(path);
14 <        setTitle(title);
15 <
16 <        tab = 0;
17 < }
18 <
19 < Page::Page(const string& url, const string& title)
20 < {
21 <        setUrl(url);
22 <        setTitle(title);
23 <
24 <        tab = 0;
25 < }
26 <
27 < void Page::setUrl(const string& url)
28 < {
29 <        Matcher matcher("^http://(.+)(/.*)?$");
12 >        Matcher matcher("^http://(.+)(/.*)?$", (PCRE_UNGREEDY | PCRE_DOTALL));
13  
14          if (url == matcher)
15          {
16                  address = matcher[1];
17  
18 <                if (matcher.size() > 2)
36 <                {
37 <                        path = matcher[2];
38 <                }
39 <                else
40 <                {
41 <                        path = '/';
42 <                }
18 >                if (matcher.size() > 2) path = matcher[2]; else path = "/";
19          }
20          else
21          {
22 <                cerr << program << ": Page.setUrl(" << url << ") failure.\n";
22 >                api::Cerr << program << ": Page.setUrl(" << url << ") failure.\n";
23  
24 <                exit(1);
24 >                throw;
25          }
26   }
27  
28 < bool Page::operator==(const string& thing)
28 > bool Page::operator==(const ext::String& thing)
29   {
30 <        if (address == thing)
55 <        {
56 <                return true;
57 <        }
58 <        else if (path == thing)
59 <        {
60 <                return true;
61 <        }
62 <        else if (title == thing)
63 <        {
64 <                return true;
65 <        }
66 <
67 <        return false;
30 >        return address == thing || path == thing || title == thing;
31   }
32  
33   bool Page::operator==(Matcher& matcher)
34   {
35 <        if (address == matcher)
73 <        {
74 <                return true;
75 <        }
76 <        else if (path == matcher)
77 <        {
78 <                return true;
79 <        }
80 <        else if (title == matcher)
81 <        {
82 <                return true;
83 <        }
84 <
85 <        return false;
35 >        return address == matcher || path == matcher || title == matcher;
36   }
37  
38   bool Page::operator==(const Page& page) const
39   {
40          if (address == page.address)
41          {
42 <                if (path == page.path || title == page.title) return true;
42 >                return path == page.path || title == page.title;
43          }
44  
45          return false;
46   }
47  
48 < bool Page::operator<(const Page& page) const
99 < {
100 <        if (address == page.address)
101 <        {
102 <                return path < page.path;
103 <        }
104 <
105 <        return address < page.address;
106 < }
107 <
108 < bool Page::operator>(const Page& page) const
109 < {
110 <        if (address == page.address)
111 <        {
112 <                return path > page.path;
113 <        }
114 <
115 <        return address > page.address;
116 < }
117 <
118 < ostream& operator<<(ostream& output, Page& page)
48 > xml::TextWriter& operator<<(xml::TextWriter& xml, Page& page)
49   {
50 <        string tab(page.tab, '\t');
50 >        xml::ScopeElement item(xml, "item");
51  
52 <        output << tab << "<item><link address=\"" << page.getUrl() << "\">"
53 <                << page.title << "</link>\n";
52 >        xml.OpenElement("link");
53 >        xml.SetAttribute("address", page.getUrl());
54 >        xml.OutputText(page.title);
55 >        xml.CloseElement();
56  
57 <        if (!page.children.empty())
57 >        if (!page.children.IsEmpty())
58          {
59 <                output << tab << "\t<list>\n";
59 >                xml::ScopeElement list(xml, "list");
60  
61 <                for (unsigned index = 0; index < page.children.size(); index++)
130 <                {
131 <                        output << page.children[index](page.tab + 1) << '\n';
132 <                }
133 <
134 <                output << tab << "\t</list>\n";
61 >                _mforeach (ext::Vector<Page>, child, page.children) xml << *child;
62          }
63  
64 <        output << tab << "</item>";
138 <
139 <        return output;
64 >        return xml;
65   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines