X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=tools%2Fhtdocs%2Fmkws.js;h=d21f3333af1344baad7e4c5a9c3c9ec0821a4fdb;hb=c1e0961e953a61bc41b83449e06c7b3fa023856e;hp=098d22bc0f5d89c49639a824313b28793433b5f7;hpb=6aa1e41ff010214569f054c315f12c7192a095dc;p=mkws-moved-to-github.git diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js index 098d22b..d21f333 100644 --- a/tools/htdocs/mkws.js +++ b/tools/htdocs/mkws.js @@ -75,7 +75,6 @@ Handlebars.registerHelper('commaList', function(items, options) { // indexed by windowid. var mkws = { authenticated: false, - init: false, debug_function: undefined, // will be set during initialisation debug_level: undefined, // will be initialised from mkws_config sessions: {}, @@ -143,25 +142,27 @@ if (mkws_config == null || typeof mkws_config != 'object') { // wrapper for jQuery lib function _make_mkws_team($, teamName) { - // if (console && console.log) // disabled, will fail in IE8 - // console.log("run _make_mkws_team(" + (teamName ? teamName : "") + ")"); - - // call this function only once - if (mkws.init) { - alert("_make_mkws_team() called twice: how did that happen?!"); - return; - } - + var m_submitted = false; + var m_query; // initially undefined var m_sort = 'relevance'; var m_filters = []; - - // keep time state for debugging + var m_totalRec = 0; + var m_recPerPage = 20; + var m_curPage = 1; + var m_curDetRecId = ''; + var m_curDetRecData = null; var m_debug_time = { + // Timestamps for logging "start": $.now(), "last": $.now() }; + // if (console && console.log) // disabled, will fail in IE8 + // console.log("run _make_mkws_team(" + (teamName ? teamName : "") + ")"); + + + // Needs to be defined inside _make_mkws_team() so it can see m_debug_time mkws.debug_function = function (string) { if (!mkws.debug_level) return; @@ -210,7 +211,7 @@ function _make_mkws_team($, teamName) { dummy: "dummy" }; - /* set global debug_level flag early */ + /* Set global debug_level flag early so that debug() works */ if (typeof mkws_config.debug_level !== 'undefined') { mkws.debug_level = mkws_config.debug_level; } else if (typeof config_default.debug_level !== 'undefined') { @@ -273,20 +274,8 @@ function _make_mkws_team($, teamName) { "showResponseType": '', // or "json" (for debugging?) "onrecord": my_onrecord } ); - // some state vars - var curPage = 1; - var recPerPage = 20; - var totalRec = 0; - var curDetRecId = ''; - var curDetRecData = null; - var submitted = false; - var SourceMax = 16; - var SubjectMax = 10; - var AuthorMax = 10; - var m_query; // initially undefined - if (!isNaN(parseInt(mkws_config.perpage_default))) { - recPerPage = parseInt(mkws_config.perpage_default); + m_recPerPage = parseInt(mkws_config.perpage_default); } @@ -300,7 +289,7 @@ function _make_mkws_team($, teamName) { function my_onshow(data) { - totalRec = data.merged; + m_totalRec = data.merged; // move it out var pager = document.getElementById("mkwsPager"); if (pager) { @@ -321,8 +310,8 @@ function _make_mkws_team($, teamName) { html.push('
', renderSummary(hit), '
'); - if (hit.recid == curDetRecId) { - html.push(renderDetails(curDetRecData)); + if (hit.recid == m_curDetRecId) { + html.push(renderDetails(m_curDetRecData)); } } replaceHtml(results, html.join('')); @@ -367,11 +356,11 @@ function _make_mkws_team($, teamName) { for(var i = 0; i < facets.length; i++) { if (facets[i] == "sources") { - add_single_facet(acc, "Sources", data.xtargets, SourceMax, null); + add_single_facet(acc, "Sources", data.xtargets, 16, null); } else if (facets[i] == "subjects") { - add_single_facet(acc, "Subjects", data.subject, SubjectMax, "subject"); + add_single_facet(acc, "Subjects", data.subject, 10, "subject"); } else if (facets[i] == "authors") { - add_single_facet(acc, "Authors", data.author, AuthorMax, "author"); + add_single_facet(acc, "Authors", data.author, 10, "author"); } else { alert("bad facet configuration: '" + facets[i] + "'"); } @@ -411,9 +400,9 @@ function _make_mkws_team($, teamName) { // in case on_show was faster to redraw element var detRecordDiv = document.getElementById('mkwsDet_'+data.recid); if (detRecordDiv) return; - curDetRecData = data; - var recordDiv = document.getElementById('mkwsRecdiv_'+curDetRecData.recid); - var html = renderDetails(curDetRecData); + m_curDetRecData = data; + var recordDiv = document.getElementById('mkwsRecdiv_'+m_curDetRecData.recid); + var html = renderDetails(m_curDetRecData); recordDiv.innerHTML += html; } @@ -486,24 +475,24 @@ function _make_mkws_team($, teamName) { loadSelect(); // ### should use windowid triggerSearch(query, sort, targets, windowid); mkws.switchView('records'); // In case it's configured to start off as hidden - submitted = true; + m_submitted = true; } function onSelectDdChange() { - if (!submitted) return false; + if (!m_submitted) return false; resetPage(); loadSelect(); - m_paz.show(0, recPerPage, m_sort); + m_paz.show(0, m_recPerPage, m_sort); return false; } function resetPage() { - curPage = 1; - totalRec = 0; + m_curPage = 1; + m_totalRec = 0; } @@ -551,7 +540,7 @@ function _make_mkws_team($, teamName) { } debug("triggerSearch(" + m_query + "): filters = " + $.toJSON(m_filters) + ", pp2filter = " + pp2filter + ", params = " + $.toJSON(params)); - m_paz.search(m_query, recPerPage, m_sort, pp2filter, undefined, params); + m_paz.search(m_query, m_recPerPage, m_sort, pp2filter, undefined, params); } @@ -561,7 +550,7 @@ function _make_mkws_team($, teamName) { if (document.mkwsSelect.mkwsSort) m_sort = document.mkwsSelect.mkwsSort.value; if (document.mkwsSelect.mkwsPerpage) - recPerPage = document.mkwsSelect.mkwsPerpage.value; + m_recPerPage = document.mkwsSelect.mkwsPerpage.value; } } @@ -669,10 +658,10 @@ function _make_mkws_team($, teamName) { { //client indexes pages from 1 but pz2 from 0 var onsides = 6; - var pages = Math.ceil(totalRec / recPerPage); + var pages = Math.ceil(m_totalRec / m_recPerPage); - var firstClkbl = ( curPage - onsides > 0 ) - ? curPage - onsides + var firstClkbl = ( m_curPage - onsides > 0 ) + ? m_curPage - onsides : 1; var lastClkbl = firstClkbl + 2*onsides < pages @@ -680,14 +669,14 @@ function _make_mkws_team($, teamName) { : pages; var prev = '<< ' + M('Prev') + ' | '; - if (curPage > 1) + if (m_curPage > 1) prev = '' +'<< ' + M('Prev') + ' | '; var middle = ''; for(var i = firstClkbl; i <= lastClkbl; i++) { var numLabel = i; - if(i == curPage) + if(i == m_curPage) numLabel = '' + i + ''; middle += ' ' @@ -695,7 +684,7 @@ function _make_mkws_team($, teamName) { } var next = ' | ' + M('Next') + ' >>'; - if (pages - curPage > 0) + if (pages - m_curPage > 0) next = ' | ' + M('Next') + ' >>'; @@ -714,23 +703,23 @@ function _make_mkws_team($, teamName) { mkws.showPage = function (pageNum) { - curPage = pageNum; - m_paz.showPage( curPage - 1 ); + m_curPage = pageNum; + m_paz.showPage( m_curPage - 1 ); } // simple paging functions mkws.pagerNext = function () { - if ( totalRec - recPerPage*curPage > 0) { + if ( m_totalRec - m_recPerPage*m_curPage > 0) { m_paz.showNext(); - curPage++; + m_curPage++; } } mkws.pagerPrev = function () { if ( m_paz.showPrev() != false ) - curPage--; + m_curPage--; } @@ -772,8 +761,8 @@ function _make_mkws_team($, teamName) { // detailed record drawing mkws.showDetails = function (prefixRecId) { var recId = prefixRecId.replace('mkwsRec_', ''); - var oldRecId = curDetRecId; - curDetRecId = recId; + var oldRecId = m_curDetRecId; + m_curDetRecId = recId; // remove current detailed view if any var detRecordDiv = document.getElementById('mkwsDet_'+oldRecId); @@ -783,8 +772,8 @@ function _make_mkws_team($, teamName) { // if the same clicked, just hide if (recId == oldRecId) { - curDetRecId = ''; - curDetRecData = null; + m_curDetRecId = ''; + m_curDetRecData = null; return; } // request the record @@ -1249,9 +1238,6 @@ function _make_mkws_team($, teamName) { // alert(e.message); } })(); - - // done - mkws.init = true; };