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

+ some cosmetic changes

www/js/lib/archive.js

@@ -346,7 +346,7 @@ define(function(require) {
         var normalize = this.getNormalizeFunction();
         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);
             function check(title) {
                 if (title == null || normalize(title.name) !== normalizedTitleName) {
@@ -390,7 +390,7 @@ define(function(require) {
         var normalize = this.getNormalizeFunction();
         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);
             function addNext() {
                 if (titles.length >= maxSize) {

www/js/lib/titleIterators.js

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

www/js/lib/util.js

@@ -1,148 +1,151 @@
-/**
+/**
- * util.js : Utility functions
+ * util.js : Utility functions
- * 
+ * 
- * Copyright 2013 Mossroy
+ * Copyright 2013 Mossroy
- * License GPL v3:
+ * License GPL v3:
- * 
+ * 
- * This file is part of Evopedia.
+ * This file is part of Evopedia.
- * 
+ * 
- * Evopedia is free software: you can redistribute it and/or modify
+ * Evopedia is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
+ * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * (at your option) any later version.
- * 
+ * 
- * Evopedia is distributed in the hope that it will be useful,
+ * Evopedia is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * GNU General Public License for more details.
- * 
+ * 
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU General Public License
- * along with Evopedia (file LICENSE-GPLv3.txt).  If not, see <http://www.gnu.org/licenses/>
+ * along with Evopedia (file LICENSE-GPLv3.txt).  If not, see <http://www.gnu.org/licenses/>
- */
+ */
-define(function(require) {
+define(function(require) {
-    var jQuery = require('jquery');
+    var jQuery = require('jquery');
-
+
-    /**
+    /**
-     * Utility function : return true if the given string ends with the suffix
+     * Utility function : return true if the given string ends with the suffix
-     * @param str
+     * @param str
-     * @param suffix
+     * @param suffix
-     * @returns {Boolean}
+     * @returns {Boolean}
-     */
+     */
-    function endsWith(str, suffix) {
+    function endsWith(str, suffix) {
-        return str.indexOf(suffix, str.length - suffix.length) !== -1;
+        return str.indexOf(suffix, str.length - suffix.length) !== -1;
-    }
+    }
-    
+    
-    /**
+    /**
-     * Read an integer encoded in 4 bytes, little endian
+     * Read an integer encoded in 4 bytes, little endian
-     * @param {type} byteArray
+     * @param {type} byteArray
-     * @param {type} firstIndex
+     * @param {type} firstIndex
-     * @returns {Number}
+     * @returns {Number}
-     */
+     */
-    function readIntegerFrom4Bytes(byteArray, firstIndex) {
+    function readIntegerFrom4Bytes(byteArray, firstIndex) {
-        var dataView = new DataView(byteArray.buffer, firstIndex, 4);
+        var dataView = new DataView(byteArray.buffer, firstIndex, 4);
-        var integer = dataView.getUint32(0, true);
+        var integer = dataView.getUint32(0, true);
-        return integer;
+        return integer;
-    }
+    }
-
+
-    /**
+    /**
-     * Read an integer encoded in 2 bytes, little endian
+     * Read an integer encoded in 2 bytes, little endian
-     * @param {type} byteArray
+     * @param {type} byteArray
-     * @param {type} firstIndex
+     * @param {type} firstIndex
-     * @returns {Number}
+     * @returns {Number}
-     */
+     */
-    function readIntegerFrom2Bytes(byteArray, firstIndex) {
+    function readIntegerFrom2Bytes(byteArray, firstIndex) {
-        var dataView = new DataView(byteArray.buffer, firstIndex, 2);
+        var dataView = new DataView(byteArray.buffer, firstIndex, 2);
-        var integer = dataView.getUint16(0, true);
+        var integer = dataView.getUint16(0, true);
-        return integer;
+        return integer;
-    }
+    }
-    
+    
-    /**
+    /**
-     * Read a float encoded in 2 bytes
+     * Read a float encoded in 2 bytes
-     * @param {type} byteArray
+     * @param {type} byteArray
-     * @param {type} firstIndex
+     * @param {type} firstIndex
-     * @param {bool} littleEndian (optional)
+     * @param {bool} littleEndian (optional)
-     * @returns {Number}
+     * @returns {Number}
-     */
+     */
-    function readFloatFrom4Bytes(byteArray, firstIndex, littleEndian) {
+    function readFloatFrom4Bytes(byteArray, firstIndex, littleEndian) {
-        var dataView = new DataView(byteArray.buffer, firstIndex, 4);
+        var dataView = new DataView(byteArray.buffer, firstIndex, 4);
-        var float = dataView.getFloat32(0, littleEndian);
+        var float = dataView.getFloat32(0, littleEndian);
-        return float;
+        return float;
-    }
+    }
-
+
-    /**
+    /**
-     * Convert a Uint8Array to a lowercase hex string
+     * Convert a Uint8Array to a lowercase hex string
-     * @param {type} byteArray
+     * @param {type} byteArray
-     * @returns {String}
+     * @returns {String}
-     */
+     */
-    function uint8ArrayToHex(byteArray) {
+    function uint8ArrayToHex(byteArray) {
-        var s = '';
+        var s = '';
-        var hexDigits = '0123456789abcdef';
+        var hexDigits = '0123456789abcdef';
-        for (var i = 0; i < byteArray.length; i++) {
+        for (var i = 0; i < byteArray.length; i++) {
-            var v = byteArray[i];
+            var v = byteArray[i];
-            s += hexDigits[(v & 0xff) >> 4];
+            s += hexDigits[(v & 0xff) >> 4];
-            s += hexDigits[v & 0xf];
+            s += hexDigits[v & 0xf];
-        }
+        }
-        return s;
+        return s;
-    }
+    }
-
+
-    /**
+    /**
-     * Convert a Uint8Array to base64
+     * Convert a Uint8Array to base64
-     * TODO : might be replaced by btoa() built-in function? https://developer.mozilla.org/en-US/docs/Web/API/window.btoa
+     * TODO : might be replaced by btoa() built-in function? https://developer.mozilla.org/en-US/docs/Web/API/window.btoa
-     * @param {type} byteArray
+     * @param {type} byteArray
-     * @returns {String}
+     * @returns {String}
-     */
+     */
-    function uint8ArrayToBase64(byteArray) {
+    function uint8ArrayToBase64(byteArray) {
-        var b64 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
+        var b64 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
-        var bits, h1, h2, h3, h4, i = 0;
+        var bits, h1, h2, h3, h4, i = 0;
-        var enc = "";
+        var enc = "";
-
+
-        for (var i = 0; i < byteArray.length; ) {
+        for (var i = 0; i < byteArray.length; ) {
-            bits = byteArray[i++] << 16;
+            bits = byteArray[i++] << 16;
-            bits |= byteArray[i++] << 8;
+            bits |= byteArray[i++] << 8;
-            bits |= byteArray[i++];
+            bits |= byteArray[i++];
-
+
-            h1 = bits >> 18 & 0x3f;
+            h1 = bits >> 18 & 0x3f;
-            h2 = bits >> 12 & 0x3f;
+            h2 = bits >> 12 & 0x3f;
-            h3 = bits >> 6 & 0x3f;
+            h3 = bits >> 6 & 0x3f;
-            h4 = bits & 0x3f;
+            h4 = bits & 0x3f;
-
+
-            enc += b64[h1] + b64[h2] + b64[h3] + b64[h4];
+            enc += b64[h1] + b64[h2] + b64[h3] + b64[h4];
-        }
+        }
-
+
-        var r = byteArray.length % 3;
+        var r = byteArray.length % 3;
-
+
-        return (r > 0 ? enc.slice(0, r - 3) : enc) + '==='.slice(r || 3);
+        return (r > 0 ? enc.slice(0, r - 3) : enc) + '==='.slice(r || 3);
-    }
+    }
-
+
-    /**
+    /**
-     * 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.
-     * @returns jQuery promise
+     * @param file
-     */
+     * @param begin
-    function readFileSlice(file, begin, end) {
+     * @param end
-        var deferred = jQuery.Deferred();
+     * @returns jQuery promise
-        var reader = new FileReader();
+     */
-        reader.onload = function(e) {
+    function readFileSlice(file, begin, end) {
-            deferred.resolve(new Uint8Array(e.target.result));
+        var deferred = jQuery.Deferred();
-        }
+        var reader = new FileReader();
-        reader.onerror = reader.onabort = function(e) {
+        reader.onload = function(e) {
-            deferred.reject(e);
+            deferred.resolve(new Uint8Array(e.target.result));
-        }
+        };
-        reader.readAsArrayBuffer(file.slice(begin, end));
+        reader.onerror = reader.onabort = function(e) {
-        return deferred.promise();
+            deferred.reject(e);
-    }
+        };
-
+        reader.readAsArrayBuffer(file.slice(begin, end));
-    
+        return deferred.promise();
-    /**
+    }
-     * Functions and classes exposed by this module
+
-     */
+    
-    return {
+    /**
-        endsWith: endsWith,
+     * Functions and classes exposed by this module
-        readIntegerFrom4Bytes: readIntegerFrom4Bytes,
+     */
-        readIntegerFrom2Bytes : readIntegerFrom2Bytes,
+    return {
-        readFloatFrom4Bytes : readFloatFrom4Bytes,
+        endsWith: endsWith,
-        uint8ArrayToHex : uint8ArrayToHex,
+        readIntegerFrom4Bytes: readIntegerFrom4Bytes,
-        uint8ArrayToBase64 : uint8ArrayToBase64,
+        readIntegerFrom2Bytes : readIntegerFrom2Bytes,
-        readFileSlice : readFileSlice
+        readFloatFrom4Bytes : readFloatFrom4Bytes,
-    };
+        uint8ArrayToHex : uint8ArrayToHex,
-});
+        uint8ArrayToBase64 : uint8ArrayToBase64,
+        readFileSlice : readFileSlice
+    };
+});