From: Jakub Skoczen Date: Wed, 28 Mar 2007 15:20:53 +0000 (+0000) Subject: Advnced search view added. X-Git-Tag: PAZPAR2.1.0.0~392 X-Git-Url: http://git.indexdata.com/?a=commitdiff_plain;h=64897139472df598b7e24ce9eabebcfb3f458e34;p=pazpar2-moved-to-github.git Advnced search view added. --- diff --git a/js/pz2.js b/js/pz2.js index 84e9893..9d1e294 100644 --- a/js/pz2.js +++ b/js/pz2.js @@ -1,3 +1,8 @@ +/* +** $Id: pz2.js,v 1.4 2007-03-28 15:20:53 jakub Exp $ +** pz2.js - pazpar2's javascript client library. +*/ + //since explorer is flawed if (!window['Node']) { window.Node = new Object(); diff --git a/www/masterkey/css/styles.css b/www/masterkey/css/styles.css index 4b5a178..2dad81a 100755 --- a/www/masterkey/css/styles.css +++ b/www/masterkey/css/styles.css @@ -99,12 +99,20 @@ left: 74px; top: 28px; } -div.search div { +div.search div.simple { position: absolute; left: 225px; top: 25px; } +div.search div.advanced { +position: absolute; +right: 249px; +top: 47px; +text-align: right; +} + + input.search { background-color: #ffffff; color: #000000; @@ -115,6 +123,16 @@ width: 500px; margin-top: -1px; } +input.advSearch { +background-color: #ffffff; +color: #000000; +border: 1px solid #a5acb2; +height: 17px; +line-height: 17px; +width: 400px; +margin-top: 5px; +} + div.main { width: 100%; background-color:#f0f0f9; /*changed from #ffffff;*/ diff --git a/www/masterkey/index.html b/www/masterkey/index.html index 875a279..6b90d6e 100755 --- a/www/masterkey/index.html +++ b/www/masterkey/index.html @@ -21,11 +21,26 @@
-
+
- Advanced search + Advanced search + +
+
diff --git a/www/masterkey/js/client.js b/www/masterkey/js/client.js index a97b780..f1822ad 100644 --- a/www/masterkey/js/client.js +++ b/www/masterkey/js/client.js @@ -1,8 +1,9 @@ -// very simple client that shows a basic usage of the pz2.js - -// create a parameters array and pass it to the pz2's constructor -// then register the form submit event with the pz2.search function +/* +** $Id: client.js,v 1.5 2007-03-28 15:20:53 jakub Exp $ +** MasterKey - pazpar2's javascript client . +*/ +/* start with creating pz2 object and passing it event handlers*/ var my_paz = new pz2( { "onshow": my_onshow, //"showtime": 1000, //"onstat": my_onstat, @@ -11,6 +12,7 @@ var my_paz = new pz2( { "onshow": my_onshow, //"onbytarget": my_onbytarget, "onrecord": my_onrecord } ); +/* some state variable */ var currentSort = 'relevance'; var currentResultsPerPage = 20; var currentQuery = null; @@ -19,33 +21,54 @@ var currentPage = 0; var currentDetailedId = null; var currentDetailedData = null; -var termStartup = true; //some things should be done only once +var termStartup = true; +var advancedOn = false; -// wait until the DOM is ready (could have been defined in the HTML) +/* wait until the DOM is ready and register basic handlers */ $(document).ready( function() { document.search.onsubmit = onFormSubmitEventHandler; - } ); -function onFormSubmitEventHandler() { - currentQuery = document.search.query.value; - $('#sort').change(function(){ - currentSort = this.value; - currentPage = 0; - my_paz.show(0, currentResultsPerPage, currentSort); + document.search.query.value = ''; + document.search.title.value = ''; + document.search.author.value = ''; + document.search.subject.value = ''; + document.search.date.value = ''; + + $('#advanced').click(toggleAdvanced); + + $('#sort').change(function(){ + currentSort = this.value; + currentPage = 0; + my_paz.show(0, currentResultsPerPage, currentSort); }); - $('#perpage').change(function(){ - currentResultsPerPage = this.value; - currentPage = 0; - my_paz.show(0, currentResultsPerPage, currentSort); + + $('#perpage').change(function(){ + currentResultsPerPage = this.value; + currentPage = 0; + my_paz.show(0, currentResultsPerPage, currentSort); }); - my_paz.search(document.search.query.value, 20, 'relevance'); +} ); + +/* search button event handler */ +function onFormSubmitEventHandler() { + if(!loadQueryFromForm()) + return false; + my_paz.search(currentQuery, currentResultsPerPage, currentSort); $('div.content').show(); - $("div.leftbar").show(); + $("div.leftbar").show(); return false; } -// -// pz2.js event handlers: -// + +/* +********************************************************************************* +** pz2 Event Handlers *********************************************************** +********************************************************************************* +*/ + +/* +** data.hits["md-title"], data.hits["md-author"], data.hits.recid, data.hits.count +** data.activeclients, data.merged, data.total, data.start, data.num +*/ function my_onshow(data) { var recsBody = $('div.records'); @@ -83,42 +106,18 @@ function my_onshow(data) recsBody.append('
'+(currentPage*currentResultsPerPage+i+1)+'.'); recsBody.append(recBody); - } - drawPager(data.merged, data.total); } /* - - body.innerHTML = ""; - for ( i = 0; i < data.hits.length; i++) { - var hit = data.hits[i]; - body.innerHTML += '
' + i + - '. ' + hit["md-title"] + - ' by ' + hit["md-author"] + '
'; - } - body.innerHTML += "
"; - body.innerHTML += '
active clients: ' + data.activeclients + '
' + - '
merged: ' + data.merged + '
' + - '
total: ' + data.total + '
' + - '
start: ' + data.start + '
' + - '
num: ' + data.num + '
'; -} +** data.activeclients, data.hits, data.records, data.clients, data.searching */ +function my_onstat(data){} -function my_onstat(data) -{ /* - var stat = document.getElementById("stat"); - stat.innerHTML = '
active clients: ' + data.activeclients + '
' + - '
hits: ' + data.hits + '
' + - '
records: ' + data.records + '
' + - '
clients: ' + data.clients + '
' + - '
searching: ' + data.searching + '
'; +** data[listname]: name, freq, [id] */ -} - function my_onterm(data) { var termLists = $("#termlists"); @@ -130,7 +129,7 @@ function my_onterm(data) continue; var listName = key; if (key == "xtargets") - listName = "institution"; + listName = "resource"; var termList = $('
').appendTo(termLists); var termTitle = $('
'+listName+'
').appendTo(termList); @@ -190,20 +189,38 @@ function my_onterm(data) } } +/* +** data["md-title"], data["md-date"], data["md-author"], data["md-subject"], data["location"][0].name +*/ function my_onrecord(data) { currentDetailedData = data; drawDetailedRec(); - /* - details = data; - recordDiv = document.getElementById(data.recid); - recordDiv.innerHTML = "
Ttle : " + data["md-title"] + - "
Date : " + data["md-date"] + - "
Author : " + data["md-author"] + - "
Subject : " + data["md-subject"] + - "
Location : " + data["location"][0].name + "
"; - */ +} + +/* +** data[i].id, data[i].hits, data[i].diagnostic, data[i].records, data[i].state +*/ +function my_onbytarget(data){} +/* +********************************************************************************* +** HELPER FUNCTIONS ************************************************************* +********************************************************************************* +*/ +function toggleAdvanced() +{ + if(advancedOn){ + $("div.advanced").hide(); + $("div.search").height(73); + advancedOn = false; + $("#advanced").text("Advanced search"); + } else { + $("div.search").height(173); + $("div.advanced").show(); + advancedOn = true; + $("#advanced").text("Simple search"); + } } function drawDetailedRec(detailBox) @@ -232,37 +249,69 @@ function drawDetailedRec(detailBox) detailTable.appendTo(detailBox); } -function my_onbytarget(data) -{ - /* - targetDiv = document.getElementById("bytarget"); - targetDiv.innerHTML = "IDHitsDiagRecState"; - - for ( i = 0; i < data.length; i++ ) { - targetDiv.innerHTML += "" + data[i].id + - "" + data[i].hits + - "" + data[i].diagnostic + - "" + data[i].records + - "" + data[i].state + ""; - } - */ -} - function refine(field, value) { + // for the time being + if(!advancedOn) + toggleAdvanced(); + var query = ''; var filter = undefined; switch(field) { - case "author": query = ' and au="'+value+'"'; break; - case "title": query = ' and ti="'+value+'"'; break; - case "date": query = ' and date="'+value+'"'; break; - case "subject": query = ' and su="'+value+'"'; break; + case "author": query = ' and au="'+value+'"'; + if(document.search.author.value != '') document.search.author.value+='; '; + document.search.author.value += value; break; + + case "title": query = ' and ti="'+value+'"'; + //if(document.search.tile.value != '') document.search.title.value+='; '; + //document.search.title.value += value; break; + + case "date": query = ' and date="'+value+'"'; + if(document.search.date.value != '') document.search.date.value+='; '; + document.search.date.value += value; break; + + case "subject": query = ' and su="'+value+'"'; + if(document.search.subject.value != '') document.search.subject.value+='; '; + document.search.subject.value += value; break; + case "xtarget": filter = 'id='+value; break; } - + currentPage = 0; - my_paz.search(currentQuery + query, currentResultsPerPage, currentSort, filter); + currentQuery = currentQuery + query; + my_paz.search(currentQuery, currentResultsPerPage, currentSort, filter); +} + +function loadQueryFromForm() +{ + var query = new Array(); + + if( document.search.query.value !== '' ) query.push(document.search.query.value); + if( document.search.author.value !== '' ) query.push(parseField(document.search.author.value, 'au')); + //if( document.search.title.value !== '' ) query.push(parseField(document.search.title.value, 'ti')); + if( document.search.date.value !== '' ) query.push(parseField(document.search.date.value, 'date')); + if( document.search.subject.value !== '' ) query.push(parseField(document.search.subject.value, 'su')); + + if( query.length ) { + currentQuery = query.join(" and "); + return true; + } else { + return false; + } +} + +function parseField(inputString, field) +{ + var inputArr = inputString.split(';'); + var outputArr = new Array(); + for(var i=0; i < inputArr.length; i++){ + if(inputArr[i].length < 3){ + continue; + } + outputArr.push(field+'="'+inputArr[i]+'"'); + } + return outputArr.join(" and "); } function drawPager(max, hits)