Sapian
/
kiwix-tools
forked from kiwix/kiwix-tools
3
0
Fork 0
Code Releases Activity

continued work on contentManager lib

Browse Source
small_fixes
reg_ 14 years ago
parent 5f42ef4272
commit e95baea90f
3 changed files with 123 additions and 104 deletions
Show Stats Download Patch File Download Diff File

179
src/contentManager/contentManager.cpp
Unescape View File

@ -126,63 +126,60 @@ string ContentManager::GetCurrentBookId() {
return none; return none;
} }
/*bool ContentManager::GetBookById(const char* &id, bool ContentManager::GetBookById(string &id,
char* &path, string &path,
char* &title, string &title,
char* &indexPath, string &indexPath,
char* &indexType, string &indexType,
char* &description, string &description,
char* &articleCount, string &articleCount,
char* &mediaCount, string &mediaCount,
char* &size, string &size,
char* &creator, string &creator,
char* &date, string &date,
char* &language, string &language,
char* &favicon, string &favicon,
char* &url, bool *retVal) { string &url) {
*retVal = PR_FALSE;
const char *cid; try {
NS_CStringGetData(id, &cid); kiwix::Book book;
try { if (this->manager.getBookById(id.c_str(), book)) {
kiwix::Book book; path = book.pathAbsolute.data();
title = book.title.data();
if (this->manager.getBookById(cid, book)) { indexPath = book.indexPathAbsolute.data();
path = nsDependentCString(book.pathAbsolute.data(), book.pathAbsolute.size()); articleCount = book.articleCount.data();
title = nsDependentCString(book.title.data(), book.title.size()); mediaCount = book.mediaCount.data();
indexPath = nsDependentCString(book.indexPathAbsolute.data(), book.indexPathAbsolute.size()); size = book.size.data();
articleCount = nsDependentCString(book.articleCount.data(), book.articleCount.size()); creator = book.creator.data();
mediaCount = nsDependentCString(book.mediaCount.data(), book.mediaCount.size()); date = book.date.data();
size = nsDependentCString(book.size.data(), book.size.size()); language = book.language.data();
creator = nsDependentCString(book.creator.data(), book.creator.size()); url = book.url.data();
date = nsDependentCString(book.date.data(), book.date.size());
language = nsDependentCString(book.language.data(), book.language.size()); string faviconUrl = "";
url = nsDependentCString(book.url.data(), book.url.size()); if (!book.faviconMimeType.empty()) {
faviconUrl = "url(data:" + book.faviconMimeType + ";base64," + book.favicon + ")";
string faviconUrl = ""; }
if (!book.faviconMimeType.empty()) { favicon = faviconUrl.data();
faviconUrl = "url(data:" + book.faviconMimeType + ";base64," + book.favicon + ")";
} string indexTypeString = "";
favicon = nsDependentCString(faviconUrl.data(), faviconUrl.size()); if (book.indexType == kiwix::XAPIAN) {
indexTypeString = "xapian";
string indexTypeString = ""; } else if (book.indexType == kiwix::CLUCENE) {
if (book.indexType == kiwix::XAPIAN) { indexTypeString = "clucene";
indexTypeString = "xapian"; }
} else if (book.indexType == kiwix::CLUCENE) { indexType = indexTypeString.data();
indexTypeString = "clucene";
} description = book.description.data();
indexType = nsDependentCString(indexTypeString.data(), indexTypeString.size());
return true;
description = nsDependentCString(book.description.data(), book.description.size()); }
} catch (exception &e) {
*retVal = PR_TRUE; cerr << e.what() << endl;
return false;
} }
} catch (exception &e) { return false;
cerr << e.what() << endl; }
}
return NS_OK;
}*/
bool ContentManager::UpdateBookLastOpenDateById(string &id) { bool ContentManager::UpdateBookLastOpenDateById(string &id) {
try { try {
@ -208,49 +205,39 @@ unsigned int ContentManager::GetBookCount(const bool localBooks, const bool remo
return count; return count;
} }
/*bool ContentManager::ListBooks(const char* &mode, const char* &sortBy, PRUint32 maxSize, bool ContentManager::ListBooks(string &mode, string &sortBy, unsigned int maxSize,
const char* &language, const char* &publisher, const char* &search, bool *retVal) { string &language, string &publisher, string &search) {
*retVal = PR_FALSE; try {
const char *cmode; NS_CStringGetData(mode, &cmode);
const char *csortBy; NS_CStringGetData(sortBy, &csortBy);
const char *clanguage; NS_CStringGetData(language, &clanguage);
const char *cpublisher; NS_CStringGetData(publisher, &cpublisher);
const char *csearch; NS_CStringGetData(search, &csearch);
try {
// Set the mode enum
kiwix::supportedListMode listMode;
if (std::string(cmode) == "lastOpen") {
listMode = kiwix::LASTOPEN;
} else if ( std::string(cmode) == "remote") {
listMode = kiwix::REMOTE;
} else {
listMode = kiwix::LOCAL;
}
// Set the sortBy enum // Set the mode enum
kiwix::supportedListSortBy listSortBy; kiwix::supportedListMode listMode;
if (std::string(csortBy) == "publisher") { if (mode == "lastOpen") {
listSortBy = kiwix::PUBLISHER; listMode = kiwix::LASTOPEN;
} else if ( std::string(csortBy) == "date") { } else if ( mode == "remote") {
listSortBy = kiwix::DATE; listMode = kiwix::REMOTE;
} else if ( std::string(csortBy) == "size") { } else {
listSortBy = kiwix::SIZE; listMode = kiwix::LOCAL;
} else { }
listSortBy = kiwix::TITLE;
}
if (this->manager.listBooks(listMode, listSortBy, maxSize, clanguage, cpublisher, csearch)) { // Set the sortBy enum
*retVal = PR_TRUE; kiwix::supportedListSortBy listSortBy;
} if (sortBy == "publisher") {
} catch (exception &e) { listSortBy = kiwix::PUBLISHER;
cerr << e.what() << endl; } else if ( sortBy == "date") {
} listSortBy = kiwix::DATE;
} else if ( sortBy == "size") {
listSortBy = kiwix::SIZE;
} else {
listSortBy = kiwix::TITLE;
}
return NS_OK; return this->manager.listBooks(listMode, listSortBy, maxSize, language.c_str(), publisher.c_str(), search.c_str());
}*/ } catch (exception &e) {
cerr << e.what() << endl;
return false;
}
return false;
}
const char* ContentManager::GetListNextBookId() { const char* ContentManager::GetListNextBookId() {

12
src/contentManager/contentManager.h
Unescape View File

@ -19,11 +19,11 @@ class ContentManager
bool RemoveBookById(string&); bool RemoveBookById(string&);
bool SetCurrentBookId(string&); bool SetCurrentBookId(string&);
string GetCurrentBookId(); string GetCurrentBookId();
/*bool GetBookById(string, string, string, bool GetBookById(string&, string&, string&,
string, string, string, string&, string&, string&,
string, string, string, string&, string&, string&,
string, string, string, string&, string&, string&,
string, string);*/ string&, string&);
bool UpdateBookLastOpenDateById(string&); bool UpdateBookLastOpenDateById(string&);
unsigned int GetBookCount(bool, bool); unsigned int GetBookCount(bool, bool);
const char* GetListNextBookId(); const char* GetListNextBookId();
@ -31,7 +31,7 @@ class ContentManager
bool SetBookPath(string&, string&); bool SetBookPath(string&, string&);
string GetBooksLanguages(); string GetBooksLanguages();
string GetBooksPublishers(); string GetBooksPublishers();
//bool ListBooks(string, string, unsigned int, string, string, string); bool ListBooks(string&, string&, unsigned int, string&, string&, string&);
protected: protected:
kiwix::Manager manager; kiwix::Manager manager;

36
src/contentManager/contentManagerTester.cpp
Unescape View File

@ -86,8 +86,6 @@ int main(int argc, char* argv[])
cout << "Total book count: " << cont->GetBookCount(true, true) << endl; cout << "Total book count: " << cont->GetBookCount(true, true) << endl;
cout << "Next Book: " << cont->GetListNextBookId() << endl;
string indexPath = "/home/reg/wksw.index"; string indexPath = "/home/reg/wksw.index";
string indexMethod = "xapian"; string indexMethod = "xapian";
if (cont->SetBookIndex(bookid, indexPath, indexMethod)) if (cont->SetBookIndex(bookid, indexPath, indexMethod))
@ -104,6 +102,40 @@ int main(int argc, char* argv[])
cout << "Publishers: " << cont->GetBooksPublishers() << endl; cout << "Publishers: " << cont->GetBooksPublishers() << endl;
string id;
string path;
string title;
string rindexPath;
string indexType;
string description;
string articleCount;
string mediaCount;
string size;
string creator;
string date;
string language;
string favicon;
string url;
if (cont->GetBookById(bookid, path, title, rindexPath, indexType, description, articleCount, mediaCount, size, creator, date, language, favicon, url)) {
cout << "Successfully retrieved book " << bookid << endl;
cout << "\ttitle: " << title << endl;
cout << "\tURL: " << url << endl;
cout << "\tarticleCount: " << articleCount << endl;
} else
cout << "Unable to set path for book " << bookid << endl;
string lmode = "lastOpen";
string lsortBy = "size";
unsigned int lmaxSize = 0;
string llanguage = "";
string lpublisher = "";
string lsearch = "";
if (cont->ListBooks(lmode, lsortBy, lmaxSize, llanguage, lpublisher, lsearch)) {
cout << "Successfully listed books" << endl;
cout << "Next Book: " << cont->GetListNextBookId() << endl;
} else
cout << "Unable to list books " << endl;
cont->WriteLibraryToFile(lpath); cont->WriteLibraryToFile(lpath);
delete cont; delete cont;

Write Preview
Loading…
Cancel
Save