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 129 by Douglas Thrift, 2004-03-23T22:49:41-08:00 vs.
Revision 559 by douglas, 2005-07-17T04:58:55-07:00

# Line 4 | Line 4
4   //
5   // $Id$
6  
7 < #include "Matcher.hpp"
8 < #include "Page.hpp"
7 > #include <menes/cxx/standard.hh>
8  
9 < Page::Page(const string& address, const string& path, const string& title)
11 < {
12 <        setAddress(address);
13 <        setPath(path);
14 <        setTitle(title);
15 < }
9 > #include <menes/api/pcre/regex.hpp>
10  
11 < Page::Page(const string& url)
18 < {
19 <        setUrl(url);
20 < }
11 > #include "SiteMapper.hpp"
12  
13 < void Page::setUrl(const string& url)
13 > void Page::SetUrl(const cse::String& url)
14   {
15 <        Matcher matcher("^http://(.+)(/.*)?$");
15 >        static api::Pcre::RegEx url_(_B("^http://([^/]+)(/.*)?$"));
16  
17 <        if (url == matcher)
17 >        if (api::Pcre::RegEx::Match match = url_(url))
18          {
19 <                address = matcher[1];
20 <
30 <                if (matcher.size() > 2)
31 <                {
32 <                        path = matcher[2];
33 <                }
34 <                else
35 <                {
36 <                        path = '/';
37 <                }
19 >                address = match[1];
20 >                path = !match[2].IsEmpty() ? match[2] : cse::String(_B("/"));
21          }
22          else
23 <        {
41 <                cerr << program << ": Page.setUrl(" << url << ") failure.\n";
42 <
43 <                exit(1);
44 <        }
23 >                throw ext::StringException(url);
24   }
25  
26 < bool Page::operator==(const string& thing)
26 > bool Page::operator==(const cse::String& thing)
27   {
28 <        //
50 <
51 <        return false;
28 >        return address == thing || path == thing || title == thing;
29   }
30  
31 < bool Page::operator==(Page& page)
31 > bool Page::operator==(const Page& page) const
32   {
33 <        //
33 >        if (address == page.address)
34 >        {
35 >                return path == page.path || title == page.title;
36 >        }
37  
38          return false;
39   }
40  
41 < bool Page::operator<(Page& page)
41 > xml::TextWriter& operator<<(xml::TextWriter& xml, Page& page)
42   {
43 <        //
43 >        xml::ScopeElement item(xml, _B("item"));
44  
45 <        return false;
46 < }
45 >        xml.OpenElement(_B("link"));
46 >        xml.SetAttribute(_B("address"), page.GetUrl());
47 >        xml.OutputText(page.title);
48 >        xml.CloseElement();
49  
50 < bool Page::operator>(Page& page)
51 < {
52 <        //
50 >        if (!page.children.IsEmpty())
51 >        {
52 >                xml::ScopeElement list(xml, _B("list"));
53  
54 <        return false;
54 >                _foreach (ext::Vector<Page>, child, page.children) xml << *child;
55 >        }
56 >
57 >        return xml;
58   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines