Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Small fix to universal script and some extra debugging.

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@874 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2008-12-07 17:51:11 +00:00
parent 00f0f3e067
commit b3a0d30bbc
3 changed files with 48 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libretroshare/src/dbase/fistore.cc
View File

@ -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 int FileIndexStore::RequestDirDetails(void *ref, DirDetails &details, uint32_t flags) const
{ {
lockData(); lockData();
#ifdef FIS_DEBUG
std::cerr << "FileIndexStore::RequestDirDetails() ref=" << ref << " flags: " << flags << std::endl;
#endif
bool found = true; bool found = true;
std::map<RsPeerId, FileIndex *>::const_iterator pit; std::map<RsPeerId, FileIndex *>::const_iterator pit;

42
libretroshare/src/ft/ftserver.cc
View File

@ -52,7 +52,12 @@ const int ftserverzone = 29539;
/* Setup */ /* Setup */
ftServer::ftServer(p3AuthMgr *authMgr, p3ConnectMgr *connMgr) 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); 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) 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); return mFiStore->RequestDirDetails(uid, path, details);
} }
int ftServer::RequestDirDetails(void *ref, DirDetails &details, uint32_t flags) 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); 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) 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); return mFiStore->SearchKeywords(keywords, results);
} }

4
libretroshare/src/scripts/makeMacUniversalLibrary.sh
View File

@ -13,8 +13,8 @@ LIB_X86=libretroshare_x86.a
MAC_SCRIPT="./scripts/config-macosx.mk" MAC_SCRIPT="./scripts/config-macosx.mk"
echo cp lib/$LIB lib/$LIB_PPC librs echo cp lib/$LIB lib/$LIB_PPC
cp lib/$LIB lib/$LIB_PPC librs cp lib/$LIB lib/$LIB_PPC
echo make clobber echo make clobber
make clobber make clobber