projects
/
fms.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
version 0.3.29
[fms.git]
/
src
/
freenet
/
fmsversionrequester.cpp
diff --git
a/src/freenet/fmsversionrequester.cpp
b/src/freenet/fmsversionrequester.cpp
index
39fb027
..
0d72722
100644
(file)
--- a/
src/freenet/fmsversionrequester.cpp
+++ b/
src/freenet/fmsversionrequester.cpp
@@
-6,12
+6,12
@@
#include <Poco/Timestamp.h>
\r
#include <Poco/Timespan.h>
\r
\r
#include <Poco/Timestamp.h>
\r
#include <Poco/Timespan.h>
\r
\r
-FMSVersionRequester::FMSVersionRequester()
\r
+FMSVersionRequester::FMSVersionRequester(
SQLite3DB::DB *db):IDatabase(db
)
\r
{
\r
Initialize();
\r
}
\r
\r
{
\r
Initialize();
\r
}
\r
\r
-FMSVersionRequester::FMSVersionRequester(
FCPv2::Connection *fcp):
IFCPConnected(fcp)
\r
+FMSVersionRequester::FMSVersionRequester(
SQLite3DB::DB *db, FCPv2::Connection *fcp):IDatabase(db),
IFCPConnected(fcp)
\r
{
\r
Initialize();
\r
}
\r
{
\r
Initialize();
\r
}
\r
@@
-42,7
+42,8
@@
const bool FMSVersionRequester::HandleAllData(FCPv2::Message &message)
if(parts.size()>2)
\r
{
\r
std::string editionstr=parts[2];
\r
if(parts.size()>2)
\r
{
\r
std::string editionstr=parts[2];
\r
- Option::Instance()->Set("FMSVersionEdition",editionstr);
\r
+ Option option(m_db);
\r
+ option.Set("FMSVersionEdition",editionstr);
\r
}
\r
\r
// parse file into xml and update the database
\r
}
\r
\r
// parse file into xml and update the database
\r
@@
-80,7
+81,8
@@
const bool FMSVersionRequester::HandleGetFailed(FCPv2::Message &message)
if(parts.size()>2)
\r
{
\r
std::string editionstr=parts[2];
\r
if(parts.size()>2)
\r
{
\r
std::string editionstr=parts[2];
\r
- Option::Instance()->Set("FMSVersionEdition",editionstr);
\r
+ Option option(m_db);
\r
+ option.Set("FMSVersionEdition",editionstr);
\r
}
\r
m_log->debug("FMSVersionRequester::HandleGetFailed Fatal GetFailed for "+message["Identifier"]);
\r
}
\r
}
\r
m_log->debug("FMSVersionRequester::HandleGetFailed Fatal GetFailed for "+message["Identifier"]);
\r
}
\r
@@
-152,8
+154,9
@@
void FMSVersionRequester::StartRequest()
std::string editionstr="0";
\r
int edition=0;
\r
\r
std::string editionstr="0";
\r
int edition=0;
\r
\r
- Option::Instance()->Get("FMSVersionKey",key);
\r
- if(Option::Instance()->Get("FMSVersionEdition",editionstr))
\r
+ Option option(m_db);
\r
+ option.Get("FMSVersionKey",key);
\r
+ if(option.Get("FMSVersionEdition",editionstr))
\r
{
\r
StringFunctions::Convert(editionstr,edition);
\r
edition++;
\r
{
\r
StringFunctions::Convert(editionstr,edition);
\r
edition++;
\r