Commit Graph

678 Commits

Author SHA1 Message Date
Matthieu Gautier 82cba79179 Do not make unnecessary copy when serving binary content.
Binary content do not need to be modified, so we don't need to copy it.
We can directly serve it from the internal zim (cluster) buffer.

The handle_content function now getArticleObjectByDecodedUrl instead of
getContentByDecodedUrl.

This is to get the mimetype of the article and copy the content only when
needed (getContentByDecodedUrl always copy the content).
Thus, handle_content is a bit more complex as it need to do some
manipulation previously made in getContentByDecodedUrl.

The main change is that if the content is binary, we serve the content
with a callback response who will get the content chunks directly from
the blob buffer.
2016-10-07 18:23:47 +02:00
mhutti1 e950ad3a0c Merge branch 'master' of https://github.com/kiwix/kiwix 2016-10-07 16:44:39 +01:00
Kelson 288feaea8c Merge pull request #339 from kiwix/handle_zim_without_index
Handle zim without index
2016-10-04 08:46:19 +02:00
Matthieu Gautier 657fc05225 Fix url of the fulltext index.
The fulltext index in the zim is at the url /Z/fulltextIndex/xapian.
We do not need to specifie the Z in the url as this is automatically add with the namespace.
2016-10-03 15:39:00 +02:00
Matthieu Gautier e526026407 Properly fail when creating XapianSearcher on a zim without embedded index.
The XapianSearcher creation must fail with a exception if we cannot open
the xapian database.
So, if we try to open a zim and there is no embedded index, we must fail.

We raise the custom exception NoXapianIndexInZim in this case.
2016-10-03 13:32:59 +02:00
kelson42 e3c2a13fa6 Add Reader::hasFulltextIndex 2016-10-02 18:29:08 +02:00
kelson42 86200dce7e Merge branch 'master' of https://github.com/kiwix/kiwix 2016-10-02 17:20:01 +02:00
kelson42 39ad3313df Add Reader::urlExists 2016-10-02 17:16:39 +02:00
kelson42 c1b5eb42bf Fix a problem with 'name' metatag 2016-09-11 10:26:12 +02:00
kelson42 934a15a0b4 Fix kiwix-mange problem with relative paths 2016-09-04 21:43:26 +02:00
Kelson 1500cb8329 Implement ZIM reader getTags() and getName() 2016-09-04 20:41:10 +02:00
Kelson fc9f3a3a25 Implement ZIM reader getTags() and getName() 2016-09-04 19:59:22 +02:00
Kelson 92cdd73268 Merge pull request #274 from kiwix/embedded_zim_support
Add support of embedded ft-index in zim for kiwix-serve and kiwix-search.
2016-08-12 12:35:37 +02:00
Matthieu Gautier 6074b5e557 Add support of embedded ft-index in zim for kiwix-serve and kiwix-search.
- kiwix-search will try the embedded ft-index if no indexPath is specified
  in the library.xml or command argument.
- kiwix-search also uses xapianSearcher and xapianSearcher needs zimlib,
  so add zimlib in compilation flag for searcher.
