* Addition of almost completed p3ranking class - still streaming / ranking to do.

* Major modifications to p3disc to use the new AuthMgr and ConnMgr.
 * Modified RsDiscItems to match new p3disc.
 * Modified ConnMgr to accept information from p3disc.
 * Addition of new Load/Save Certificate From/To Binary to AuthMgr.
 * Corrected default build to Linux.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@325 b45a01b8-16f6-495d-af2f-9b41ad6348cc

libretroshare/src/rsserver/Makefile

@@ -14,7 +14,8 @@ RSOBJ = p3face-file.o \
 	p3face-startup.o \
 	rstypes.o \
 	rsiface.o \
-	p3peers.o
+	p3peers.o \
+	p3rank.o
 
 #	pqistrings.o \
 #	p3face-people.o 

libretroshare/src/rsserver/p3face-startup.cc

@@ -39,10 +39,11 @@
 #include "dht/opendhtmgr.h"
 
 // Removed temporarily...
-//#include "services/p3disc.h"
+#include "services/p3disc.h"
 #include "services/p3msgservice.h"
 #include "services/p3chatservice.h"
 #include "services/p3gamelauncher.h"
+#include "services/p3ranking.h"
 
 #include <list>
 #include <string>
@@ -54,6 +55,7 @@
 #include "pqi/pqidebug.h"
 #include "rsserver/p3face.h"
 #include "rsserver/p3peers.h"
+#include "rsserver/p3rank.h"
 #include "rsiface/rsgame.h"
 
 /**************** PQI_USE_XPGP ******************/
@@ -602,18 +604,23 @@ int RsServer::StartupRetroShare(RsInit *config)
         //server->load_config();
 
 	/* create Services */
-	//ad = new p3disc(sslr); // XXX
+	ad = new p3disc(mAuthMgr, mConnMgr);
 	msgSrv = new p3MsgService(mConnMgr);
 	chatSrv = new p3ChatService(mConnMgr);
 	p3GameLauncher *gameLauncher = new p3GameLauncher();
+	p3Ranking *ranking = new p3Ranking(0, NULL, "", "", 3600 * 24 * 30);
 
-	//pqih -> addService(ad);
+	pqih -> addService(ad);
 	pqih -> addService(msgSrv);
 	pqih -> addService(chatSrv);
 	pqih -> addService(gameLauncher);
 
+	/* so need to Monitor too! */
+	mConnMgr->addMonitor(ad);
+
 	/* setup the gui */
 	rsGameLauncher = gameLauncher;
+	rsRanks = new p3Rank(ranking);
 
 	/* put a welcome message in! */
 	if (config->firsttime_run)

libretroshare/src/rsserver/p3rank.cc

@@ -0,0 +1,95 @@
+/*
+ * libretroshare/src/rsserver: p3rank.cc
+ *
+ * RetroShare C++ Interface.
+ *
+ * Copyright 2007-2008 by Robert Fernie.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License Version 2 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ * USA.
+ *
+ * Please report all bugs and problems to "retroshare@lunamutt.com".
+ *
+ */
+
+#include "rsserver/p3rank.h"
+
+RsRanks *rsRanks = NULL;
+
+p3Rank::p3Rank(p3Ranking *ranking)
+	:mRank(ranking)
+{
+	return;
+}
+
+p3Rank::~p3Rank() 
+{
+	return; 
+}
+
+        /* Set Sort Methods */
+bool p3Rank::setSortPeriod(uint32_t period)
+{
+	return mRank->setSortPeriod(period);
+}
+
+bool p3Rank::setSortMethod(uint32_t type)
+{
+	return mRank->setSortMethod(type);
+}
+
+bool p3Rank::clearPeerFilter()
+{
+	return mRank->clearPeerFilter();
+}
+
+bool p3Rank::setPeerFilter(std::list<std::string> peers)
+{
+	return mRank->setPeerFilter(peers);
+}
+
+        /* get Ids */
+uint32_t p3Rank::getRankingsCount()
+{
+	return mRank->getRankingsCount();
+}
+
+float   p3Rank::getMaxRank()
+{
+	return mRank->getMaxRank();
+}
+
+bool    p3Rank::getRankings(uint32_t first, uint32_t count, std::list<std::string> &rids)
+{
+	return mRank->getRankings(first, count, rids);
+}
+
+bool    p3Rank::getRankDetails(std::string rid, RsRankDetails &details)
+{
+	return mRank->getRankDetails(rid, details);
+}
+
+
+        /* Add New Comment / Msg */
+std::string p3Rank::newRankMsg(std::wstring link, std::wstring title, std::wstring comment)
+{
+	return mRank->newRankMsg(link, title, comment);
+}
+
+bool p3Rank::updateComment(std::string rid, std::wstring comment)
+{
+	return mRank->updateComment(rid, comment);
+}
+
+

libretroshare/src/rsserver/p3rank.h

@@ -0,0 +1,60 @@
+#ifndef RETROSHARE_P3_RANKING_INTERFACE_H
+#define RETROSHARE_P3_RANKING_INTERFACE_H
+
+/*
+ * libretroshare/src/rsserver: p3rank.h
+ *
+ * RetroShare C++ Interface.
+ *
+ * Copyright 2007-2008 by Robert Fernie.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License Version 2 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ * USA.
+ *
+ * Please report all bugs and problems to "retroshare@lunamutt.com".
+ *
+ */
+
+#include "rsiface/rsrank.h"
+#include "services/p3ranking.h"
+
+class p3Rank: public RsRanks
+{
+	public:
+
+	p3Rank(p3Ranking *ranking);
+virtual ~p3Rank(); 
+
+        /* Set Sort Methods */
+virtual bool setSortPeriod(uint32_t period);
+virtual bool setSortMethod(uint32_t type);
+virtual bool clearPeerFilter();
+virtual bool setPeerFilter(std::list<std::string> peers);
+
+        /* get Ids */
+virtual uint32_t getRankingsCount();
+virtual float   getMaxRank();
+virtual bool    getRankings(uint32_t first, uint32_t count, std::list<std::string> &rids);
+virtual bool    getRankDetails(std::string rid, RsRankDetails &details);
+
+        /* Add New Comment / Msg */
+virtual std::string newRankMsg(std::wstring link, std::wstring title, std::wstring comment);
+virtual bool updateComment(std::string rid, std::wstring comment);
+
+	private:
+
+	p3Ranking *mRank;
+};
+
+#endif