Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-05-02 14:16:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improvements to GXS services.

Browse source 
* Added serialiser for wiki items (actual data to be finalised).
 * Added wiki and fixed id services to be run properly.
 * Disabled dummyData for ids.
 * Fixed some bugs in Id serialiser.
 * Added missing fns in p3wiki



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5748 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2012-10-31 22:43:23 +00:00
parent f444869271
commit 92969c2f58
7 changed files with 628 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

44
libretroshare/src/rsserver/rsinit.cc
View file

@ -1823,12 +1823,15 @@ RsTurtle *rsTurtle = NULL ;
#endif
#ifdef ENABLE_GXS_SERVICES
#include "services/p3photoserviceV2.h"
#include "services/p3idservice.h"
#include "services/p3wiki.h"
#include "services/p3posted.h"
#include "services/p3wikiserviceVEG.h"
#include "services/p3photoserviceV2.h"
// Not too many to convert now!
//#include "services/p3wikiserviceVEG.h"
#include "services/p3wireVEG.h"
//#include "services/p3idserviceVEG.h"
#include "services/p3idservice.h"
#include "services/p3forumsVEG.h"
#endif
@ -2277,8 +2280,8 @@ int RsServer::StartupRetroShare()
#ifdef ENABLE_GXS_SERVICES
// Testing New Cache Services.
p3WikiServiceVEG *mWikis = new p3WikiServiceVEG(RS_SERVICE_GXSV1_TYPE_WIKI);
pqih -> addService(mWikis);
//p3WikiServiceVEG *mWikis = new p3WikiServiceVEG(RS_SERVICE_GXSV1_TYPE_WIKI);
//pqih -> addService(mWikis);
// Testing New Cache Services.
p3WireVEG *mWire = new p3WireVEG(RS_SERVICE_GXSV1_TYPE_WIRE);
@ -2345,6 +2348,22 @@ int RsServer::StartupRetroShare()
RS_SERVICE_GXSV1_TYPE_POSTED, posted_ds, nxsMgr, mPosted);
/**** Wiki GXS service ****/
p3Wiki *mWiki = NULL;
RsGeneralDataService* wiki_ds = new RsDataService("./" + mLinkMgr->getOwnId()+ "/", "wiki_db",
RS_SERVICE_GXSV1_TYPE_WIKI);
wiki_ds->resetDataStore(); //TODO: remove, new service data per RS session, for testing
mWiki = new p3Wiki(posted_ds, NULL);
// create GXS photo service
RsGxsNetService* wiki_ns = new RsGxsNetService(
RS_SERVICE_GXSV1_TYPE_WIKI, wiki_ds, nxsMgr, mWiki);
#endif // ENABLE_GXS_SERVICES
#ifdef ENABLE_GXS_CORE
@ -2355,16 +2374,19 @@ int RsServer::StartupRetroShare()
mGxsCore->addService(mGxsIdService);
mGxsCore->addService(mPhotoV2);
mGxsCore->addService(mPosted);
mGxsCore->addService(mWiki);
// cores ready start up GXS net servers
createThread(*gxsid_ns);
createThread(*photo_ns);
createThread(*posted_ns);
createThread(*gxsid_ns);
createThread(*wiki_ns);
// now add to p3service
pqih->addService(photo_ns);
pqih->addService(gxsid_ns);
pqih->addService(photo_ns);
pqih->addService(posted_ns);
pqih->addService(wiki_ns);
// start up gxs core server
createThread(*mGxsCore);
@ -2630,12 +2652,14 @@ int RsServer::StartupRetroShare()
#ifdef ENABLE_GXS_SERVICES
// Testing of new cache system interfaces.
rsWikiVEG = mWikis;
rsWireVEG = mWire;
rsForumsVEG = mForumsV2;
rsIdentity = mGxsIdService;
rsWiki = mWiki;
rsPosted = mPosted;
rsPhotoV2 = mPhotoV2;
rsWireVEG = mWire;
rsForumsVEG = mForumsV2;
#endif // ENABLE_GXS_SERVICES