- kiwix-serve already depends on zimlib.
2016-08-11 17:50:25 +02:00
Isaac a348856c21 Merge pull request #241 from Spacejoker/master
Refactoring filtering logic for search autocomplete to improve readab…
2016-07-06 19:19:36 +01:00
kelson42 d384131341 remove useless code 2016-07-04 21:31:11 +02:00
Chris Li 801e622644 add "eng" to stop word map + pragma mark in indexer.cpp + progress calculation 2016-07-04 21:10:03 +02:00
Chris Li 566a01ce7f optional progress callback + progress calculation fix 2016-07-04 20:59:57 +02:00
Elad Keyshawn 10019e3291 Merge remote-tracking branch 'remotes/upstream/master' 2016-06-25 15:51:33 +03:00
Kelson d5e5cd9340 Deal with new glass/single_file Xapian indexes 2016-06-20 23:35:13 +02:00
Elad Keyshawn 8ae2630a94 Merge remote-tracking branch 'remotes/upstream/master' 2016-05-22 02:05:01 +03:00
Kelson 76b9adf35d Merge pull request #41 from dattaz/correction_double_include
correction of double inclusion
2016-05-21 19:26:14 +02:00
dattaz 8c443855c7 correction of double inclusion 2016-05-21 19:08:44 +02:00
Emmanuel Engelhart 009d08fe89 Simplify suggestion init 2015-08-22 15:42:21 +02:00
Emmanuel Engelhart a1486e05d3 Fix regression by suggestion search 2015-08-16 19:22:10 +02:00
Emmanuel Engelhart f3c4556431 Fix to get new getSuggestions() working on Android 2015-08-16 18:09:18 +02:00
Emmanuel Engelhart e829d7428d Better suggestion search 2015-08-16 17:18:29 +02:00
kelson42 7903458e38 Fix hardlinking in copyFile() 2015-04-09 14:26:11 +02:00
Emmanuel Engelhart d7a2b44902 Merge branch 'master' of ssh://git.code.sf.net/p/kiwix/kiwix 2015-03-02 18:45:06 +01:00
Kelson42 54d9445148 Update 2015-03-02 16:17:06 +01:00
renaud gaudin 855c7ef4c2 give some margin (ahah) for the margin to be eaten up 2015-03-02 15:03:30 +00:00
renaud gaudin 68059281f3 transparency kiwix-serve 2015-03-02 15:00:13 +00:00
renaud gaudin dda3dd4749 [kiwix-serve] Fixed taskbar margin from content if content has no margin 2015-03-02 14:54:29 +00:00
renaud gaudin 384ee12bfd Merge branch 'master' of ssh://git.code.sf.net/p/kiwix/kiwix 2015-03-02 14:23:38 +00:00
renaud gaudin 2491a5a0c4 [kiwix-serve] Fixed taskbar height (2 lines) on Cybook and transparency of autocomplete search result 2015-03-02 14:23:26 +00:00
Emmanuel Engelhart dc60455cd3 in copyFile() try to make a link if possible, copy the content otherwise 2015-02-21 16:56:38 +01:00
Emmanuel Engelhart b2c38ebfc2 update 2015-02-19 16:43:02 +01:00
renaud gaudin 280aa5f77f Merge branch 'master' of ssh://git.code.sf.net/p/kiwix/kiwix 2015-02-19 15:41:23 +00:00
renaud gaudin af1ee3c317 Fixed incorect behavior of buttons in taskbar 2015-02-19 15:31:16 +00:00
Emmanuel Engelhart 999a5b07ae New version 2015-02-19 16:20:49 +01:00
renaud gaudin 118feb75dc Merge branch 'master' of ssh://git.code.sf.net/p/kiwix/kiwix 2015-02-19 14:58:26 +00:00
renaud gaudin 950637abef Added Bookeen/Cybook CSS/JS hack for taskbar on ereader and increased taskbar size on hdpi screens 2015-02-19 14:57:50 +00:00
jleow00 64361126d7 Merge branch 'master' of ssh://git.code.sf.net/u/jleow00/kiwix
merge fork with updated upstream
2015-01-09 19:41:55 +08:00
Kelson42 78db06e127 Merge branch 'master' of ssh://git.code.sf.net/p/kiwix/kiwix
Conflicts:
	CHANGELOG
2015-01-08 12:55:53 +01:00
Kelson42 8287a64172 FIXED: kiwix-serve XSS attack vulnerability (#763) 2015-01-08 12:51:42 +01:00
Kelson42 191d37a105 Merge branch 'master' of /home/kelson/ios 2015-01-05 10:46:17 +01:00
Kelson42 45ad751d89 New function getMimeTypeByUrl() 2014-12-08 01:37:06 +01:00
Kelson42 d7fd4064ab FIXED: Buggy pagination in fulltext result page 2014-11-24 20:52:46 +01:00
Kelson42 864922ab86 Merge branch 'master' of ssh://git.code.sf.net/p/kiwix/kiwix 2014-10-20 15:39:08 +02:00
Kelson42 4290eaf751 + Avoid to load the welcome page by loading random ones 2014-10-18 18:14:46 +02:00