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

Comparing trunk/Zoe.cpp (file contents):
Revision 36 by douglas, 2004-07-22T01:19:40-07:00 vs.
Revision 43 by douglas, 2004-08-15T21:33:25-07:00

# Line 40 | Line 40 | int main(int argc, char* argv[])
40                  {
41                          if (!Zoe::publisher) Zoe::publisher = true;
42                  }
43 <                else if (arg == "-D")
43 >                else if (arg == "-color")
44                  {
45 <                        if (!Zoe::debug) Zoe::debug = true;
45 >                        if (!Zoe::color) Zoe::color = true;
46                  }
47 <                else
47 >                else if (arg == "-D")
48                  {
49 <                        cerr << bright << "Usage: " << cyan << Zoe::program << reset << " ["
50 <                                << bright << blue <<  "-config=" << yellow << "config" << reset
51 <                                << "] [" << bright << blue << "-collector" << reset << "] ["
52 <                                << bright << blue << "-publisher" << reset << "] [" << bright
53 <                                << blue << "-D" << reset << "]\n";
54 <
55 <                        return 1;
49 >                        if (!Zoe::debug) Zoe::debug = true;
50                  }
51 +                else Zoe::usage();
52          }
53  
54          Zoe zoe;
# Line 63 | Line 58 | int main(int argc, char* argv[])
58  
59   Zoe::Zoe()
60   {
61 +        if (!(collector || publisher)) usage();
62 +        
63          configure();
64          initialize();
65  
# Line 70 | Line 67 | Zoe::Zoe()
67          Publisher publisher(buddies, database, Zoe::publisher);
68   }
69  
70 < bool Zoe::debug(false), Zoe::collector(false), Zoe::publisher(false);
70 > bool Zoe::debug(false), Zoe::collector(false), Zoe::publisher(false),
71 >         Zoe::color(false);
72   ext::String Zoe::program, Zoe::config("zoe.xml");
73  
74 + void Zoe::usage()
75 + {
76 +        cerr << "Usage: " << Zoe::program << " [-config=config] [-collector] "
77 +                "[-publisher] [-color] [-D]\n";
78 +
79 +        exit(1);
80 + }
81 +
82   ext::String Zoe::generator(Generator generator)
83   {
84          ext::String generator_(generator == all || generator == agent ? "Zoe" : "");
# Line 125 | Line 131 | void Zoe::configure()
131  
132          if ((*zoe/"database"/"password").IsEmpty())
133          {
134 <                ext::String prompt(database.user + (!database.host.IsEmpty() ? "@" : "") + database.host
135 <                        + (!database.user.IsEmpty() ? "'s " : "") + "Database Password: ");
134 >                ext::String prompt(database.user + (!database.host.IsEmpty() ? "@" : "")
135 >                        + database.host + (!database.user.IsEmpty() ? "'s " : "")
136 >                        + "Database Password: ");
137                  char* password(getpass(prompt.NullTerminate()));
138  
139                  database.password = password;
140  
141 <                for (size_t index(std::strlen(password)); index > 0; --index) password[index - 1] = '\0';
141 >                for (size_t index(std::strlen(password)); index > 0; --index)
142 >                        password[index - 1] = '\0';
143          }
144          else database.password = std::string(*zoe/"database"/"password");
145  
146          database.db = std::string(*zoe/"database"/"db");
147  
148 <        if (debug) cerr << "login = " << login << "\npassword = " << std::string(password.GetSize(), '*') << "\ndatabase = {\n"
149 <                << "   driver = " << database.driver << "\n   host=" << database.host << "\n   user = " << database.user << '\n'
150 <                << "   password = " << std::string(database.password.GetSize(), '*') << "\n   db = " << database.db << "\n}\n";
148 >        if (debug) cerr << "login = " << login << "\npassword = "
149 >                << std::string(password.GetSize(), '*') << "\ndatabase = {\n"
150 >                << "   driver = " << database.driver << "\n   host=" << database.host
151 >                << "\n   user = " << database.user << '\n'
152 >                << "   password = " << std::string(database.password.GetSize(), '*')
153 >                << "\n   db = " << database.db << "\n}\n";
154  
155 +        std::string link(*zoe/"link");
156          xml::NodeSet buddies(*zoe/"buddy");
157  
158 <        for (xml::NodeSet::Iterator buddy(buddies.Begin()); buddy != buddies.End(); ++buddy)
159 <                this->buddies.insert(Buddy(**buddy/"login", **buddy/"rss"));
158 >        for (xml::NodeSet::Iterator buddy(buddies.Begin()); buddy != buddies.End();
159 >                ++buddy)
160 >        {
161 >                Buddy buddy_(**buddy/"login", **buddy/"rss", **buddy/"atom",
162 >                        !(**buddy/"link").IsEmpty() ? **buddy/"link" : link);
163 >
164 >                this->buddies.insert(buddy_);
165 >        }
166  
167          if (debug)
168          {
169                  cerr << "buddies = {\n";
170  
171 <                for (std::set<Buddy>::const_iterator buddy(this->buddies.begin()); buddy != this->buddies.end(); ++buddy)
172 <                        cerr << "   " << *buddy << " = " << buddy->getRss() << '\n';
171 >                for (std::set<Buddy>::const_iterator buddy(this->buddies.begin());
172 >                        buddy != this->buddies.end(); ++buddy)
173 >                {
174 >                        cerr << "   " << *buddy << " = {\n      rss = " << buddy->getRss()
175 >                                << "\n      atom = " << buddy->getAtom() << "\n      link = "
176 >                                << buddy->getLink() << "\n   }\n";
177 >                }
178  
179                  cerr << "}\n";
180          }
181  
159        if (!collector && !publisher)
160        {
161                collector = true;
162                publisher = true;
163        }
164
182          if (debug) cerr << "collector = " << lexical_cast<ext::String>(collector)
183 <                << "\npublisher = " << lexical_cast<ext::String>(publisher) << '\n';
183 >                << "\npublisher = " << lexical_cast<ext::String>(publisher)
184 >                << "\ncolor = " << lexical_cast<ext::String>(color) << '\n';
185   }
186  
187   void Zoe::initialize()
188   {
189 <        ext::Handle<dbi::Connection> db(dbi::Connect(database.driver, database.host, database.user, database.password,
190 <                database.db));
189 >        ext::Handle<dbi::Connection> db(dbi::Connect(database.driver, database.host,
190 >                database.user, database.password, database.db));
191          ext::Handle<dbi::ResultSet> buddies(db->Execute("SELECT * FROM buddies"));
192          std::set<Buddy> buddies_;
193  
# Line 183 | Line 201 | void Zoe::initialize()
201  
202          std::vector<Buddy> difference;
203  
204 <        set_difference(this->buddies.begin(), this->buddies.end(), buddies_.begin(), buddies_.end(),
205 <                std::insert_iterator<std::vector<Buddy> >(difference, difference.begin()));
204 >        set_difference(this->buddies.begin(), this->buddies.end(), buddies_.begin(),
205 >                buddies_.end(), std::insert_iterator<std::vector<Buddy> >(difference,
206 >                difference.begin()));
207  
208 <        for (std::vector<Buddy>::iterator buddy(difference.begin()); buddy != difference.end(); ++buddy)
208 >        for (std::vector<Buddy>::iterator buddy(difference.begin());
209 >                buddy != difference.end(); ++buddy)
210          {
211                  ext::Uuid id;
212  
213                  api::Uuid::CreateSequential(id);
214  
215                  buddy->setId(id);
216 <                db->Execute("INSERT INTO buddies (id, buddy) VALUES ('" + lexical_cast<ext::String>(id) + "', '"
217 <                        + ext::String(*buddy) + "')");
216 >                db->Execute("INSERT INTO buddies (id, buddy) VALUES ('"
217 >                        + lexical_cast<ext::String>(id) + "', '" + ext::String(*buddy)
218 >                        + "')");
219                  
220                  buddies_.insert(*buddy);
221          }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines