smallsolar
/
libkiwix
mirror of https://github.com/kiwix/libkiwix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

merged with master on zimAccessor/VMStringLoader/configure.ac

This commit is contained in:
rgaudin 2014-05-06 08:40:19 +00:00
parent f1dc03d5aa 587b76bf6d
commit 8c574270cf
4 changed files with 32 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/common/kiwix/ctpp2/CTPP2VMStringLoader.cpp
View File

@ -19,23 +19,6 @@
#include "CTPP2VMStringLoader.hpp" #include "CTPP2VMStringLoader.hpp"
#include "ctpp2/CTPP2Util.hpp"
#include "ctpp2/CTPP2Exception.hpp"
#include "ctpp2/CTPP2VMExecutable.hpp"
#include "ctpp2/CTPP2VMInstruction.hpp"
#include "ctpp2/CTPP2VMMemoryCore.hpp"
#include <sys/types.h>
#include <sys/stat.h>
#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
#include <resourceTools.h>
#include <iostream>
#include <string>
namespace CTPP // C++ Template Engine namespace CTPP // C++ Template Engine
{ {

16
src/common/kiwix/ctpp2/CTPP2VMStringLoader.hpp
View File

@ -21,6 +21,22 @@
#define _CTPP2_VM_STRING_LOADER_HPP__ 1 #define _CTPP2_VM_STRING_LOADER_HPP__ 1
#include "ctpp2/CTPP2VMLoader.hpp" #include "ctpp2/CTPP2VMLoader.hpp"
#include "ctpp2/CTPP2Util.hpp"
#include "ctpp2/CTPP2Exception.hpp"
#include "ctpp2/CTPP2VMExecutable.hpp"
#include "ctpp2/CTPP2VMInstruction.hpp"
#include "ctpp2/CTPP2VMMemoryCore.hpp"
#include <sys/types.h>
#include <sys/stat.h>
#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
#include <resourceTools.h>
#include <iostream>
#include <string>
/** /**
@file VMStringLoader.hpp @file VMStringLoader.hpp

15
src/common/kiwix/reader.cpp
View File

@ -375,11 +375,21 @@ namespace kiwix {
return this->getContentByEncodedUrl(url, content, contentLength, contentType); return this->getContentByEncodedUrl(url, content, contentLength, contentType);
} }
bool Reader::getContentByEncodedUrl(const string &url, string &content, unsigned int &contentLength, string &contentType, string &baseUrl) {
return this->getContentByDecodedUrl(kiwix::urlDecode(url), content, contentLength, contentType, baseUrl);
}
bool Reader::getContentByEncodedUrl(const string &url, string &content, unsigned int &contentLength, string &contentType) { bool Reader::getContentByEncodedUrl(const string &url, string &content, unsigned int &contentLength, string &contentType) {
return this->getContentByDecodedUrl(kiwix::urlDecode(url), content, contentLength, contentType); std::string stubRedirectUrl;
return this->getContentByEncodedUrl(kiwix::urlDecode(url), content, contentLength, contentType, stubRedirectUrl);
} }
bool Reader::getContentByDecodedUrl(const string &url, string &content, unsigned int &contentLength, string &contentType) { bool Reader::getContentByDecodedUrl(const string &url, string &content, unsigned int &contentLength, string &contentType) {
std::string stubRedirectUrl;
return this->getContentByDecodedUrl(kiwix::urlDecode(url), content, contentLength, contentType, stubRedirectUrl);
}
bool Reader::getContentByDecodedUrl(const string &url, string &content, unsigned int &contentLength, string &contentType, string &baseUrl) {
bool retVal = false; bool retVal = false;
content=""; content="";
contentType=""; contentType="";
@ -411,6 +421,9 @@ namespace kiwix {
article = article.getRedirectArticle(); article = article.getRedirectArticle();
} }
/* Compute base url (might be different from the url if redirects */
baseUrl = "/" + std::string(1, article.getNamespace()) + "/" + article.getUrl();
/* Get the content mime-type */ /* Get the content mime-type */
contentType = string(article.getMimeType().data(), article.getMimeType().size()); contentType = string(article.getMimeType().data(), article.getMimeType().size());

2
src/common/kiwix/reader.h
View File

@ -62,7 +62,9 @@ namespace kiwix {
bool getFavicon(string &content, string &mimeType); bool getFavicon(string &content, string &mimeType);
bool getPageUrlFromTitle(const string &title, string &url); bool getPageUrlFromTitle(const string &title, string &url);
bool getContentByUrl(const string &url, string &content, unsigned int &contentLength, string &contentType); bool getContentByUrl(const string &url, string &content, unsigned int &contentLength, string &contentType);
bool getContentByEncodedUrl(const string &url, string &content, unsigned int &contentLength, string &contentType, string &baseUrl);
bool getContentByEncodedUrl(const string &url, string &content, unsigned int &contentLength, string &contentType); bool getContentByEncodedUrl(const string &url, string &content, unsigned int &contentLength, string &contentType);
bool getContentByDecodedUrl(const string &url, string &content, unsigned int &contentLength, string &contentType, string &baseUrl);
bool getContentByDecodedUrl(const string &url, string &content, unsigned int &contentLength, string &contentType); bool getContentByDecodedUrl(const string &url, string &content, unsigned int &contentLength, string &contentType);
bool searchSuggestions(const string &prefix, unsigned int suggestionsCount, const bool reset = true); bool searchSuggestions(const string &prefix, unsigned int suggestionsCount, const bool reset = true);
bool searchSuggestionsSmart(const string &prefix, unsigned int suggestionsCount); bool searchSuggestionsSmart(const string &prefix, unsigned int suggestionsCount);