kiwix/kiwix-tools
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-tools.git synced 2025-09-24 04:20:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

+ small simplification of the code

Browse Source
This commit is contained in:
kelson42 2014-08-29 02:46:25 -06:00
parent ce0fe47daf
commit 965968e38f
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/server/kiwix-serve.cpp
View File

@ -239,7 +239,6 @@ static int accessHandlerCallback(void *cls,
if (reader == NULL) { if (reader == NULL) {
humanReadableBookId=""; humanReadableBookId="";
} }
pthread_mutex_unlock(&mapLock); pthread_mutex_unlock(&mapLock);
/* Get suggestions */ /* Get suggestions */
@ -330,10 +329,9 @@ static int accessHandlerCallback(void *cls,
/* Display a random article */ /* Display a random article */
else if (!strcmp(url, "/random")) { else if (!strcmp(url, "/random")) {
cacheEnabled = false; cacheEnabled = false;
std::string randomUrl;
if (reader != NULL) { if (reader != NULL) {
pthread_mutex_lock(&readerLock); pthread_mutex_lock(&readerLock);
randomUrl = reader->getRandomPageUrl(); std::string randomUrl = reader->getRandomPageUrl();
pthread_mutex_unlock(&readerLock); pthread_mutex_unlock(&readerLock);
httpRedirection = "/" + humanReadableBookId + "/" + randomUrl; httpRedirection = "/" + humanReadableBookId + "/" + randomUrl;
} }
@ -598,7 +596,7 @@ int main(int argc, char **argv) {
vector<string> booksIds = libraryManager.getBooksIds(); vector<string> booksIds = libraryManager.getBooksIds();
vector<string>::iterator itr; vector<string>::iterator itr;
kiwix::Book currentBook; kiwix::Book currentBook;
for ( itr = booksIds.begin(); itr != booksIds.end(); ++itr ) { for (itr = booksIds.begin(); itr != booksIds.end(); ++itr) {
bool zimFileOk = false; bool zimFileOk = false;
libraryManager.getBookById(*itr, currentBook); libraryManager.getBookById(*itr, currentBook);
zimPath = currentBook.pathAbsolute; zimPath = currentBook.pathAbsolute;