From: Vladimír Vondruš <mosra@centrum.cz>
Date: Sun, 4 Feb 2018 22:46:04 +0000 (+0100)
Subject: doxygen: save search data size as bytes.
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~cjwatson/git?a=commitdiff_plain;h=67843ada611f865e6800513c5949920072507b4b;p=blog.git

doxygen: save search data size as bytes.
---

diff --git a/doxygen/search.js b/doxygen/search.js
index 2a1fe780..8186ade3 100644
--- a/doxygen/search.js
+++ b/doxygen/search.js
@@ -63,7 +63,7 @@ var Search = {
         this.map = new DataView(buffer, mapOffset);
 
         /* Set initial properties */
-        this.dataSize = Math.round(buffer.byteLength/102.4)/10;
+        this.dataSize = buffer.byteLength;
         this.symbolCount = (this.map.getUint32(0, true) & 0x00ffffff)/4 - 1;
         this.maxResults = maxResults ? maxResults : 100;
         this.searchString = '';
@@ -72,7 +72,7 @@ var Search = {
         /* istanbul ignore if */
         if(typeof document !== 'undefined') {
             document.getElementById('search-symbolcount').innerHTML =
-                this.symbolCount + " symbols (" + this.dataSize + " kB)";
+                this.symbolCount + " symbols (" + Math.round(this.dataSize/102.4)/10 + " kB)";
             document.getElementById('search-input').disabled = false;
             document.getElementById('search-input').placeholder = "Type something here …";
             document.getElementById('search-input').focus();
@@ -472,7 +472,7 @@ if(typeof document !== 'undefined') {
                 results.length + (results.length >= Search.maxResults ? '+' : '') + " results (" + Math.round((after - prev)*10)/10 + " ms)";
         } else
             document.getElementById('search-symbolcount').innerHTML =
-                Search.symbolCount + " symbols (" + Search.dataSize + " kB)";
+                Search.symbolCount + " symbols (" + Math.round(Search.dataSize/102.4)/10 + " kB)";
     };
 
     document.onkeydown = function(event) {
diff --git a/doxygen/test/test-search.js b/doxygen/test/test-search.js
index d09c33c5..39b0273d 100644
--- a/doxygen/test/test-search.js
+++ b/doxygen/test/test-search.js
@@ -105,7 +105,7 @@ const { StringDecoder } = require('string_decoder');
 {
     let buffer = fs.readFileSync(path.join(__dirname, "js-test-data/searchdata.bin"));
     assert.ok(Search.init(buffer.buffer.slice(buffer.byteOffset, buffer.byteOffset + buffer.byteLength)));
-    assert.equal(Search.dataSize, 0.5);
+    assert.equal(Search.dataSize, 545);
     assert.equal(Search.symbolCount, 7);
     assert.equal(Search.maxResults, 100);
 
@@ -173,7 +173,7 @@ const { StringDecoder } = require('string_decoder');
 {
     let buffer = fs.readFileSync(path.join(__dirname, "js-test-data/searchdata.bin"));
     assert.ok(Search.init(buffer.buffer.slice(buffer.byteOffset, buffer.byteOffset + buffer.byteLength), 3));
-    assert.equal(Search.dataSize, 0.5);
+    assert.equal(Search.dataSize, 545);
     assert.equal(Search.symbolCount, 7);
     assert.equal(Search.maxResults, 3);
     assert.deepEqual(Search.search('m'), [
@@ -195,7 +195,7 @@ const { StringDecoder } = require('string_decoder');
 {
     let b85 = fs.readFileSync(path.join(__dirname, "js-test-data/searchdata.b85"), {encoding: 'utf-8'});
     assert.ok(Search.load(b85));
-    assert.equal(Search.dataSize, 0.5);
+    assert.equal(Search.dataSize, 548); /* some padding on the end, that's okay */
     assert.equal(Search.symbolCount, 7);
     assert.equal(Search.maxResults, 100);
     assert.deepEqual(Search.search('min'), [
@@ -217,7 +217,7 @@ const { StringDecoder } = require('string_decoder');
 {
     let buffer = fs.readFileSync(path.join(__dirname, "js-test-data/unicode.bin"));
     assert.ok(Search.init(buffer.buffer.slice(buffer.byteOffset, buffer.byteOffset + buffer.byteLength), 3));
-    assert.equal(Search.dataSize, 0.1);
+    assert.equal(Search.dataSize, 122);
     assert.equal(Search.symbolCount, 2);
     assert.deepEqual(Search.search('h'), [
         { name: Search.toUtf8('Hárá'),