From b3a0d30bbc81a028e67e6999106d8d72f82d75d6 Mon Sep 17 00:00:00 2001
From: drbob <retroshare.project@gmail.com>
Date: Sun, 7 Dec 2008 17:51:11 +0000
Subject: [PATCH] Small fix to universal script and some extra debugging.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@874 b45a01b8-16f6-495d-af2f-9b41ad6348cc
---
 libretroshare/src/dbase/fistore.cc            |  5 +++
 libretroshare/src/ft/ftserver.cc              | 42 ++++++++++++++++++-
 .../src/scripts/makeMacUniversalLibrary.sh    |  4 +-
 3 files changed, 48 insertions(+), 3 deletions(-)

diff --git a/libretroshare/src/dbase/fistore.cc b/libretroshare/src/dbase/fistore.cc
index 44e79f1bf..eaf5fb8b9 100644
--- a/libretroshare/src/dbase/fistore.cc
+++ b/libretroshare/src/dbase/fistore.cc
@@ -167,6 +167,11 @@ int FileIndexStore::RequestDirDetails(std::string uid, std::string path, DirDeta
 int FileIndexStore::RequestDirDetails(void *ref, DirDetails &details, uint32_t flags) const
 {
 	lockData();
+
+#ifdef FIS_DEBUG
+	std::cerr << "FileIndexStore::RequestDirDetails() ref=" << ref << " flags: " << flags << std::endl;
+#endif
+
 	bool found = true;
 	std::map<RsPeerId, FileIndex *>::const_iterator pit;
 
diff --git a/libretroshare/src/ft/ftserver.cc b/libretroshare/src/ft/ftserver.cc
index d5a616552..47e65dd3e 100644
--- a/libretroshare/src/ft/ftserver.cc
+++ b/libretroshare/src/ft/ftserver.cc
@@ -52,7 +52,12 @@ const int ftserverzone = 29539;
 
 	/* Setup */
 ftServer::ftServer(p3AuthMgr *authMgr, p3ConnectMgr *connMgr)
-	:mAuthMgr(authMgr), mConnMgr(connMgr)
+	: mP3iface(NULL),
+	mAuthMgr(authMgr), mConnMgr(connMgr),
+		mCacheStrapper(NULL),
+		mFiStore(NULL), mFiMon(NULL),
+		mFtController(NULL), mFtExtra(NULL),
+		mFtDataplex(NULL), mFtSearch(NULL)
 {
 	mCacheStrapper = new ftCacheStrapper(authMgr, connMgr);
 }
@@ -317,11 +322,35 @@ bool ftServer::ExtraFileMove(std::string fname, std::string hash, uint64_t size,
 
 int ftServer::RequestDirDetails(std::string uid, std::string path, DirDetails &details)
 {
+#ifdef SERVER_DEBUG 
+	std::cerr << "ftServer::RequestDirDetails(uid:" << uid;
+	std::cerr << ", path:" << path << ", ...) -> mFiStore";
+	std::cerr << std::endl;
+
+	if (!mFiStore)
+	{
+		std::cerr << "mFiStore not SET yet = FAIL";
+		std::cerr << std::endl;
+	}
+
+#endif
 	return mFiStore->RequestDirDetails(uid, path, details);
 }
 	
 int ftServer::RequestDirDetails(void *ref, DirDetails &details, uint32_t flags)
 {
+#ifdef SERVER_DEBUG 
+	std::cerr << "ftServer::RequestDirDetails(ref:" << ref;
+	std::cerr << ", flags:" << flags << ", ...) -> mFiStore";
+	std::cerr << std::endl;
+
+	if (!mFiStore)
+	{
+		std::cerr << "mFiStore not SET yet = FAIL";
+		std::cerr << std::endl;
+	}
+
+#endif
 	return mFiStore->RequestDirDetails(ref, details, flags);
 }
 	
@@ -332,6 +361,17 @@ int ftServer::RequestDirDetails(void *ref, DirDetails &details, uint32_t flags)
 
 int ftServer::SearchKeywords(std::list<std::string> keywords, std::list<FileDetail> &results)
 {
+#ifdef SERVER_DEBUG 
+	std::cerr << "ftServer::SearchKeywords()";
+	std::cerr << std::endl;
+
+	if (!mFiStore)
+	{
+		std::cerr << "mFiStore not SET yet = FAIL";
+		std::cerr << std::endl;
+	}
+
+#endif
 	return mFiStore->SearchKeywords(keywords, results);
 }
 	
diff --git a/libretroshare/src/scripts/makeMacUniversalLibrary.sh b/libretroshare/src/scripts/makeMacUniversalLibrary.sh
index eed3f6006..b1222d049 100755
--- a/libretroshare/src/scripts/makeMacUniversalLibrary.sh
+++ b/libretroshare/src/scripts/makeMacUniversalLibrary.sh
@@ -13,8 +13,8 @@ LIB_X86=libretroshare_x86.a
 
 MAC_SCRIPT="./scripts/config-macosx.mk"
 
-echo cp lib/$LIB lib/$LIB_PPC librs
-cp lib/$LIB lib/$LIB_PPC librs
+echo cp lib/$LIB lib/$LIB_PPC 
+cp lib/$LIB lib/$LIB_PPC 
 
 echo make clobber
 make clobber