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

Comparing trunk/Collector.cpp (file contents):
Revision 31 by douglas, 2004-07-20T00:11:56-07:00 vs.
Revision 35 by douglas, 2004-07-21T20:43:31-07:00

# Line 16 | Line 16 | extern "C"
16   #include <unistd.h>
17   }
18  
19 < Collector::Collector(const ext::String& login, ext::String& password, const
20 <        std::set<Buddy>& buddies, const Database& database, bool start) :
21 <        login(login), password(password), buddies(buddies), database(database),
19 > Collector::Collector(const ext::String& login, ext::String& password, const     std::set<Buddy>& buddies,
20 >        const Database& database, bool start) : login(login), password(password), buddies(buddies), database(database),
21          start(start), prompted(false)
22   {
23          if (start)
# Line 53 | Line 52 | int Collector::collect()
52  
53          net::Oscar::StringSet buddies;
54  
55 <        for (std::set<Buddy>::const_iterator buddy(this->buddies.begin()); buddy !=
56 <                this->buddies.end(); ++buddy) buddies.Insert(*buddy);
55 >        for (std::set<Buddy>::const_iterator buddy(this->buddies.begin()); buddy != this->buddies.end(); ++buddy)
56 >                buddies.Insert(*buddy);
57  
58          buddy.Insert(buddies);
60 –        icbm.RequestParams();
59  
60          net::Oscar::Capabilities capabilities;
61  
62          capabilities.Insert(net::Oscar::ChatCapability);
63 <        info.SetProfile(ext::String("<font face=\"Tahoma\" size=2>I am <a href=\"h")
64 <                + "ttp://computers.douglasthrift.net/zoe.xml\">Zoe</a>.</font> :-*", "<"
67 <                + ext::String("font face=\"Tahoma\" size=3>Mommy told me not to talk t")
68 <                + "o strangers.</font> O:-)", capabilities);
63 >        info.SetProfile("<font face=\"Tahoma\" size=2>I am <a href=\"http://computers.douglasthrift.net/zoe.xml\">Zoe</a>."
64 >                "</font> :-*", "<font face=\"Tahoma\" size=2>Mommy told me not to talk to strangers.</font> O:-)", capabilities);
65  
66          // figure out whether or not we logged in
67  
# Line 81 | Line 77 | void Collector::prompt()
77  
78          this->password = password;
79  
80 <        for (size_t index(std::strlen(password)); index > 0; --index)
85 <                password[index - 1] = '\0';
80 >        for (size_t index(std::strlen(password)); index > 0; --index) password[index - 1] = '\0';
81   }
82  
83   void Collector::status(const net::Oscar::UserInfo& user)
# Line 92 | Line 87 | void Collector::status(const net::Oscar:
87  
88          if (!ext::String(message).IsEmpty()) // XXX
89          {
90 <                cerr << bright << red << "Collector::status(" << blue << buddy << red
91 <                        << ", " << reset << message << bright << red << ")\n" << reset;
90 >                ext::Handle<dbi::Connection> db(dbi::Connect(database.driver, database.host, database.user, database.password,
91 >                        database.db));
92 >                ext::Handle<dbi::ResultSet> previous(db->Execute("SELECT message FROM messages WHERE stamp=(SELECT MAX(stamp) "
93 >                        "FROM messages WHERE id='" + lexical_cast<ext::String>(buddy.getId()) + "') AND id='"
94 >                        + lexical_cast<ext::String>(buddy.getId()) + "'"));
95  
96 <                ext::Handle<dbi::Connection> db(dbi::Connect(database.driver,
99 <                        database.host, database.user, database.password, database.db));
96 >                if (previous->MoveNext()) if (ext::String(message) == previous->GetString("message")) return;
97  
98 <                db->Execute("INSERT INTO messages (stamp, message, id) VALUES ('" +
99 <                        message.getStamp() + "', '" + db->Escape(message) + "', '" +
100 <                        buddy.getId() + "')");
98 >                cerr << bright << red << "Collector::status(" << blue << buddy << red << ", " << reset << message << bright << red
99 >                        << ")\n" << reset;
100 >
101 >                db->Execute("INSERT INTO messages (stamp, message, id) VALUES ('" + ext::String(message.getStamp()) + "', '"
102 >                        + db->Escape(message) + "', '" + lexical_cast<ext::String>(buddy.getId()) + "')");
103          }
104   }
105  
106   void Collector::receive(const ext::String& buddy, const ext::String& message)
107   {
108 <        cerr << bright << red << "Collector::receive(" << blue << Buddy(buddy)
109 <                << red << ", " << reset << message << bright << red << ")\n" << reset;
108 >        cerr << bright << red << "Collector::receive(" << blue << Buddy(buddy) << red << ", " << reset << message << bright
109 >                << red << ")\n" << reset;
110  
111          if (buddies.find(buddy) != buddies.end())
112          {
# Line 115 | Line 114 | void Collector::receive(const ext::Strin
114                  
115                  sleep(1);
116  
117 <                icbm->Simple(buddy, stamp);
117 >                icbm->Simple(buddy, ext::String(stamp) + " " + lexical_cast<ext::String>(std::time(NULL)) + " "
118 >                        + lexical_cast<ext::String>(api::GetWallTimerSeconds()));
119          }
120          else
121          {
122                  sleep(1);
123  
124 <                icbm->Simple(buddy, ext::String("<font face=\"Tahoma\" size=2>Mommy to")
125 <                        + "ld me not to talk to strangers. O:-)");
124 >                icbm->Simple(buddy, "<font face=\"Tahoma\" size=2>Mommy told me not to talk to strangers.</font> O:-)");
125          }
126   }

Diff Legend

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