kiwix/kiwix-tools
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-tools.git synced 2025-09-27 06:10:52 -04:00
Code Issues Packages Projects Releases Wiki Activity

+ use now the template from the ressource file

Browse Source
This commit is contained in:
kelson42 2012-04-23 21:35:06 +00:00
parent d4df7f095c
commit 41b138ab6b
1 changed files with 6 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -378,7 +378,6 @@ int main(int argc, char **argv) {
struct MHD_Daemon *daemon; struct MHD_Daemon *daemon;
string zimPath; string zimPath;
string libraryPath; string libraryPath;
string templatePath;
string indexPath; string indexPath;
string rootPath; string rootPath;
int serverPort = 80; int serverPort = 80;
@ -507,39 +506,6 @@ int main(int argc, char **argv) {
} }
} }
/* Change the current dir to binary dir */
/* Non portable linux solution */
rootPath = getExecutablePath();
#ifndef _WIN32
chdir(removeLastPathElement(rootPath).c_str());
#endif
try {
#ifdef _WIN32
const char* pathArray[] = {"chrome\\static\\results.tmpl"};
std::vector<std::string> templatePaths(pathArray, pathArray+1);
#else
const char* pathArray[] = {"../share/kiwix/static/results.tmpl", "../../static/results.tmpl", "results.tmpl"};
std::vector<std::string> templatePaths(pathArray, pathArray+3);
#endif
vector<string>::const_iterator templatePathsIt;
bool templateFound = false;
for(templatePathsIt=templatePaths.begin(); !templateFound && templatePathsIt != templatePaths.end(); templatePathsIt++) {
templatePath = computeAbsolutePath(removeLastPathElement(rootPath), *templatePathsIt);
if (fileExists(templatePath)) {
templateFound = true;
}
}
if (!templateFound) {
throw("Unable to find a valid template file.");
}
} catch (...) {
cerr << "Unable to find/open the result template file." << endl;
exit(1);
}
/* Instance the readers and searcher and build the corresponding maps */ /* Instance the readers and searcher and build the corresponding maps */
vector<string> booksIds = libraryManager.getBooksIds(); vector<string> booksIds = libraryManager.getBooksIds();
vector<string>::iterator itr; vector<string>::iterator itr;
@ -581,11 +547,12 @@ int main(int argc, char **argv) {
cerr << "Unable to open the search index '" << zimPath << "'." << endl; cerr << "Unable to open the search index '" << zimPath << "'." << endl;
} }
searcher->setProtocolPrefix("/"); if (hasSearchIndex) {
searcher->setSearchProtocolPrefix("/search"); searcher->setProtocolPrefix("/");
searcher->setContentHumanReadableId(humanReadableId); searcher->setSearchProtocolPrefix("/search");
searcher->setResultTemplatePath(templatePath); searcher->setContentHumanReadableId(humanReadableId);
searchers[humanReadableId] = searcher; searchers[humanReadableId] = searcher;
}
} }
} }
} }