kiwix/kiwix-js
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-js.git synced 2025-09-22 12:01:15 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix for the title search algorithm (little regression introduced by the pull request 66)

Browse Source 
+ some cosmetic changes
This commit is contained in:
mossroy 2014-02-28 16:14:26 +01:00
parent 84f5ab62a3
commit 26f0f5fbf8
3 changed files with 156 additions and 153 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
www/js/lib/archive.js
View File

@ -346,7 +346,7 @@ define(function(require) {
var normalize = this.getNormalizeFunction(); var normalize = this.getNormalizeFunction();
var normalizedTitleName = normalize(titleName); var normalizedTitleName = normalize(titleName);
titleIterators.FindPrefixOffset(this.titleFile, titleName, normalize).then(function(offset) { titleIterators.findPrefixOffset(this.titleFile, titleName, normalize).then(function(offset) {
var iterator = new titleIterators.SequentialTitleIterator(that, offset); var iterator = new titleIterators.SequentialTitleIterator(that, offset);
function check(title) { function check(title) {
if (title == null || normalize(title.name) !== normalizedTitleName) { if (title == null || normalize(title.name) !== normalizedTitleName) {
@ -390,7 +390,7 @@ define(function(require) {
var normalize = this.getNormalizeFunction(); var normalize = this.getNormalizeFunction();
prefix = normalize(prefix); prefix = normalize(prefix);
titleIterators.FindPrefixOffset(this.titleFile, prefix, normalize).then(function(offset) { titleIterators.findPrefixOffset(this.titleFile, prefix, normalize).then(function(offset) {
var iterator = new titleIterators.SequentialTitleIterator(that, offset); var iterator = new titleIterators.SequentialTitleIterator(that, offset);
function addNext() { function addNext() {
if (titles.length >= maxSize) { if (titles.length >= maxSize) {

6
www/js/lib/titleIterators.js
View File

@ -72,12 +72,12 @@ define(['utf8', 'title', 'util', 'jquery'], function(utf8, evopediaTitle, util,
* @param normalize function to be applied to every title before comparison * @param normalize function to be applied to every title before comparison
* @returns jQuery promise giving the offset * @returns jQuery promise giving the offset
*/ */
function FindPrefixOffset(titleFile, prefix, normalize) { function findPrefixOffset(titleFile, prefix, normalize) {
prefix = normalize(prefix); prefix = normalize(prefix);
var lo = 0; var lo = 0;
var hi = titleFile.size; var hi = titleFile.size;
var iterate = function() { var iterate = function() {
if (lo >= hi) { if (lo >= hi - 1) {
if (lo > 0) if (lo > 0)
lo += 2; // Let lo point to the start of an entry lo += 2; // Let lo point to the start of an entry
return jQuery.when(lo); return jQuery.when(lo);
@ -121,6 +121,6 @@ define(['utf8', 'title', 'util', 'jquery'], function(utf8, evopediaTitle, util,
*/ */
return { return {
SequentialTitleIterator : SequentialTitleIterator, SequentialTitleIterator : SequentialTitleIterator,
FindPrefixOffset : FindPrefixOffset findPrefixOffset : findPrefixOffset
}; };
}); });

7
www/js/lib/util.js
View File

@ -117,6 +117,9 @@ define(function(require) {
/** /**
* Reads a Uint8Array from the given file starting at byte offset begin and * Reads a Uint8Array from the given file starting at byte offset begin and
* not including byte offset end. * not including byte offset end.
* @param file
* @param begin
* @param end
* @returns jQuery promise * @returns jQuery promise
*/ */
function readFileSlice(file, begin, end) { function readFileSlice(file, begin, end) {
@ -124,10 +127,10 @@ define(function(require) {
var reader = new FileReader(); var reader = new FileReader();
reader.onload = function(e) { reader.onload = function(e) {
deferred.resolve(new Uint8Array(e.target.result)); deferred.resolve(new Uint8Array(e.target.result));
} };
reader.onerror = reader.onabort = function(e) { reader.onerror = reader.onabort = function(e) {
deferred.reject(e); deferred.reject(e);
} };
reader.readAsArrayBuffer(file.slice(begin, end)); reader.readAsArrayBuffer(file.slice(begin, end));
return deferred.promise(); return deferred.promise();
} }