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 287 by douglas, 2004-11-28T03:35:24-08:00 vs.
Revision 423 by douglas, 2005-03-09T19:23:17-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   void Page::setUrl(const ext::String& url)
11   {
12 <        Matcher matcher("^http://(.+)(/.*)?$");
12 >        Matcher matcher("^http://(.+)(/.*)?$", (PCRE_UNGREEDY | PCRE_DOTALL));
13  
14          if (url == matcher)
15          {
# Line 19 | Line 19 | void Page::setUrl(const ext::String& url
19          }
20          else
21          {
22 <                api::Cerr << program << ": Page.setUrl(" << url << ") failure.\n";
22 >                api::Cerr << SiteMapper::program << ": Page.setUrl(" << url << ") failure.\n";
23  
24 <                std::exit(1);
24 >                throw;
25          }
26   }
27  
# Line 58 | Line 58 | xml::TextWriter& operator<<(xml::TextWri
58          {
59                  xml::ScopeElement list(xml, "list");
60  
61 <                _mforeach (ext::Vector<Page>, child, page.children) xml << *child;
61 >                _foreach (ext::Vector<Page>, child, page.children) xml << *child;
62          }
63  
64          return xml;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines