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

Lots of progress with Gxs Services:

Browse source 
- Added gxsForum interface, service + serialiser to libretroshare.
 - Bugfix in rsgenservices getSize() at the wrong point, Added lots of debug too.
 - Dummy Collections to Wiki, can now create and retrieve Groups from the GUI.
 - Bugfix in rsinit (wrong backend for wiki) + added forum to startup.
 - improved debugging in GxsId serialiser.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5797 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2012-11-09 00:56:07 +00:00
parent 8170697029
commit eeb96c5e62
13 changed files with 1214 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1828,12 +1828,13 @@ RsTurtle *rsTurtle = NULL ;
#include "services/p3wiki.h"
#include "services/p3posted.h"
#include "services/p3photoserviceV2.h"
#include "services/p3gxsforums.h"
// Not too many to convert now!
#include "services/p3wikiserviceVEG.h"
#include "services/p3wireVEG.h"
//#include "services/p3idserviceVEG.h"
#include "services/p3forumsVEG.h"
//#include "services/p3forumsVEG.h"
#endif
#ifndef PQI_DISABLE_TUNNEL
@ -2281,16 +2282,16 @@ 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);
pqih -> addService(mWire);
// Testing New Cache Services.
p3ForumsVEG *mForumsV2 = new p3ForumsVEG(RS_SERVICE_GXSV1_TYPE_FORUMS);
pqih -> addService(mForumsV2);
//p3ForumsVEG *mForumsV2 = new p3ForumsVEG(RS_SERVICE_GXSV1_TYPE_FORUMS);
//pqih -> addService(mForumsV2);
// TODO: temporary to store GXS service data, remove
@ -2358,11 +2359,26 @@ int RsServer::StartupRetroShare()
wiki_ds->resetDataStore(); //TODO: remove, new service data per RS session, for testing
mWiki = new p3Wiki(posted_ds, NULL);
mWiki = new p3Wiki(wiki_ds, NULL);
// create GXS photo service
RsGxsNetService* wiki_ns = new RsGxsNetService(
RS_SERVICE_GXSV1_TYPE_WIKI, wiki_ds, nxsMgr, mWiki);
/**** Forum GXS service ****/
p3GxsForums *mGxsForums = NULL;
RsGeneralDataService* gxsforums_ds = new RsDataService("./" + mLinkMgr->getOwnId()+ "/", "gxsforums_db",
RS_SERVICE_GXSV1_TYPE_FORUMS);
gxsforums_ds->resetDataStore(); //TODO: remove, new service data per RS session, for testing
mGxsForums = new p3GxsForums(gxsforums_ds, NULL);
// create GXS photo service
RsGxsNetService* gxsforums_ns = new RsGxsNetService(
RS_SERVICE_GXSV1_TYPE_FORUMS, gxsforums_ds, nxsMgr, mGxsForums);
#endif
#endif // ENABLE_GXS_SERVICES
@ -2378,6 +2394,7 @@ int RsServer::StartupRetroShare()
createThread(*mPhotoV2);
createThread(*mPosted);
createThread(*mWiki);
createThread(*mGxsForums);
//
// mGxsCore->addService(mPhotoV2);
// mGxsCore->addService(mPosted);
@ -2390,6 +2407,7 @@ int RsServer::StartupRetroShare()
createThread(*photo_ns);
createThread(*posted_ns);
createThread(*wiki_ns);
createThread(*gxsforums_ns);
#endif
// now add to p3service
@ -2398,6 +2416,7 @@ int RsServer::StartupRetroShare()
pqih->addService(photo_ns);
pqih->addService(posted_ns);
pqih->addService(wiki_ns);
pqih->addService(gxsforums_ns);
#endif
// start up gxs core server
@ -2669,10 +2688,11 @@ int RsServer::StartupRetroShare()
rsWiki = mWiki;
rsPosted = mPosted;
rsPhotoV2 = mPhotoV2;
rsGxsForums = mGxsForums;
#endif
rsWireVEG = mWire;
rsForumsVEG = mForumsV2;
//rsForumsVEG = mForumsV2;
#endif // ENABLE_GXS_SERVICES