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

Revert "Merge branch 'singleFileClient'"

Browse Source 
This reverts commit 1bf9ed770532f3093548fa4120209be3a31c5c21, reversing
changes made to 5b0464d7a0aaa034851dfc80ca0a2d367f4c28ef.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1179 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
joss17 2009-05-06 11:39:34 +00:00
parent 693cb93868
commit 22dea2ceea
3 changed files with 3 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libretroshare/src/dbase/fimonitor.cc
View File

@ -96,11 +96,7 @@ bool FileIndexMonitor::findLocalFile(std::string hash,
size = fe->size; size = fe->size;
ok = true; ok = true;
} else { }
fullpath = fe->name;
size = fe->size;
ok = true;
}
#ifdef FIM_DEBUG #ifdef FIM_DEBUG
std::cerr << "FileIndexMonitor::findLocalFile() Found Path: " << fullpath << std::endl; std::cerr << "FileIndexMonitor::findLocalFile() Found Path: " << fullpath << std::endl;
std::cerr << "FileIndexMonitor::findLocalFile() Found Size: " << size << std::endl; std::cerr << "FileIndexMonitor::findLocalFile() Found Size: " << size << std::endl;
@ -136,13 +132,7 @@ bool FileIndexMonitor::convertSharedFilePath(std::string path, std::string &f
std::cerr << "FileIndexMonitor::convertSharedFilePath() Found Path: " << fullpath << std::endl; std::cerr << "FileIndexMonitor::convertSharedFilePath() Found Path: " << fullpath << std::endl;
#endif #endif
ok = true; ok = true;
} else { }
fullpath = path;
ok = true;
#ifdef FIM_DEBUG
std::cerr << "FileIndexMonitor::convertSharedFilePath() Found Path: " << fullpath << std::endl;
#endif
}
} fiMutex.unlock(); /* UNLOCKED DIRS */ } fiMutex.unlock(); /* UNLOCKED DIRS */

7
libretroshare/src/dbase/findex.cc
View File

@ -757,13 +757,6 @@ int FileIndex::loadIndex(std::string filename, std::string expectedHash, uint64_
(it->second)->parent = root; (it->second)->parent = root;
} }
std::map<std::string, FileEntry *>::iterator it2;
for(it2 = root->files.begin();
it2 != root->files.end(); it2++)
{
(it2->second)->parent = root;
}
break; break;
} }
/* pop stack */ /* pop stack */

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

@ -336,19 +336,7 @@ int FileIndexStore::RequestDirDetails(void *ref, DirDetails &details, uint32_t f
else else
{ {
/* NEW add path (to dir - if dir, or parent dir - if file? */ /* NEW add path (to dir - if dir, or parent dir - if file? */
if (NULL != (person = dynamic_cast<PersonEntry *>(parent))) { details.path = parent->path;
//if parent if root, then the path is inside the name; we should parse the name for the last / char
int i;
for(i = details.name.length(); (i > 0) && (details.name[i] != '/'); i--);
if (i != 0) {
//the file is in a subdir, let's remove the / char and set correct path
details.path = details.name.substr(0,i);
details.name = details.name.substr(i + 1);
}
} else {
details.path = parent->path;
}
while(parent->parent) while(parent->parent)
parent = parent->parent; parent = parent->parent;