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 261 by Douglas Thrift, 2004-10-07T22:20:16-07:00 vs.
Revision 375 by douglas, 2004-12-22T18:12:44-08:00

# Line 5 | Line 5
5   // $Id$
6  
7   #include "Environment.hpp"
8 < #include "Matcher.hpp"
8 > #include "Matcher/Matcher.hpp"
9   #include "Jargon.hpp"
10  
11 extern "C"
12 {
13 #include <sys/types.h>
14 #include <sys/stat.h>
15 #include <fts.h>
16 }
17
11   #include <menes-api/exename.hpp>
12   #include <menes-app/simple.hpp>
13  
# Line 49 | Line 42 | FeepingCreaturism::FeepingCreaturism()
42          }
43          else
44          {
45 <                api::Cout << "Location: http://" << env.get("HTTP_HOST")
53 <                        << env.get("SCRIPT_NAME") << "/daily/\r\n\r\n";
45 >                api::Cout << "Location: http://" << env.get("HTTP_HOST") << env.get("SCRIPT_NAME") << "/daily/\r\n\r\n";
46          }
47   }
48  
# Line 72 | Line 64 | bool FeepingCreaturism::CaseLess::operat
64  
65   void FeepingCreaturism::initialize()
66   {
67 <        ext::Handle<xml::Document> document(xml::Parse("jargon.xml"));
68 <        ext::Handle<xml::Node> node(*document/"feepingcreaturism");
67 >        _H<xml::Document> document(xml::Parse("jargon.xml"));
68 >        _H<xml::Node> node(*document/"feepingcreaturism");
69  
70          this->path = *node/"jargon";
71          this->matcher = *node/"matcher";
72  
73 <        char* path[] = { new char[this->path.GetData().GetSize()] };
73 >        _L<ext::String> args(1, this->path);
74  
75 <        std::strcpy(path[0], this->path.NullTerminate());
75 >        args.InsertLast("-type");
76 >        args.InsertLast("f");
77  
78 <        ::FTS* traversal(::fts_open(path, FTS_LOGICAL, NULL));
78 >        _S<api::Process> find("/usr/bin/find", args);
79          Matcher matcher("^" + this->path + "/(" + this->matcher + ")$");
80 +        ext::String path;
81  
82 <        if (traversal == NULL)
82 >        while (ios::ReadLine(*find.GetReader(), path)) if (matcher == path)
83          {
84 <                api::Cerr << program << ": Horrible Failure!\n";
91 <
92 <                std::exit(1);
84 >                jargon.insert(matcher[1]);
85          }
94
95        for (::FTSENT* entity(::fts_read(traversal)); entity != NULL;
96                entity = ::fts_read(traversal))
97        {
98                if (entity->fts_info == FTS_F && entity->fts_path == matcher)
99                {
100                        jargon.insert(matcher[1]);
101                }
102        }
103
104        ::fts_close(traversal);
105
106        delete [] path[0];
86   }
87  
88   void FeepingCreaturism::parse()
# Line 112 | Line 91 | void FeepingCreaturism::parse()
91  
92          if (env.get("REQUEST_METHOD") == "POST")
93          {
94 <                std::streamsize length(lexical_cast<std::streamsize>(env.get("CONTENT_"
116 <                        "TYPE")));
94 >                std::streamsize length(lexical_cast<std::streamsize>(env.get("CONTENT_TYPE")));
95                  char* content(new char[length]);
96  
97                  api::Cin.Read(content, length);
# Line 131 | Line 109 | void FeepingCreaturism::parse()
109                  std::getline(query, name, '=');
110                  std::getline(query, value, '&');
111  
112 <                cgi.insert(_P(name, value));
112 >                cgi.insert(std::pair<std::string, std::string>(name, value));
113          }
114          while (query.good());
115   }
# Line 148 | Line 126 | void FeepingCreaturism::daily(const ext:
126          if (!date.IsEmpty()) ::strptime(date.NullTerminate(), "%Y-%m-%d", day);
127  
128          std::time_t difference(mktime(day) / 86400);
129 <        std::vector<ext::String> jargon(this->jargon.begin(), this->jargon.end());
130 <        ext::String entry(jargon.size() ? jargon[difference % jargon.size()] : "");
129 >        ext::Vector<ext::String> jargon(this->jargon.begin(), this->jargon.end());
130 >        ext::String entry(jargon.GetSize() ? jargon[difference % jargon.GetSize()] : "");
131  
132          select(entry);
133   }
# Line 158 | Line 136 | void FeepingCreaturism::random(const ext
136   {
137          ::srandomdev();
138  
139 <        std::vector<ext::String> jargon(this->jargon.begin(), this->jargon.end());
140 <        std::vector<ext::String>::size_type random(number.IsEmpty() ? ::random() :
163 <                lexical_cast<std::vector<ext::String>::size_type>(number));
139 >        ext::Vector<ext::String> jargon(this->jargon.begin(), this->jargon.end());
140 >        size_t random(number.IsEmpty() ? ::random() : lexical_cast<size_t>(number));
141  
142          assert(random >= 0);
143 <        assert(random % jargon.size() < jargon.size());
143 >        assert(random % jargon.GetSize() < jargon.GetSize());
144  
145 <        ext::String entry(jargon.size() ? jargon[random % jargon.size()] : "");
145 >        ext::String entry(jargon.GetSize() ? jargon[random % jargon.GetSize()] : "");
146  
147          select(entry);
148   }
# Line 176 | Line 153 | void FeepingCreaturism::select(const ext
153          {
154                  api::Cout << "Content-Type: text/html; charset=UTF-8\r\n\r\n";
155  
156 <                Jargon jargon(path, selection, cgi.find("include") != cgi.end()
180 <                        && lexical_cast<bool>(ext::String(cgi.find("include")->second)),
181 <                        cgi.find("relative") != cgi.end()
182 <                        ? ext::String(cgi.find("relative")->second) : ext::String());
156 >                Jargon jargon(path, selection, cgi.find("include") != cgi.end() && lexical_cast<bool>(ext::String(cgi.find("include")->second)), cgi.find("relative") != cgi.end() ? ext::String(cgi.find("relative")->second) : ext::String());
157  
158                  api::Cout << jargon;
159          }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines