| 4 |
|
// |
| 5 |
|
// $Id$ |
| 6 |
|
|
| 7 |
< |
#include "Matcher.hpp" |
| 7 |
> |
#include "Matcher/Matcher.hpp" |
| 8 |
|
#include "Collector.hpp" |
| 9 |
|
#include "Publisher.hpp" |
| 10 |
|
|
| 11 |
|
#include <menes-api/exename.hpp> |
| 12 |
|
#include <menes-app/application.hpp> |
| 13 |
+ |
#include <menes-ios/stdadapters.hpp> |
| 14 |
|
|
| 15 |
|
#include <algorithm> |
| 16 |
|
#include <cstring> |
| 27 |
|
{ |
| 28 |
|
virtual int Run(const app::ArgumentList& args) |
| 29 |
|
{ |
| 30 |
< |
Zoe::program = api::GetExecutableName(); |
| 30 |
> |
Zoe::program = api::GetExecutablePath().GetName(); |
| 31 |
|
|
| 32 |
< |
for (size_t index(0); index < args.GetSize(); ++index) |
| 32 |
> |
_foreach (app::ArgumentList, arg, args) |
| 33 |
|
{ |
| 33 |
– |
ext::String arg(args[index]); |
| 34 |
|
Matcher matcher; |
| 35 |
|
|
| 36 |
< |
if (arg == matcher("^-config=(.*)$")) |
| 36 |
> |
if (*arg == matcher("^-config=(.*)$")) |
| 37 |
|
{ |
| 38 |
|
Zoe::config = matcher[1]; |
| 39 |
|
} |
| 40 |
< |
else if (arg == "-collector") |
| 40 |
> |
else if (*arg == "-collector") |
| 41 |
|
{ |
| 42 |
|
if (!Zoe::collector) Zoe::collector = true; |
| 43 |
|
} |
| 44 |
< |
else if (arg == "-publisher") |
| 44 |
> |
else if (*arg == "-publisher") |
| 45 |
|
{ |
| 46 |
|
if (!Zoe::publisher) Zoe::publisher = true; |
| 47 |
|
} |
| 48 |
< |
else if (arg == "-color") |
| 48 |
> |
else if (*arg == "-color") |
| 49 |
|
{ |
| 50 |
|
if (!Zoe::color) Zoe::color = true; |
| 51 |
|
} |
| 52 |
< |
else if (arg == "-D") |
| 52 |
> |
else if (*arg == "-D") |
| 53 |
|
{ |
| 54 |
|
if (!Zoe::debug) Zoe::debug = true; |
| 55 |
|
} |
| 56 |
< |
else Zoe::usage(); |
| 56 |
> |
else |
| 57 |
> |
{ |
| 58 |
> |
Zoe::usage(); |
| 59 |
> |
|
| 60 |
> |
return 1; |
| 61 |
> |
} |
| 62 |
|
} |
| 63 |
|
|
| 64 |
|
Zoe zoe; |
| 69 |
|
|
| 70 |
|
Zoe::Zoe() |
| 71 |
|
{ |
| 72 |
< |
if (!(collector || publisher)) usage(); |
| 72 |
> |
if (!(collector || publisher)) |
| 73 |
> |
{ |
| 74 |
> |
usage(); |
| 75 |
> |
|
| 76 |
> |
return; |
| 77 |
> |
} |
| 78 |
|
|
| 79 |
|
configure(); |
| 80 |
|
|
| 88 |
|
|
| 89 |
|
void Zoe::usage() |
| 90 |
|
{ |
| 91 |
< |
api::Cerr << "Usage: " << Zoe::program << " [-config=config] [-collector] " |
| 82 |
< |
"[-publisher] [-color] [-D]\n"; |
| 83 |
< |
|
| 84 |
< |
exit(1); |
| 91 |
> |
api::Cerr << "Usage: " << Zoe::program << " [-config=config] [-collector] [-publisher] [-color] [-D]\n"; |
| 92 |
|
} |
| 93 |
|
|
| 94 |
|
ext::String Zoe::generator(Generator generator) |
| 101 |
|
generator_.InsertAllLast("/0.9"); |
| 102 |
|
case agent: |
| 103 |
|
{ |
| 104 |
< |
utsname system; |
| 104 |
> |
::utsname system; |
| 105 |
|
|
| 106 |
< |
uname(&system); |
| 106 |
> |
::uname(&system); |
| 107 |
|
|
| 108 |
< |
generator_.InsertAllLast(_R(" (") + system.sysname); |
| 108 |
> |
generator_.InsertAllLast(ios::String() << " (" << system.sysname); |
| 109 |
|
} |
| 110 |
|
|
| 111 |
|
if (generator == agent) |
| 227 |
|
for (std::vector<Buddy>::iterator buddy(difference.begin()); |
| 228 |
|
buddy != difference.end(); ++buddy) |
| 229 |
|
{ |
| 230 |
< |
ext::Uuid id; |
| 230 |
> |
ext::Uuid id(api::Uuid::CreateSequential()); |
| 231 |
|
|
| 232 |
< |
api::Uuid::CreateSequential(id); |
| 232 |
> |
// api::Uuid::CreateSequential(id); |
| 233 |
|
|
| 234 |
|
buddy->setId(id); |
| 235 |
|
db->Execute("INSERT INTO buddies (id, buddy) VALUES ('" |
