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 43 by douglas, 2004-08-15T21:33:25-07:00 vs.
Revision 50 by douglas, 2004-08-22T16:37:38-07:00

# Line 19 | Line 19 | extern "C"
19   #include <unistd.h>
20   }
21  
22 < int main(int argc, char* argv[])
22 > int zoe(const std::vector<const char*> args)
23   {
24 <        Zoe::program = argv[0];
24 >        Zoe::program = args[0];
25  
26 <        for (int index(1); index < argc; ++index)
26 >        for (int index(1); index < args.size(); ++index)
27          {
28 <                ext::String arg(argv[index]);
28 >                ext::String arg(args[index]);
29                  Matcher matcher;
30  
31                  if (arg == matcher("^-config=(.*)$"))
# Line 56 | Line 56 | int main(int argc, char* argv[])
56          return 0;
57   }
58  
59 + int main(int argc, char* argv[])
60 + {
61 +        std::vector<const char*> args(argv, argv + argc);
62 +
63 +        return app::be::ThreadMain_(etl::BindAll(&zoe, args));
64 + }
65 +
66   Zoe::Zoe()
67   {
68          if (!(collector || publisher)) usage();
# Line 159 | Line 166 | void Zoe::configure()
166                  ++buddy)
167          {
168                  Buddy buddy_(**buddy/"login", **buddy/"rss", **buddy/"atom",
169 <                        !(**buddy/"link").IsEmpty() ? **buddy/"link" : link);
169 >                        !(**buddy/"link").IsEmpty() ? **buddy/"link" : (link
170 >                        + std::string(**buddy/"login") + ".html"));
171  
172                  this->buddies.insert(buddy_);
173          }
# Line 193 | Line 201 | void Zoe::initialize()
201  
202          while (buddies->MoveNext())
203          {
204 <                Buddy buddy(*this->buddies.find(buddies->GetString("buddy")));
204 >                if (this->buddies.find(buddies->GetString("buddy")) != this->buddies.end())
205 >                {
206 >                        Buddy buddy(*this->buddies.find(buddies->GetString("buddy")));
207  
208 <                buddy.setId(lexical_cast<ext::Uuid>(buddies->GetString("id")));
209 <                buddies_.insert(buddy);
208 >                        buddy.setId(lexical_cast<ext::Uuid>(buddies->GetString("id")));
209 >                        buddies_.insert(buddy);
210 >                }
211          }
212  
213          std::vector<Buddy> difference;

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines