reworked file structure; changed search results to be faster
This commit is contained in:
Oleg Belyaev
parent
a0fa864475
commit
a65037f8ea
15 changed files with 880 additions and 853 deletions
|
|
@ -1,3 +1,80 @@
|
|||
var md5 = (function() {
|
||||
var MD5 = function (d) {
|
||||
return M(V(Y(X(d), 8 * d.length)))
|
||||
}
|
||||
function M (d) {
|
||||
for (var _, m = '0123456789abcdef', f = '', r = 0; r < d.length; r++) {
|
||||
_ = d.charCodeAt(r)
|
||||
f += m.charAt(_ >>> 4 & 15) + m.charAt(15 & _)
|
||||
}
|
||||
return f
|
||||
}
|
||||
function X (d) {
|
||||
for (var _ = Array(d.length >> 2), m = 0; m < _.length; m++) {
|
||||
_[m] = 0
|
||||
}
|
||||
for (m = 0; m < 8 * d.length; m += 8) {
|
||||
_[m >> 5] |= (255 & d.charCodeAt(m / 8)) << m % 32
|
||||
}
|
||||
return _
|
||||
}
|
||||
function V (d) {
|
||||
for (var _ = '', m = 0; m < 32 * d.length; m += 8) _ += String.fromCharCode(d[m >> 5] >>> m % 32 & 255)
|
||||
return _
|
||||
}
|
||||
function Y (d, _) {
|
||||
d[_ >> 5] |= 128 << _ % 32
|
||||
d[14 + (_ + 64 >>> 9 << 4)] = _
|
||||
for (var m = 1732584193, f = -271733879, r = -1732584194, i = 271733878, n = 0; n < d.length; n += 16) {
|
||||
var h = m
|
||||
var t = f
|
||||
var g = r
|
||||
var e = i
|
||||
f = md5ii(f = md5ii(f = md5ii(f = md5ii(f = md5hh(f = md5hh(f = md5hh(f = md5hh(f = md5gg(f = md5gg(f = md5gg(f = md5gg(f = md5ff(f = md5ff(f = md5ff(f = md5ff(f, r = md5ff(r, i = md5ff(i, m = md5ff(m, f, r, i, d[n + 0], 7, -680876936), f, r, d[n + 1], 12, -389564586), m, f, d[n + 2], 17, 606105819), i, m, d[n + 3], 22, -1044525330), r = md5ff(r, i = md5ff(i, m = md5ff(m, f, r, i, d[n + 4], 7, -176418897), f, r, d[n + 5], 12, 1200080426), m, f, d[n + 6], 17, -1473231341), i, m, d[n + 7], 22, -45705983), r = md5ff(r, i = md5ff(i, m = md5ff(m, f, r, i, d[n + 8], 7, 1770035416), f, r, d[n + 9], 12, -1958414417), m, f, d[n + 10], 17, -42063), i, m, d[n + 11], 22, -1990404162), r = md5ff(r, i = md5ff(i, m = md5ff(m, f, r, i, d[n + 12], 7, 1804603682), f, r, d[n + 13], 12, -40341101), m, f, d[n + 14], 17, -1502002290), i, m, d[n + 15], 22, 1236535329), r = md5gg(r, i = md5gg(i, m = md5gg(m, f, r, i, d[n + 1], 5, -165796510), f, r, d[n + 6], 9, -1069501632), m, f, d[n + 11], 14, 643717713), i, m, d[n + 0], 20, -373897302), r = md5gg(r, i = md5gg(i, m = md5gg(m, f, r, i, d[n + 5], 5, -701558691), f, r, d[n + 10], 9, 38016083), m, f, d[n + 15], 14, -660478335), i, m, d[n + 4], 20, -405537848), r = md5gg(r, i = md5gg(i, m = md5gg(m, f, r, i, d[n + 9], 5, 568446438), f, r, d[n + 14], 9, -1019803690), m, f, d[n + 3], 14, -187363961), i, m, d[n + 8], 20, 1163531501), r = md5gg(r, i = md5gg(i, m = md5gg(m, f, r, i, d[n + 13], 5, -1444681467), f, r, d[n + 2], 9, -51403784), m, f, d[n + 7], 14, 1735328473), i, m, d[n + 12], 20, -1926607734), r = md5hh(r, i = md5hh(i, m = md5hh(m, f, r, i, d[n + 5], 4, -378558), f, r, d[n + 8], 11, -2022574463), m, f, d[n + 11], 16, 1839030562), i, m, d[n + 14], 23, -35309556), r = md5hh(r, i = md5hh(i, m = md5hh(m, f, r, i, d[n + 1], 4, -1530992060), f, r, d[n + 4], 11, 1272893353), m, f, d[n + 7], 16, -155497632), i, m, d[n + 10], 23, -1094730640), r = md5hh(r, i = md5hh(i, m = md5hh(m, f, r, i, d[n + 13], 4, 681279174), f, r, d[n + 0], 11, -358537222), m, f, d[n + 3], 16, -722521979), i, m, d[n + 6], 23, 76029189), r = md5hh(r, i = md5hh(i, m = md5hh(m, f, r, i, d[n + 9], 4, -640364487), f, r, d[n + 12], 11, -421815835), m, f, d[n + 15], 16, 530742520), i, m, d[n + 2], 23, -995338651), r = md5ii(r, i = md5ii(i, m = md5ii(m, f, r, i, d[n + 0], 6, -198630844), f, r, d[n + 7], 10, 1126891415), m, f, d[n + 14], 15, -1416354905), i, m, d[n + 5], 21, -57434055), r = md5ii(r, i = md5ii(i, m = md5ii(m, f, r, i, d[n + 12], 6, 1700485571), f, r, d[n + 3], 10, -1894986606), m, f, d[n + 10], 15, -1051523), i, m, d[n + 1], 21, -2054922799), r = md5ii(r, i = md5ii(i, m = md5ii(m, f, r, i, d[n + 8], 6, 1873313359), f, r, d[n + 15], 10, -30611744), m, f, d[n + 6], 15, -1560198380), i, m, d[n + 13], 21, 1309151649), r = md5ii(r, i = md5ii(i, m = md5ii(m, f, r, i, d[n + 4], 6, -145523070), f, r, d[n + 11], 10, -1120210379), m, f, d[n + 2], 15, 718787259), i, m, d[n + 9], 21, -343485551)
|
||||
m = safeadd(m, h)
|
||||
f = safeadd(f, t)
|
||||
r = safeadd(r, g)
|
||||
i = safeadd(i, e)
|
||||
}
|
||||
return [m, f, r, i]
|
||||
}
|
||||
function md5cmn (d, _, m, f, r, i) {
|
||||
return safeadd(bitrol(safeadd(safeadd(_, d), safeadd(f, i)), r), m)
|
||||
}
|
||||
function md5ff (d, _, m, f, r, i, n) {
|
||||
return md5cmn(_ & m | ~_ & f, d, _, r, i, n)
|
||||
}
|
||||
function md5gg (d, _, m, f, r, i, n) {
|
||||
return md5cmn(_ & f | m & ~f, d, _, r, i, n)
|
||||
}
|
||||
function md5hh (d, _, m, f, r, i, n) {
|
||||
return md5cmn(_ ^ m ^ f, d, _, r, i, n)
|
||||
}
|
||||
function md5ii (d, _, m, f, r, i, n) {
|
||||
return md5cmn(m ^ (_ | ~f), d, _, r, i, n)
|
||||
}
|
||||
function safeadd (d, _) {
|
||||
var m = (65535 & d) + (65535 & _)
|
||||
return (d >> 16) + (_ >> 16) + (m >> 16) << 16 | 65535 & m
|
||||
}
|
||||
function bitrol (d, _) {
|
||||
return d << _ | d >>> 32 - _
|
||||
}
|
||||
function MD5Unicode(buffer){
|
||||
if (!(buffer instanceof Uint8Array)) {
|
||||
buffer = new TextEncoder().encode(typeof buffer==='string' ? buffer : JSON.stringify(buffer));
|
||||
}
|
||||
var binary = [];
|
||||
var bytes = new Uint8Array(buffer);
|
||||
for (var i = 0, il = bytes.byteLength; i < il; i++) {
|
||||
binary.push(String.fromCharCode(bytes[i]));
|
||||
}
|
||||
return MD5(binary.join(''));
|
||||
}
|
||||
|
||||
return MD5Unicode;
|
||||
})();
|
||||
|
||||
$( document ).ready(function() {
|
||||
// GLOBALS;
|
||||
|
||||
|
|
@ -9,4 +86,48 @@ $( document ).ready(function() {
|
|||
$('#abv-search').on("submit", function () {
|
||||
$('#abv-search-icon').replaceWith('<div class="loader"></div>');
|
||||
});
|
||||
|
||||
// SEARCH RESULTS MODAL
|
||||
$('#abv-btn-searchResults').on("click", function () {
|
||||
$('#modal_searchResults')[0].showModal();
|
||||
});
|
||||
|
||||
// Close search modal
|
||||
$('.abv-close-search').on("click", function () {
|
||||
$('#modal_searchResults')[0].close();
|
||||
});
|
||||
|
||||
$('#modal_searchResults').on("toggle", async function () {
|
||||
// let html = "";
|
||||
async function getResults() {
|
||||
let url = "./api/search/current";
|
||||
const response = await fetch(url);
|
||||
const result = await response.json();
|
||||
return result;
|
||||
}
|
||||
async function getEntryForm(id) {
|
||||
let url = `./api/entries/${md5(id).toUpperCase()}`;
|
||||
const response = await fetch(url);
|
||||
const result = await response.json();
|
||||
return result.form;
|
||||
}
|
||||
searchResults = await getResults();
|
||||
for (result of searchResults) {
|
||||
let pos = searchResults.indexOf(result);
|
||||
// let form = await getEntryForm(result.entry);
|
||||
let html = `
|
||||
<tr>
|
||||
<td>${pos+1}</td>
|
||||
<td>
|
||||
<a href="./search/position?p=${pos+1}">${result.entryForm}</a>
|
||||
</td>
|
||||
<td>
|
||||
${result.fragment}
|
||||
</td>
|
||||
</tr>
|
||||
`
|
||||
$(this).find('tbody').append($(html));
|
||||
}
|
||||
// $(this).find('tbody').append($(html));
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -216,7 +216,7 @@ a.abv-map img {
|
|||
height: 2ex;
|
||||
}
|
||||
|
||||
a.link:hover {
|
||||
a.link:hover, a.abv-map:hover {
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -20,16 +20,6 @@ $( document ).ready(function() {
|
|||
//hideNav: '.pagination',
|
||||
});
|
||||
|
||||
// SEARCH RESULTS MODAL
|
||||
$('#abv-btn-searchResults').on("click", function () {
|
||||
$('#modal_searchResults')[0].showModal();
|
||||
});
|
||||
|
||||
// Close search modal
|
||||
$('.abv-close-search').on("click", function () {
|
||||
$('#modal_searchResults')[0].close();
|
||||
});
|
||||
|
||||
// MAP MODAL
|
||||
// This event binding is done on page load and also whenever new entries are loaded.
|
||||
bindMapOpen = function () {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue