20 |
|
<< ".\n" << reset; |
21 |
|
|
22 |
|
Stamp stamp; |
23 |
< |
ext::Handle<dbi::Connection> db(dbi::Connect(database.driver, database.host, |
23 |
> |
ext::Handle<dbi::Driver> driver(dbi::GetDriver(database.driver)); |
24 |
> |
ext::Handle<dbi::Connection> db(driver->Connect(database.host, |
25 |
|
database.user, database.password, database.db)); |
26 |
|
|
27 |
< |
db->Execute("DELETE FROM messages WHERE stamp<'" + ext::String(stamp - Day(30)) + "'"); |
27 |
> |
db->Execute("DELETE FROM messages WHERE stamp<'" |
28 |
> |
+ ext::String(stamp - Day(30)) + "'"); |
29 |
|
|
30 |
|
for (std::set<Buddy>::const_iterator buddy(buddies.begin()); |
31 |
|
buddy != buddies.end(); ++buddy) |
32 |
|
{ |
33 |
< |
ext::Handle<dbi::ResultSet> messages(db->Execute("SELECT stamp, message FROM messages WHERE id='" |
33 |
> |
ext::Handle<dbi::ResultSet> messages(db->Execute("SELECT stamp, message" |
34 |
> |
" FROM messages WHERE id='" |
35 |
|
+ lexical_cast<ext::String>(buddy->getId()) + "'")); |
36 |
< |
std::vector<AwayMessage> messages_; |
36 |
> |
std::set<AwayMessage, std::greater<AwayMessage> > messages_; |
37 |
|
|
38 |
< |
while (messages->MoveNext()) messages_.push_back(AwayMessage(messages->GetString("message"), |
38 |
> |
while (messages->MoveNext()) |
39 |
> |
messages_.insert(AwayMessage(messages->GetString("message"), |
40 |
|
messages->GetString("stamp"))); |
41 |
|
|
42 |
< |
Rss rss(*buddy, messages_, stamp); |
43 |
< |
Atom atom(*buddy, messages_, stamp); |
42 |
> |
ext::String display(buddy->getDisplay(database)); |
43 |
> |
Rss rss(*buddy, display, messages_.begin(), messages_.end(), stamp); |
44 |
> |
Atom atom(*buddy, display, messages_.begin(), messages_.end(), stamp); |
45 |
|
|
46 |
|
cerr << bright << yellow << "Updated feeds for " << blue << *buddy |
47 |
|
<< yellow << ".\n" << reset; |