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

Comparing FeepingCreaturism/FeepingCreaturism.cpp (file contents):
Revision 203 by Douglas Thrift, 2004-09-01T02:10:19-07:00 vs.
Revision 236 by Douglas Thrift, 2004-09-10T16:15:19-07:00

# Line 32 | Line 32 | FeepingCreaturism::FeepingCreaturism()
32          ext::String path(env.get("PATH_INFO"));
33          Matcher matcher;
34  
35 <        if (path == "/daily/") daily(); else if (path == "/random/")
35 >        if (path == matcher("^/daily/(\\d{4}-\\d{2}-\\d{2})?$"))
36          {
37 <                random();
37 >                daily(matcher.size() > 1 ? matcher[1] : "");
38 >        }
39 >        else if (path == matcher("^/random/(\\d+)?$"))
40 >        {
41 >                random(matcher.size() > 1 ? matcher[1] : "");
42          }
43          else if (path == matcher("^/(" + this->matcher + ")$"))
44          {
# Line 49 | Line 53 | FeepingCreaturism::FeepingCreaturism()
53  
54   ext::String FeepingCreaturism::program;
55  
56 + bool FeepingCreaturism::CaseLess::operator()(const std::string& one,
57 +        const std::string& two)
58 + {
59 +        std::string one_(one), two_(two);
60 +
61 +        // XXX: should be std::tolower except g++34 doesn't believe it
62 +        std::transform(one.begin(), one.end(), one_.begin(), ::tolower);
63 +        std::transform(two.begin(), two.end(), two_.begin(), ::tolower);
64 +
65 +        return one_ < two_;
66 + }
67 +
68   void FeepingCreaturism::initialize()
69   {
70          ext::Handle<xml::Document> document(xml::Parse("jargon.xml"));
# Line 57 | Line 73 | void FeepingCreaturism::initialize()
73          this->path = *node/"jargon";
74          this->matcher = *node/"matcher";
75  
76 <        char* path[] = { new char[this->path.size()] };
76 >        char* path[] = { new char[this->path.GetData().GetSize()] };
77  
78 <        std::strcpy(path[0], this->path.c_str());
78 >        std::strcpy(path[0], this->path.NullTerminate());
79  
80          ::FTS* traversal(::fts_open(path, FTS_LOGICAL, NULL));
81          Matcher matcher("^" + this->path + "/(" + this->matcher + ")$");
# Line 115 | Line 131 | void FeepingCreaturism::parse()
131          while (query.good());
132   }
133  
134 < void FeepingCreaturism::daily()
134 > void FeepingCreaturism::daily(const ext::String& date)
135   {
136          std::time_t when(std::time(NULL));
137 <        std::tm* now(std::localtime(&when));
137 >        std::tm* day(std::localtime(&when));
138 >
139 >        day->tm_sec = 0;
140 >        day->tm_min = 0;
141 >        day->tm_hour = 0;
142  
143 <        now->tm_sec = 0;
124 <        now->tm_min = 0;
125 <        now->tm_hour = 0;
143 >        if (!date.IsEmpty()) ::strptime(date.NullTerminate(), "%Y-%m-%d", day);
144  
145 <        std::time_t difference(mktime(now) / 86400);
145 >        std::time_t difference(mktime(day) / 86400);
146          std::vector<ext::String> jargon(this->jargon.begin(), this->jargon.end());
147          ext::String entry(jargon.size() ? jargon[difference % jargon.size()] : "");
148  
149          select(entry);
150   }
151  
152 < void FeepingCreaturism::random()
152 > void FeepingCreaturism::random(const ext::String& number)
153   {
154          ::srandomdev();
155  
156          std::vector<ext::String> jargon(this->jargon.begin(), this->jargon.end());
157 <        ext::String entry(jargon.size() ? jargon[::random() % jargon.size()] : "");
157 >        std::vector<ext::String>::size_type random(number.IsEmpty() ? ::random() :
158 >                lexical_cast<std::vector<ext::String>::size_type>(number));
159 >
160 >        assert(random >= 0);
161 >        assert(random % jargon.size() < jargon.size());
162 >
163 >        ext::String entry(jargon.size() ? jargon[random % jargon.size()] : "");
164  
165          select(entry);
166   }
# Line 147 | Line 171 | void FeepingCreaturism::select(const ext
171          {
172                  api::Cout << "Content-Type: text/html; charset=UTF-8\r\n\r\n";
173  
174 <                _M::iterator include(cgi.find("include"));
175 <
176 <                if (include != cgi.end())
177 <                {
154 <                        Jargon jargon(path + "/" + selection,
155 <                                lexical_cast<bool>(include->second));
156 <
157 <                        api::Cout << jargon;
158 <                }
159 <                else
160 <                {
161 <                        Jargon jargon(path + "/" + selection);
174 >                Jargon jargon(path, selection, cgi.find("include") != cgi.end()
175 >                        && lexical_cast<bool>(ext::String(cgi.find("include")->second)),
176 >                        cgi.find("relative") != cgi.end()
177 >                        ? ext::String(cgi.find("relative")->second) : ext::String());
178  
179 <                        api::Cout << jargon;
164 <                }
179 >                api::Cout << jargon;
180          }
181          else
182          {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines