+
+
+
+
+[% IF op == 'show' %]
+
+[% IF deleted_name %]
+
+
Deleted target '[% deleted_name %]'
+
+[% END %]
+
+
+
+
These Z39.50 targets are searched in the OPAC using the "external targets" feature. Note that Pazpar2 must be installed and configured for this to work.
+
+[% IF targets.size %]
+
+ Name Connection Login Syntax Encoding
+
+ [% FOREACH target = targets %]
+
+ [% target.name %]
+ [% target.host %]:[% target.port %]/[% target.db %]
+ [% IF target.userid %][% target.userid %] / [% IF target.password %]********[% ELSE %]none [% END %][% ELSE %]none [% END %]
+ [% target.syntax %]
+
+ [% IF target.encoding == 'marc8' %]
+ MARC-8
+ [% ELSIF target.encoding == 'utf8' %]
+ UTF-8
+ [% END %]
+
+ Edit
+ Delete
+
+ [% END %]
+
+
+[% ELSE %]
+
No external targets have been defined yet.
+[% END %]
+
+[% ELSIF op == 'add' || op == 'edit' %]
+
+
+
+[% END %]
+
+
+
+[% INCLUDE 'admin-menu.inc' %]
+
+
+
+[% INCLUDE 'intranet-bottom.inc' %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
@@ -424,6 +424,13 @@ OPAC:
yes: Allow
no: Do not allow
- users to add a note when placing a hold.
+ -
+ - pref: OPACSearchExternalTargets
+ default: 0
+ choices:
+ yes: Search
+ no: "Don't search"
+ - external targets from the OPAC.
Policy:
-
--- a/koha-tmpl/opac-tmpl/ccsr/en/css/opac.css
+++ a/koha-tmpl/opac-tmpl/ccsr/en/css/opac.css
@@ -1609,6 +1609,10 @@ strong em, em strong {
vertical-align: top;
width: 10px;
}
+.sourcecol {
+ vertical-align: top;
+ width: 100px;
+}
#container {
color : #000;
}
@@ -2876,3 +2880,15 @@ a.reviewlink,a.reviewlink:visited {
display: block;
overflow: auto;
}
+
+#modal-overlay {
+ background-color: white;
+ border-radius: 5px;
+ max-width: 75%;
+ padding: 15px;
+}
+
+#overdrive-results, #pazpar2-results {
+ font-weight: bold;
+ padding-left: 1em;
+}
--- a/koha-tmpl/opac-tmpl/ccsr/en/js/externalsearch.js
+++ a/koha-tmpl/opac-tmpl/ccsr/en/js/externalsearch.js
@@ -0,0 +1,106 @@
+if ( typeof KOHA == "undefined" || !KOHA ) {
+ var KOHA = {};
+}
+
+KOHA.XSLTGet = ( function() {
+ // Horrible browser hack, but required due to the following hard-to-detect and long-unfixed bug:
+ // https://bugs.webkit.org/show_bug.cgi?id=60276
+ var isChrome = /Chrome/.test(navigator.userAgent) && /Google Inc/.test(navigator.vendor);
+ var isSafari = /Safari/.test(navigator.userAgent) && /Apple Computer/.test(navigator.vendor);
+
+ if ( !isChrome && !isSafari ) return $.get;
+
+ return function( url ) {
+ var result = new jQuery.Deferred();
+ var basepath = url.match( /(.*\/)*/ )[0];
+
+ $.get( url ).done( function( xslDoc ) {
+ var xslImports = xslDoc.getElementsByTagNameNS( 'http://www.w3.org/1999/XSL/Transform', 'import' );
+ var importsRemaining = xslImports.length;
+
+ if ( importsRemaining == 0 ) {
+ result.resolve( xslDoc );
+ return;
+ }
+
+ $.each( xslImports, function( i, importElem ) {
+ var path = $( importElem ).attr( 'href' );
+ if ( !/^(\/|https?:)/.test( path ) ) path = basepath + path;
+
+ KOHA.XSLTGet( path ).done( function( subDoc ) {
+ importsRemaining--;
+ $( importElem ).replaceWith( subDoc.documentElement.childNodes );
+
+ if ( importsRemaining == 0 ) result.resolve( xslDoc );
+ } ).fail( function() {
+ importsRemaining = -1;
+
+ result.reject();
+ } );
+ } );
+ } ).fail( function() {
+ result.reject();
+ } );
+
+ return result;
+ };
+} )();
+
+KOHA.TransformToFragment = function( xmlDoc, xslDoc ) {
+ if ( window.XSLTProcessor ) {
+ var proc = new XSLTProcessor();
+ proc.importStylesheet( xslDoc );
+ proc.setParameter( null, 'showAvailability', false );
+ return (new XMLSerializer).serializeToString( proc.transformToFragment( xmlDoc, document ) );
+ } else if ( window.ActiveXObject ) {
+ var xslt = new ActiveXObject( "Msxml2.XSLTemplate" );
+ xslt.stylesheet = xslDoc;
+ var xslProc = xslt.createProcessor();
+ xslProc.input = xmlDoc;
+ xslProc.addParameter( 'showAvailability', false );
+ xslProc.transform();
+ return xslProc.output;
+ }
+};
+
+KOHA.ExternalSearch = ( function() {
+ return {
+ targets: {},
+ Search: function( q, limit, callback ) {
+ var targetIDs = [];
+ var includedTargets = [];
+
+ $.each( KOHA.ExternalSearch.targets, function ( url, info ) {
+ if ( !info.disabled ) {
+ includedTargets.push( url );
+ targetIDs.push( info.id );
+ }
+ } );
+
+ if ( KOHA.ExternalSearch._pz !== undefined ) {
+ afterinit( KOHA.ExternalSearch._pz );
+ } else {
+ $.get( '/cgi-bin/koha/svc/pazpar2_init', { targets: targetIDs.join(',') }, function( data ) {
+ KOHA.ExternalSearch._pz = new pz2({
+ sessionId: data.sessionID,
+ onshow: callback,
+ errorhandler: function ( error ) { callback( { error: error } ) },
+ } );
+ afterinit( KOHA.ExternalSearch._pz );
+ } );
+ }
+
+ function afterinit( pz ) {
+ pz.search( q, limit, 'relevance:0', 'pz:id=' + includedTargets.join( '|' ) );
+ }
+ },
+ Fetch: function( offset, callback ) {
+ var pz = KOHA.ExternalSearch._pz;
+ pz.showCallback = callback;
+ pz.show( offset );
+ },
+ GetDetailedRecord: function( recid, callback ) {
+ KOHA.ExternalSearch._pz.record( recid, 0, undefined, { callback: callback } );
+ },
+ };
+} )();
--- a/koha-tmpl/opac-tmpl/ccsr/en/lib/jquery/plugins/jquery.lightbox_me.js
+++ a/koha-tmpl/opac-tmpl/ccsr/en/lib/jquery/plugins/jquery.lightbox_me.js
@@ -0,0 +1,254 @@
+/*
+* $ lightbox_me
+* By: Buck Wilson
+* Version : 2.3
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+
+(function($) {
+
+ $.fn.lightbox_me = function(options) {
+
+ return this.each(function() {
+
+ var
+ opts = $.extend({}, $.fn.lightbox_me.defaults, options),
+ $overlay = $(),
+ $self = $(this),
+ $iframe = $('
'),
+ ie6 = ($.browser.msie && $.browser.version < 7);
+
+ if (opts.showOverlay) {
+ //check if there's an existing overlay, if so, make subequent ones clear
+ var $currentOverlays = $(".js_lb_overlay:visible");
+ if ($currentOverlays.length > 0){
+ $overlay = $('
');
+ } else {
+ $overlay = $('
');
+ }
+ }
+
+ /*----------------------------------------------------
+ DOM Building
+ ---------------------------------------------------- */
+ if (ie6) {
+ var src = /^https/i.test(window.location.href || '') ? 'javascript:false' : 'about:blank';
+ $iframe.attr('src', src);
+ $('body').append($iframe);
+ } // iframe shim for ie6, to hide select elements
+ $('body').append($self.hide()).append($overlay);
+
+
+ /*----------------------------------------------------
+ Overlay CSS stuffs
+ ---------------------------------------------------- */
+
+ // set css of the overlay
+ if (opts.showOverlay) {
+ setOverlayHeight(); // pulled this into a function because it is called on window resize.
+ $overlay.css({ position: 'absolute', width: '100%', top: 0, left: 0, right: 0, bottom: 0, zIndex: (opts.zIndex + 2), display: 'none' });
+ if (!$overlay.hasClass('lb_overlay_clear')){
+ $overlay.css(opts.overlayCSS);
+ }
+ }
+
+ /*----------------------------------------------------
+ Animate it in.
+ ---------------------------------------------------- */
+ //
+ if (opts.showOverlay) {
+ $overlay.fadeIn(opts.overlaySpeed, function() {
+ setSelfPosition();
+ $self[opts.appearEffect](opts.lightboxSpeed, function() { setOverlayHeight(); setSelfPosition(); opts.onLoad()});
+ });
+ } else {
+ setSelfPosition();
+ $self[opts.appearEffect](opts.lightboxSpeed, function() { opts.onLoad()});
+ }
+
+ /*----------------------------------------------------
+ Hide parent if parent specified (parentLightbox should be jquery reference to any parent lightbox)
+ ---------------------------------------------------- */
+ if (opts.parentLightbox) {
+ opts.parentLightbox.fadeOut(200);
+ }
+
+
+ /*----------------------------------------------------
+ Bind Events
+ ---------------------------------------------------- */
+
+ $(window).resize(setOverlayHeight)
+ .resize(setSelfPosition)
+ .scroll(setSelfPosition);
+
+ $(window).bind('keyup.lightbox_me', observeKeyPress);
+
+ if (opts.closeClick) {
+ $overlay.click(function(e) { closeLightbox(); e.preventDefault; });
+ }
+ $self.delegate(opts.closeSelector, "click", function(e) {
+ closeLightbox(); e.preventDefault();
+ });
+ $self.bind('close', closeLightbox);
+ $self.bind('reposition', setSelfPosition);
+
+
+
+ /*--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- */
+
+
+ /*----------------------------------------------------
+ Private Functions
+ ---------------------------------------------------- */
+
+ /* Remove or hide all elements */
+ function closeLightbox() {
+ var s = $self[0].style;
+ if (opts.destroyOnClose) {
+ $self.add($overlay).remove();
+ } else {
+ $self.add($overlay).hide();
+ }
+
+ //show the hidden parent lightbox
+ if (opts.parentLightbox) {
+ opts.parentLightbox.fadeIn(200);
+ }
+
+ $iframe.remove();
+
+ // clean up events.
+ $self.undelegate(opts.closeSelector, "click");
+
+ $(window).unbind('reposition', setOverlayHeight);
+ $(window).unbind('reposition', setSelfPosition);
+ $(window).unbind('scroll', setSelfPosition);
+ $(window).unbind('keyup.lightbox_me');
+ if (ie6)
+ s.removeExpression('top');
+ opts.onClose();
+ }
+
+
+ /* Function to bind to the window to observe the escape/enter key press */
+ function observeKeyPress(e) {
+ if((e.keyCode == 27 || (e.DOM_VK_ESCAPE == 27 && e.which==0)) && opts.closeEsc) closeLightbox();
+ }
+
+
+ /* Set the height of the overlay
+ : if the document height is taller than the window, then set the overlay height to the document height.
+ : otherwise, just set overlay height: 100%
+ */
+ function setOverlayHeight() {
+ if ($(window).height() < $(document).height()) {
+ $overlay.css({height: $(document).height() + 'px'});
+ $iframe.css({height: $(document).height() + 'px'});
+ } else {
+ $overlay.css({height: '100%'});
+ if (ie6) {
+ $('html,body').css('height','100%');
+ $iframe.css('height', '100%');
+ } // ie6 hack for height: 100%; TODO: handle this in IE7
+ }
+ }
+
+
+ /* Set the position of the modal'd window ($self)
+ : if $self is taller than the window, then make it absolutely positioned
+ : otherwise fixed
+ */
+ function setSelfPosition() {
+ var s = $self[0].style;
+
+ // reset CSS so width is re-calculated for margin-left CSS
+ $self.css({left: '50%', marginLeft: ($self.outerWidth() / 2) * -1, zIndex: (opts.zIndex + 3) });
+
+
+ /* we have to get a little fancy when dealing with height, because lightbox_me
+ is just so fancy.
+ */
+
+ // if the height of $self is bigger than the window and self isn't already position absolute
+ if (($self.height() + 80 >= $(window).height()) && ($self.css('position') != 'absolute' || ie6)) {
+
+ // we are going to make it positioned where the user can see it, but they can still scroll
+ // so the top offset is based on the user's scroll position.
+ var topOffset = $(document).scrollTop() + 40;
+ $self.css({position: 'absolute', top: topOffset + 'px', marginTop: 0})
+ if (ie6) {
+ s.removeExpression('top');
+ }
+ } else if ($self.height()+ 80 < $(window).height()) {
+ //if the height is less than the window height, then we're gonna make this thing position: fixed.
+ // in ie6 we're gonna fake it.
+ if (ie6) {
+ s.position = 'absolute';
+ if (opts.centered) {
+ s.setExpression('top', '(document.documentElement.clientHeight || document.body.clientHeight) / 2 - (this.offsetHeight / 2) + (blah = document.documentElement.scrollTop ? document.documentElement.scrollTop : document.body.scrollTop) + "px"')
+ s.marginTop = 0;
+ } else {
+ var top = (opts.modalCSS && opts.modalCSS.top) ? parseInt(opts.modalCSS.top) : 0;
+ s.setExpression('top', '((blah = document.documentElement.scrollTop ? document.documentElement.scrollTop : document.body.scrollTop) + '+top+') + "px"')
+ }
+ } else {
+ if (opts.centered) {
+ $self.css({ position: 'fixed', top: '50%', marginTop: ($self.outerHeight() / 2) * -1})
+ } else {
+ $self.css({ position: 'fixed'}).css(opts.modalCSS);
+ }
+
+ }
+ }
+ }
+
+ });
+
+
+
+ };
+
+ $.fn.lightbox_me.defaults = {
+
+ // animation
+ appearEffect: "fadeIn",
+ appearEase: "",
+ overlaySpeed: 250,
+ lightboxSpeed: 300,
+
+ // close
+ closeSelector: ".close",
+ closeClick: true,
+ closeEsc: true,
+
+ // behavior
+ destroyOnClose: false,
+ showOverlay: true,
+ parentLightbox: false,
+
+ // callbacks
+ onLoad: function() {},
+ onClose: function() {},
+
+ // style
+ classPrefix: 'lb',
+ zIndex: 999,
+ centered: false,
+ modalCSS: {top: '40px'},
+ overlayCSS: {background: 'black', opacity: .3}
+ }
+})(jQuery);
--- a/koha-tmpl/opac-tmpl/lib/pz2.js
+++ a/koha-tmpl/opac-tmpl/lib/pz2.js
@@ -0,0 +1,1110 @@
+/*
+ * $Id: 3a9980787bb5d0fe966140b243a4a5eb6768913e $
+** pz2.js - pazpar2's javascript client library.
+*/
+
+//since explorer is flawed
+if (!window['Node']) {
+ window.Node = new Object();
+ Node.ELEMENT_NODE = 1;
+ Node.ATTRIBUTE_NODE = 2;
+ Node.TEXT_NODE = 3;
+ Node.CDATA_SECTION_NODE = 4;
+ Node.ENTITY_REFERENCE_NODE = 5;
+ Node.ENTITY_NODE = 6;
+ Node.PROCESSING_INSTRUCTION_NODE = 7;
+ Node.COMMENT_NODE = 8;
+ Node.DOCUMENT_NODE = 9;
+ Node.DOCUMENT_TYPE_NODE = 10;
+ Node.DOCUMENT_FRAGMENT_NODE = 11;
+ Node.NOTATION_NODE = 12;
+}
+
+// prevent execution of more than once
+if(typeof window.pz2 == "undefined") {
+window.undefined = window.undefined;
+
+var pz2 = function ( paramArray )
+{
+
+ // at least one callback required
+ if ( !paramArray )
+ throw new Error("Pz2.js: Array with parameters has to be supplied.");
+
+ //supported pazpar2's protocol version
+ this.suppProtoVer = '1';
+ if (typeof paramArray.pazpar2path != "undefined")
+ this.pz2String = paramArray.pazpar2path;
+ else
+ this.pz2String = "/pazpar2/search.pz2";
+ this.useSessions = true;
+
+ this.stylesheet = paramArray.detailstylesheet || null;
+ //load stylesheet if required in async mode
+ if( this.stylesheet ) {
+ var context = this;
+ var request = new pzHttpRequest( this.stylesheet );
+ request.get( {}, function ( doc ) { context.xslDoc = doc; } );
+ }
+
+ this.errorHandler = paramArray.errorhandler || null;
+ this.showResponseType = paramArray.showResponseType || "xml";
+
+ // function callbacks
+ this.initCallback = paramArray.oninit || null;
+ this.statCallback = paramArray.onstat || null;
+ this.showCallback = paramArray.onshow || null;
+ this.termlistCallback = paramArray.onterm || null;
+ this.recordCallback = paramArray.onrecord || null;
+ this.bytargetCallback = paramArray.onbytarget || null;
+ this.resetCallback = paramArray.onreset || null;
+
+ // termlist keys
+ this.termKeys = paramArray.termlist || "subject";
+
+ // some configurational stuff
+ this.keepAlive = 50000;
+
+ if ( paramArray.keepAlive < this.keepAlive )
+ this.keepAlive = paramArray.keepAlive;
+
+ this.sessionID = paramArray.sessionId || null;
+ this.serviceId = paramArray.serviceId || null;
+ this.initStatusOK = false;
+ this.pingStatusOK = false;
+ this.searchStatusOK = false;
+
+ // for sorting
+ this.currentSort = "relevance";
+
+ // where are we?
+ this.currentStart = 0;
+ // currentNum can be overwritten in show
+ this.currentNum = 20;
+
+ // last full record retrieved
+ this.currRecID = null;
+
+ // current query
+ this.currQuery = null;
+
+ //current raw record offset
+ this.currRecOffset = null;
+
+ //timers
+ this.pingTimer = null;
+ this.statTime = paramArray.stattime || 1000;
+ this.statTimer = null;
+ this.termTime = paramArray.termtime || 1000;
+ this.termTimer = null;
+ this.showTime = paramArray.showtime || 1000;
+ this.showTimer = null;
+ this.showFastCount = 4;
+ this.bytargetTime = paramArray.bytargettime || 1000;
+ this.bytargetTimer = null;
+ this.recordTime = paramArray.recordtime || 500;
+ this.recordTimer = null;
+
+ // counters for each command and applied delay
+ this.dumpFactor = 500;
+ this.showCounter = 0;
+ this.termCounter = 0;
+ this.statCounter = 0;
+ this.bytargetCounter = 0;
+ this.recordCounter = 0;
+
+ // active clients, updated by stat and show
+ // might be an issue since bytarget will poll accordingly
+ this.activeClients = 1;
+
+ // if in proxy mode no need to init
+ if (paramArray.usesessions != undefined) {
+ this.useSessions = paramArray.usesessions;
+ this.initStatusOK = true;
+ }
+ // else, auto init session or wait for a user init?
+ if (this.useSessions && paramArray.autoInit !== false) {
+ this.init(this.sessionID, this.serviceId);
+ }
+ // Version parameter
+ this.version = paramArray.version || null;
+};
+
+pz2.prototype =
+{
+ //error handler for async error throws
+ throwError: function (errMsg, errCode)
+ {
+ var err = new Error(errMsg);
+ if (errCode) err.code = errCode;
+
+ if (this.errorHandler) {
+ this.errorHandler(err);
+ }
+ else {
+ throw err;
+ }
+ },
+
+ // stop activity by clearing tiemouts
+ stop: function ()
+ {
+ clearTimeout(this.statTimer);
+ clearTimeout(this.showTimer);
+ clearTimeout(this.termTimer);
+ clearTimeout(this.bytargetTimer);
+ },
+
+ // reset status variables
+ reset: function ()
+ {
+ if ( this.useSessions ) {
+ this.sessionID = null;
+ this.initStatusOK = false;
+ this.pingStatusOK = false;
+ clearTimeout(this.pingTimer);
+ }
+ this.searchStatusOK = false;
+ this.stop();
+
+ if ( this.resetCallback )
+ this.resetCallback();
+ },
+
+ init: function (sessionId, serviceId)
+ {
+ this.reset();
+
+ // session id as a param
+ if (sessionId && this.useSessions ) {
+ this.initStatusOK = true;
+ this.sessionID = sessionId;
+ this.ping();
+ // old school direct pazpar2 init
+ } else if (this.useSessions) {
+ var context = this;
+ var request = new pzHttpRequest(this.pz2String, this.errorHandler);
+ var opts = {'command' : 'init'};
+ if (serviceId) opts.service = serviceId;
+ request.safeGet(
+ opts,
+ function(data) {
+ if ( data.getElementsByTagName("status")[0]
+ .childNodes[0].nodeValue == "OK" ) {
+ if ( data.getElementsByTagName("protocol")[0]
+ .childNodes[0].nodeValue
+ != context.suppProtoVer )
+ throw new Error(
+ "Server's protocol not supported by the client"
+ );
+ context.initStatusOK = true;
+ context.sessionID =
+ data.getElementsByTagName("session")[0]
+ .childNodes[0].nodeValue;
+ if (data.getElementsByTagName("keepAlive").length > 0) {
+ context.keepAlive = data.getElementsByTagName("keepAlive")[0].childNodes[0].nodeValue;
+ }
+ context.pingTimer =
+ setTimeout(
+ function () {
+ context.ping();
+ },
+ context.keepAlive
+ );
+ if ( context.initCallback )
+ context.initCallback();
+ }
+ else
+ context.throwError('Init failed. Malformed WS resonse.',
+ 110);
+ }
+ );
+ // when through proxy no need to init
+ } else {
+ this.initStatusOK = true;
+ }
+ },
+ // no need to ping explicitly
+ ping: function ()
+ {
+ // pinging only makes sense when using pazpar2 directly
+ if( !this.initStatusOK || !this.useSessions )
+ throw new Error(
+ 'Pz2.js: Ping not allowed (proxy mode) or session not initialized.'
+ );
+ var context = this;
+
+ clearTimeout(context.pingTimer);
+
+ var request = new pzHttpRequest(this.pz2String, this.errorHandler);
+ request.safeGet(
+ { "command": "ping", "session": this.sessionID, "windowid" : window.name },
+ function(data) {
+ if ( data.getElementsByTagName("status")[0]
+ .childNodes[0].nodeValue == "OK" ) {
+ context.pingStatusOK = true;
+ context.pingTimer =
+ setTimeout(
+ function () {
+ context.ping();
+ },
+ context.keepAlive
+ );
+ }
+ else
+ context.throwError('Ping failed. Malformed WS resonse.',
+ 111);
+ }
+ );
+ },
+ search: function (query, num, sort, filter, showfrom, addParamsArr)
+ {
+ clearTimeout(this.statTimer);
+ clearTimeout(this.showTimer);
+ clearTimeout(this.termTimer);
+ clearTimeout(this.bytargetTimer);
+
+ this.showCounter = 0;
+ this.termCounter = 0;
+ this.bytargetCounter = 0;
+ this.statCounter = 0;
+ this.activeClients = 1;
+
+ // no proxy mode
+ if( !this.initStatusOK )
+ throw new Error('Pz2.js: session not initialized.');
+
+ if( query !== undefined )
+ this.currQuery = query;
+ else
+ throw new Error("Pz2.js: no query supplied to the search command.");
+
+ if ( showfrom !== undefined )
+ var start = showfrom;
+ else
+ var start = 0;
+
+ var searchParams = {
+ "command": "search",
+ "query": this.currQuery,
+ "session": this.sessionID,
+ "windowid" : window.name
+ };
+
+ if( sort !== undefined ) {
+ this.currentSort = sort;
+ searchParams["sort"] = sort;
+ }
+ if (filter !== undefined)
+ searchParams["filter"] = filter;
+
+ // copy additional parmeters, do not overwrite
+ if (addParamsArr != undefined) {
+ for (var prop in addParamsArr) {
+ if (!searchParams.hasOwnProperty(prop))
+ searchParams[prop] = addParamsArr[prop];
+ }
+ }
+
+ var context = this;
+ var request = new pzHttpRequest(this.pz2String, this.errorHandler);
+ request.safeGet(
+ searchParams,
+ function(data) {
+ if ( data.getElementsByTagName("status")[0]
+ .childNodes[0].nodeValue == "OK" ) {
+ context.searchStatusOK = true;
+ //piggyback search
+ context.show(start, num, sort);
+ if (context.statCallback)
+ context.stat();
+ if (context.termlistCallback)
+ context.termlist();
+ if (context.bytargetCallback)
+ context.bytarget();
+ }
+ else
+ context.throwError('Search failed. Malformed WS resonse.',
+ 112);
+ }
+ );
+ },
+ stat: function()
+ {
+ if( !this.initStatusOK )
+ throw new Error('Pz2.js: session not initialized.');
+
+ // if called explicitly takes precedence
+ clearTimeout(this.statTimer);
+
+ var context = this;
+ var request = new pzHttpRequest(this.pz2String, this.errorHandler);
+ request.safeGet(
+ { "command": "stat", "session": this.sessionID, "windowid" : window.name },
+ function(data) {
+ if ( data.getElementsByTagName("stat") ) {
+ var activeClients =
+ Number( data.getElementsByTagName("activeclients")[0]
+ .childNodes[0].nodeValue );
+ context.activeClients = activeClients;
+
+ var stat = Element_parseChildNodes(data.documentElement);
+
+ context.statCounter++;
+ var delay = context.statTime
+ + context.statCounter * context.dumpFactor;
+
+ if ( activeClients > 0 )
+ context.statTimer =
+ setTimeout(
+ function () {
+ context.stat();
+ },
+ delay
+ );
+ context.statCallback(stat);
+ }
+ else
+ context.throwError('Stat failed. Malformed WS resonse.',
+ 113);
+ }
+ );
+ },
+ show: function(start, num, sort, query_state)
+ {
+ if( !this.searchStatusOK && this.useSessions )
+ throw new Error(
+ 'Pz2.js: show command has to be preceded with a search command.'
+ );
+
+ // if called explicitly takes precedence
+ clearTimeout(this.showTimer);
+
+ if( sort !== undefined )
+ this.currentSort = sort;
+ if( start !== undefined )
+ this.currentStart = Number( start );
+ if( num !== undefined )
+ this.currentNum = Number( num );
+
+ var context = this;
+ var request = new pzHttpRequest(this.pz2String, this.errorHandler);
+ var requestParameters =
+ {
+ "command": "show",
+ "session": this.sessionID,
+ "start": this.currentStart,
+ "num": this.currentNum,
+ "sort": this.currentSort,
+ "block": 1,
+ "type": this.showResponseType,
+ "windowid" : window.name
+ };
+ if (query_state)
+ requestParameters["query-state"] = query_state;
+ if (this.version && this.version > 0)
+ requestParameters["version"] = this.version;
+ request.safeGet(
+ requestParameters,
+ function(data, type) {
+ var show = null;
+ var activeClients = 0;
+ if (type === "json") {
+ show = {};
+ activeClients = Number(data.activeclients[0]);
+ show.activeclients = activeClients;
+ show.merged = Number(data.merged[0]);
+ show.total = Number(data.total[0]);
+ show.start = Number(data.start[0]);
+ show.num = Number(data.num[0]);
+ show.hits = data.hit;
+ } else if (data.getElementsByTagName("status")[0]
+ .childNodes[0].nodeValue == "OK") {
+ // first parse the status data send along with records
+ // this is strictly bound to the format
+ activeClients =
+ Number(data.getElementsByTagName("activeclients")[0]
+ .childNodes[0].nodeValue);
+ show = {
+ "activeclients": activeClients,
+ "merged":
+ Number( data.getElementsByTagName("merged")[0]
+ .childNodes[0].nodeValue ),
+ "total":
+ Number( data.getElementsByTagName("total")[0]
+ .childNodes[0].nodeValue ),
+ "start":
+ Number( data.getElementsByTagName("start")[0]
+ .childNodes[0].nodeValue ),
+ "num":
+ Number( data.getElementsByTagName("num")[0]
+ .childNodes[0].nodeValue ),
+ "hits": []
+ };
+ // parse all the first-level nodes for all
tags
+ var hits = data.getElementsByTagName("hit");
+ for (i = 0; i < hits.length; i++)
+ show.hits[i] = Element_parseChildNodes(hits[i]);
+ } else {
+ context.throwError('Show failed. Malformed WS resonse.',
+ 114);
+ };
+
+ var approxNode = data.getElementsByTagName("approximation");
+ if (approxNode && approxNode[0] && approxNode[0].childNodes[0] && approxNode[0].childNodes[0].nodeValue)
+ show['approximation'] =
+ Number( approxNode[0].childNodes[0].nodeValue);
+
+
+ data.getElementsByTagName("")
+ context.activeClients = activeClients;
+ context.showCounter++;
+ var delay = context.showTime;
+ if (context.showCounter > context.showFastCount)
+ delay += context.showCounter * context.dumpFactor;
+ if ( activeClients > 0 )
+ context.showTimer = setTimeout(
+ function () {
+ context.show();
+ },
+ delay);
+ context.showCallback(show);
+ }
+ );
+ },
+ record: function(id, offset, syntax, handler)
+ {
+ // we may call record with no previous search if in proxy mode
+ if(!this.searchStatusOK && this.useSessions)
+ throw new Error(
+ 'Pz2.js: record command has to be preceded with a search command.'
+ );
+
+ if( id !== undefined )
+ this.currRecID = id;
+
+ var recordParams = {
+ "command": "record",
+ "session": this.sessionID,
+ "id": this.currRecID,
+ "windowid" : window.name
+ };
+
+ this.currRecOffset = null;
+ if (offset != undefined) {
+ recordParams["offset"] = offset;
+ this.currRecOffset = offset;
+ }
+
+ if (syntax != undefined)
+ recordParams['syntax'] = syntax;
+
+ //overwrite default callback id needed
+ var callback = this.recordCallback;
+ var args = undefined;
+ if (handler != undefined) {
+ callback = handler['callback'];
+ args = handler['args'];
+ }
+
+ var context = this;
+ var request = new pzHttpRequest(this.pz2String, this.errorHandler);
+
+ request.safeGet(
+ recordParams,
+ function(data) {
+ var recordNode;
+ var record;
+ //raw record
+ if (context.currRecOffset !== null) {
+ record = new Array();
+ record['xmlDoc'] = data;
+ record['offset'] = context.currRecOffset;
+ callback(record, args);
+ //pz2 record
+ } else if ( recordNode =
+ data.getElementsByTagName("record")[0] ) {
+ // if stylesheet was fetched do not parse the response
+ if ( context.xslDoc ) {
+ record = new Array();
+ record['xmlDoc'] = data;
+ record['xslDoc'] = context.xslDoc;
+ record['recid'] =
+ recordNode.getElementsByTagName("recid")[0]
+ .firstChild.nodeValue;
+ //parse record
+ } else {
+ record = Element_parseChildNodes(recordNode);
+ }
+ var activeClients =
+ Number( data.getElementsByTagName("activeclients")[0]
+ .childNodes[0].nodeValue );
+ context.activeClients = activeClients;
+ context.recordCounter++;
+ var delay = context.recordTime + context.recordCounter * context.dumpFactor;
+ if ( activeClients > 0 )
+ context.recordTimer =
+ setTimeout (
+ function() {
+ context.record(id, offset, syntax, handler);
+ },
+ delay
+ );
+ callback(record, args);
+ }
+ else
+ context.throwError('Record failed. Malformed WS resonse.',
+ 115);
+ }
+ );
+ },
+
+ termlist: function()
+ {
+ if( !this.searchStatusOK && this.useSessions )
+ throw new Error(
+ 'Pz2.js: termlist command has to be preceded with a search command.'
+ );
+
+ // if called explicitly takes precedence
+ clearTimeout(this.termTimer);
+
+ var context = this;
+ var request = new pzHttpRequest(this.pz2String, this.errorHandler);
+ request.safeGet(
+ {
+ "command": "termlist",
+ "session": this.sessionID,
+ "name": this.termKeys,
+ "windowid" : window.name,
+ "version" : this.version
+
+ },
+ function(data) {
+ if ( data.getElementsByTagName("termlist") ) {
+ var activeClients =
+ Number( data.getElementsByTagName("activeclients")[0]
+ .childNodes[0].nodeValue );
+ context.activeClients = activeClients;
+ var termList = { "activeclients": activeClients };
+ var termLists = data.getElementsByTagName("list");
+ //for each termlist
+ for (i = 0; i < termLists.length; i++) {
+ var listName = termLists[i].getAttribute('name');
+ termList[listName] = new Array();
+ var terms = termLists[i].getElementsByTagName('term');
+ //for each term in the list
+ for (j = 0; j < terms.length; j++) {
+ var term = {
+ "name":
+ (terms[j].getElementsByTagName("name")[0]
+ .childNodes.length
+ ? terms[j].getElementsByTagName("name")[0]
+ .childNodes[0].nodeValue
+ : 'ERROR'),
+ "freq":
+ terms[j]
+ .getElementsByTagName("frequency")[0]
+ .childNodes[0].nodeValue || 'ERROR'
+ };
+
+ // Only for xtargets: id, records, filtered
+ var termIdNode =
+ terms[j].getElementsByTagName("id");
+ if(terms[j].getElementsByTagName("id").length)
+ term["id"] =
+ termIdNode[0].childNodes[0].nodeValue;
+ termList[listName][j] = term;
+
+ var recordsNode = terms[j].getElementsByTagName("records");
+ if (recordsNode && recordsNode.length)
+ term["records"] = recordsNode[0].childNodes[0].nodeValue;
+
+ var filteredNode = terms[j].getElementsByTagName("filtered");
+ if (filteredNode && filteredNode.length)
+ term["filtered"] = filteredNode[0].childNodes[0].nodeValue;
+
+ }
+ }
+
+ context.termCounter++;
+ var delay = context.termTime
+ + context.termCounter * context.dumpFactor;
+ if ( activeClients > 0 )
+ context.termTimer =
+ setTimeout(
+ function () {
+ context.termlist();
+ },
+ delay
+ );
+
+ context.termlistCallback(termList);
+ }
+ else
+ context.throwError('Termlist failed. Malformed WS resonse.',
+ 116);
+ }
+ );
+
+ },
+ bytarget: function()
+ {
+ if( !this.initStatusOK && this.useSessions )
+ throw new Error(
+ 'Pz2.js: bytarget command has to be preceded with a search command.'
+ );
+
+ // no need to continue
+ if( !this.searchStatusOK )
+ return;
+
+ // if called explicitly takes precedence
+ clearTimeout(this.bytargetTimer);
+
+ var context = this;
+ var request = new pzHttpRequest(this.pz2String, this.errorHandler);
+ request.safeGet(
+ {
+ "command": "bytarget",
+ "session": this.sessionID,
+ "block": 1,
+ "windowid" : window.name,
+ "version" : this.version
+ },
+ function(data) {
+ if ( data.getElementsByTagName("status")[0]
+ .childNodes[0].nodeValue == "OK" ) {
+ var targetNodes = data.getElementsByTagName("target");
+ var bytarget = new Array();
+ for ( i = 0; i < targetNodes.length; i++) {
+ bytarget[i] = new Array();
+ for( j = 0; j < targetNodes[i].childNodes.length; j++ ) {
+ if ( targetNodes[i].childNodes[j].nodeType
+ == Node.ELEMENT_NODE ) {
+ var nodeName =
+ targetNodes[i].childNodes[j].nodeName;
+ if (targetNodes[i].childNodes[j].firstChild != null)
+ {
+ var nodeText = targetNodes[i].childNodes[j]
+ .firstChild.nodeValue;
+ bytarget[i][nodeName] = nodeText;
+ }
+ else {
+ bytarget[i][nodeName] = "";
+ }
+
+
+ }
+ }
+ if (bytarget[i]["state"]=="Client_Disconnected") {
+ bytarget[i]["hits"] = "Error";
+ } else if (bytarget[i]["state"]=="Client_Error") {
+ bytarget[i]["hits"] = "Error";
+ } else if (bytarget[i]["state"]=="Client_Working") {
+ bytarget[i]["hits"] = "...";
+ }
+ if (bytarget[i].diagnostic == "1") {
+ bytarget[i].diagnostic = "Permanent system error";
+ } else if (bytarget[i].diagnostic == "2") {
+ bytarget[i].diagnostic = "Temporary system error";
+ }
+ var targetsSuggestions = targetNodes[i].getElementsByTagName("suggestions");
+ if (targetsSuggestions != undefined && targetsSuggestions.length>0) {
+ var suggestions = targetsSuggestions[0];
+ bytarget[i]["suggestions"] = Element_parseChildNodes(suggestions);
+ }
+ }
+
+ context.bytargetCounter++;
+ var delay = context.bytargetTime
+ + context.bytargetCounter * context.dumpFactor;
+ if ( context.activeClients > 0 )
+ context.bytargetTimer =
+ setTimeout(
+ function () {
+ context.bytarget();
+ },
+ delay
+ );
+
+ context.bytargetCallback(bytarget);
+ }
+ else
+ context.throwError('Bytarget failed. Malformed WS resonse.',
+ 117);
+ }
+ );
+ },
+
+ // just for testing, probably shouldn't be here
+ showNext: function(page)
+ {
+ var step = page || 1;
+ this.show( ( step * this.currentNum ) + this.currentStart );
+ },
+
+ showPrev: function(page)
+ {
+ if (this.currentStart == 0 )
+ return false;
+ var step = page || 1;
+ var newStart = this.currentStart - (step * this.currentNum );
+ this.show( newStart > 0 ? newStart : 0 );
+ },
+
+ showPage: function(pageNum)
+ {
+ //var page = pageNum || 1;
+ this.show(pageNum * this.currentNum);
+ }
+};
+
+/*
+********************************************************************************
+** AJAX HELPER CLASS ***********************************************************
+********************************************************************************
+*/
+var pzHttpRequest = function ( url, errorHandler ) {
+ this.maxUrlLength = 2048;
+ this.request = null;
+ this.url = url;
+ this.errorHandler = errorHandler || null;
+ this.async = true;
+ this.requestHeaders = {};
+
+ if ( window.XMLHttpRequest ) {
+ this.request = new XMLHttpRequest();
+ } else if ( window.ActiveXObject ) {
+ try {
+ this.request = new ActiveXObject( 'Msxml2.XMLHTTP' );
+ } catch (err) {
+ this.request = new ActiveXObject( 'Microsoft.XMLHTTP' );
+ }
+ }
+};
+
+
+pzHttpRequest.prototype =
+{
+ safeGet: function ( params, callback )
+ {
+ var encodedParams = this.encodeParams(params);
+ var url = this._urlAppendParams(encodedParams);
+ if (url.length >= this.maxUrlLength) {
+ this.requestHeaders["Content-Type"]
+ = "application/x-www-form-urlencoded";
+ this._send( 'POST', this.url, encodedParams, callback );
+ } else {
+ this._send( 'GET', url, '', callback );
+ }
+ },
+
+ get: function ( params, callback )
+ {
+ this._send( 'GET', this._urlAppendParams(this.encodeParams(params)),
+ '', callback );
+ },
+
+ post: function ( params, data, callback )
+ {
+ this._send( 'POST', this._urlAppendParams(this.encodeParams(params)),
+ data, callback );
+ },
+
+ load: function ()
+ {
+ this.async = false;
+ this.request.open( 'GET', this.url, this.async );
+ this.request.send('');
+ if ( this.request.status == 200 )
+ return this.request.responseXML;
+ },
+
+ encodeParams: function (params)
+ {
+ var sep = "";
+ var encoded = "";
+ for (var key in params) {
+ if (params[key] != null) {
+ encoded += sep + key + '=' + encodeURIComponent(params[key]);
+ sep = '&';
+ }
+ }
+ return encoded;
+ },
+
+ _send: function ( type, url, data, callback)
+ {
+ var context = this;
+ this.callback = callback;
+ this.async = true;
+ this.request.open( type, url, this.async );
+ for (var key in this.requestHeaders)
+ this.request.setRequestHeader(key, this.requestHeaders[key]);
+ this.request.onreadystatechange = function () {
+ context._handleResponse(url); /// url used ONLY for error reporting
+ }
+ this.request.send(data);
+ },
+
+ _urlAppendParams: function (encodedParams)
+ {
+ if (encodedParams)
+ return this.url + "?" + encodedParams;
+ else
+ return this.url;
+ },
+
+ _handleResponse: function (savedUrlForErrorReporting)
+ {
+ if ( this.request.readyState == 4 ) {
+ // pick up appplication errors first
+ var errNode = null;
+ if (this.request.responseXML &&
+ (errNode = this.request.responseXML.documentElement)
+ && errNode.nodeName == 'error') {
+ var errMsg = errNode.getAttribute("msg");
+ var errCode = errNode.getAttribute("code");
+ var errAddInfo = '';
+ if (errNode.childNodes.length)
+ errAddInfo = ': ' + errNode.childNodes[0].nodeValue;
+
+ var err = new Error(errMsg + errAddInfo);
+ err.code = errCode;
+
+ if (this.errorHandler) {
+ this.errorHandler(err);
+ }
+ else {
+ throw err;
+ }
+ } else if (this.request.status == 200 &&
+ this.request.responseXML == null) {
+ if (this.request.responseText != null) {
+ //assume JSON
+
+ var json = null;
+ var text = this.request.responseText;
+ if (typeof window.JSON == "undefined")
+ json = eval("(" + text + ")");
+ else {
+ try {
+ json = JSON.parse(text);
+ }
+ catch (e) {
+ // Safari: eval will fail as well. Considering trying JSON2 (non-native implementation) instead
+ /* DEBUG only works in mk2-mobile
+ if (document.getElementById("log"))
+ document.getElementById("log").innerHTML = "" + e + " " + length + ": " + text;
+ */
+ try {
+ json = eval("(" + text + ")");
+ }
+ catch (e) {
+ /* DEBUG only works in mk2-mobile
+ if (document.getElementById("log"))
+ document.getElementById("log").innerHTML = "" + e + " " + length + ": " + text;
+ */
+ }
+ }
+ }
+ this.callback(json, "json");
+ } else {
+ var err = new Error("XML response is empty but no error " +
+ "for " + savedUrlForErrorReporting);
+ err.code = -1;
+ if (this.errorHandler) {
+ this.errorHandler(err);
+ } else {
+ throw err;
+ }
+ }
+ } else if (this.request.status == 200) {
+ this.callback(this.request.responseXML);
+ } else {
+ var err = new Error("HTTP response not OK: "
+ + this.request.status + " - "
+ + this.request.statusText );
+ err.code = '00' + this.request.status;
+ if (this.errorHandler) {
+ this.errorHandler(err);
+ }
+ else {
+ throw err;
+ }
+ }
+ }
+ }
+};
+
+/*
+********************************************************************************
+** XML HELPER FUNCTIONS ********************************************************
+********************************************************************************
+*/
+
+// DOMDocument
+
+if ( window.ActiveXObject) {
+ var DOMDoc = document;
+} else {
+ var DOMDoc = Document.prototype;
+}
+
+DOMDoc.newXmlDoc = function ( root )
+{
+ var doc;
+
+ if (document.implementation && document.implementation.createDocument) {
+ doc = document.implementation.createDocument('', root, null);
+ } else if ( window.ActiveXObject ) {
+ doc = new ActiveXObject("MSXML2.DOMDocument");
+ doc.loadXML('<' + root + '/>');
+ } else {
+ throw new Error ('No XML support in this browser');
+ }
+
+ return doc;
+}
+
+
+DOMDoc.parseXmlFromString = function ( xmlString )
+{
+ var doc;
+
+ if ( window.DOMParser ) {
+ var parser = new DOMParser();
+ doc = parser.parseFromString( xmlString, "text/xml");
+ } else if ( window.ActiveXObject ) {
+ doc = new ActiveXObject("MSXML2.DOMDocument");
+ doc.loadXML( xmlString );
+ } else {
+ throw new Error ("No XML parsing support in this browser.");
+ }
+
+ return doc;
+}
+
+DOMDoc.transformToDoc = function (xmlDoc, xslDoc)
+{
+ if ( window.XSLTProcessor ) {
+ var proc = new XSLTProcessor();
+ proc.importStylesheet( xslDoc );
+ return proc.transformToDocument(xmlDoc);
+ } else if ( window.ActiveXObject ) {
+ return document.parseXmlFromString(xmlDoc.transformNode(xslDoc));
+ } else {
+ alert( 'Unable to perform XSLT transformation in this browser' );
+ }
+}
+
+// DOMElement
+
+Element_removeFromDoc = function (DOM_Element)
+{
+ DOM_Element.parentNode.removeChild(DOM_Element);
+}
+
+Element_emptyChildren = function (DOM_Element)
+{
+ while( DOM_Element.firstChild ) {
+ DOM_Element.removeChild( DOM_Element.firstChild )
+ }
+}
+
+Element_appendTransformResult = function ( DOM_Element, xmlDoc, xslDoc )
+{
+ if ( window.XSLTProcessor ) {
+ var proc = new XSLTProcessor();
+ proc.importStylesheet( xslDoc );
+ var docFrag = false;
+ docFrag = proc.transformToFragment( xmlDoc, DOM_Element.ownerDocument );
+ DOM_Element.appendChild(docFrag);
+ } else if ( window.ActiveXObject ) {
+ DOM_Element.innerHTML = xmlDoc.transformNode( xslDoc );
+ } else {
+ alert( 'Unable to perform XSLT transformation in this browser' );
+ }
+}
+
+Element_appendTextNode = function (DOM_Element, tagName, textContent )
+{
+ var node = DOM_Element.ownerDocument.createElement(tagName);
+ var text = DOM_Element.ownerDocument.createTextNode(textContent);
+
+ DOM_Element.appendChild(node);
+ node.appendChild(text);
+
+ return node;
+}
+
+Element_setTextContent = function ( DOM_Element, textContent )
+{
+ if (typeof DOM_Element.textContent !== "undefined") {
+ DOM_Element.textContent = textContent;
+ } else if (typeof DOM_Element.innerText !== "undefined" ) {
+ DOM_Element.innerText = textContent;
+ } else {
+ throw new Error("Cannot set text content of the node, no such method.");
+ }
+}
+
+Element_getTextContent = function (DOM_Element)
+{
+ if ( typeof DOM_Element.textContent != 'undefined' ) {
+ return DOM_Element.textContent;
+ } else if (typeof DOM_Element.text != 'undefined') {
+ return DOM_Element.text;
+ } else {
+ throw new Error("Cannot get text content of the node, no such method.");
+ }
+}
+
+Element_parseChildNodes = function (node)
+{
+ var parsed = {};
+ var hasChildElems = false;
+ var textContent = '';
+
+ if (node.hasChildNodes()) {
+ var children = node.childNodes;
+ for (var i = 0; i < children.length; i++) {
+ var child = children[i];
+ switch (child.nodeType) {
+ case Node.ELEMENT_NODE:
+ hasChildElems = true;
+ var nodeName = child.nodeName;
+ if (!(nodeName in parsed))
+ parsed[nodeName] = [];
+ parsed[nodeName].push(Element_parseChildNodes(child));
+ break;
+ case Node.TEXT_NODE:
+ textContent += child.nodeValue;
+ break;
+ case Node.CDATA_SECTION_NODE:
+ textContent += child.nodeValue;
+ break;
+ }
+ }
+ }
+
+ var attrs = node.attributes;
+ for (var i = 0; i < attrs.length; i++) {
+ hasChildElems = true;
+ var attrName = '@' + attrs[i].nodeName;
+ var attrValue = attrs[i].nodeValue;
+ parsed[attrName] = attrValue;
+ }
+
+ // if no nested elements/attrs set value to text
+ if (hasChildElems)
+ parsed['#text'] = textContent;
+ else
+ parsed = textContent;
+
+ return parsed;
+}
+
+/* do not remove trailing bracket */
+}
--- a/koha-tmpl/opac-tmpl/prog/en/css/opac.css
+++ a/koha-tmpl/opac-tmpl/prog/en/css/opac.css
@@ -1690,6 +1690,10 @@ strong em, em strong {
vertical-align: top;
width: 10px;
}
+.sourcecol {
+ vertical-align: top;
+ width: 100px;
+}
#container {
color : #000;
}
@@ -3017,6 +3021,16 @@ float:left;
padding: 0.1em 0;
}
+.notesrow label {
+ font-weight: bold;
+}
+.notesrow span {
+ display: block;
+}
+.notesrow textarea {
+ width: 100%;
+}
+
.thumbnail-shelfbrowser span {
margin: 0px auto;
}
@@ -3041,7 +3055,7 @@ padding: 0.1em 0;
background: #EEEEEE none;
}
-#overdrive-results {
+#overdrive-results, #pazpar2-results {
font-weight: bold;
padding-left: 1em;
}
@@ -3085,3 +3099,14 @@ padding: 0.1em 0;
width: 35%;
font-size: 111%;
}
+
+.thumbnail-shelfbrowser span {
+ margin: 0px auto;
+}
+
+#modal-overlay {
+ background-color: white;
+ border-radius: 5px;
+ max-width: 75%;
+ padding: 15px;
+}
--- a/koha-tmpl/opac-tmpl/prog/en/js/externalsearch.js
+++ a/koha-tmpl/opac-tmpl/prog/en/js/externalsearch.js
@@ -0,0 +1,106 @@
+if ( typeof KOHA == "undefined" || !KOHA ) {
+ var KOHA = {};
+}
+
+KOHA.XSLTGet = ( function() {
+ // Horrible browser hack, but required due to the following hard-to-detect and long-unfixed bug:
+ // https://bugs.webkit.org/show_bug.cgi?id=60276
+ var isChrome = /Chrome/.test(navigator.userAgent) && /Google Inc/.test(navigator.vendor);
+ var isSafari = /Safari/.test(navigator.userAgent) && /Apple Computer/.test(navigator.vendor);
+
+ if ( !isChrome && !isSafari ) return $.get;
+
+ return function( url ) {
+ var result = new jQuery.Deferred();
+ var basepath = url.match( /(.*\/)*/ )[0];
+
+ $.get( url ).done( function( xslDoc ) {
+ var xslImports = xslDoc.getElementsByTagNameNS( 'http://www.w3.org/1999/XSL/Transform', 'import' );
+ var importsRemaining = xslImports.length;
+
+ if ( importsRemaining == 0 ) {
+ result.resolve( xslDoc );
+ return;
+ }
+
+ $.each( xslImports, function( i, importElem ) {
+ var path = $( importElem ).attr( 'href' );
+ if ( !/^(\/|https?:)/.test( path ) ) path = basepath + path;
+
+ KOHA.XSLTGet( path ).done( function( subDoc ) {
+ importsRemaining--;
+ $( importElem ).replaceWith( subDoc.documentElement.childNodes );
+
+ if ( importsRemaining == 0 ) result.resolve( xslDoc );
+ } ).fail( function() {
+ importsRemaining = -1;
+
+ result.reject();
+ } );
+ } );
+ } ).fail( function() {
+ result.reject();
+ } );
+
+ return result;
+ };
+} )();
+
+KOHA.TransformToFragment = function( xmlDoc, xslDoc ) {
+ if ( window.XSLTProcessor ) {
+ var proc = new XSLTProcessor();
+ proc.importStylesheet( xslDoc );
+ proc.setParameter( null, 'showAvailability', false );
+ return (new XMLSerializer).serializeToString( proc.transformToFragment( xmlDoc, document ) );
+ } else if ( window.ActiveXObject ) {
+ var xslt = new ActiveXObject( "Msxml2.XSLTemplate" );
+ xslt.stylesheet = xslDoc;
+ var xslProc = xslt.createProcessor();
+ xslProc.input = xmlDoc;
+ xslProc.addParameter( 'showAvailability', false );
+ xslProc.transform();
+ return xslProc.output;
+ }
+};
+
+KOHA.ExternalSearch = ( function() {
+ return {
+ targets: {},
+ Search: function( q, limit, callback ) {
+ var targetIDs = [];
+ var includedTargets = [];
+
+ $.each( KOHA.ExternalSearch.targets, function ( url, info ) {
+ if ( !info.disabled ) {
+ includedTargets.push( url );
+ targetIDs.push( info.id );
+ }
+ } );
+
+ if ( KOHA.ExternalSearch._pz !== undefined ) {
+ afterinit( KOHA.ExternalSearch._pz );
+ } else {
+ $.get( '/cgi-bin/koha/svc/pazpar2_init', { targets: targetIDs.join(',') }, function( data ) {
+ KOHA.ExternalSearch._pz = new pz2({
+ sessionId: data.sessionID,
+ onshow: callback,
+ errorhandler: function ( error ) { callback( { error: error } ) },
+ } );
+ afterinit( KOHA.ExternalSearch._pz );
+ } );
+ }
+
+ function afterinit( pz ) {
+ pz.search( q, limit, 'relevance:0', 'pz:id=' + includedTargets.join( '|' ) );
+ }
+ },
+ Fetch: function( offset, callback ) {
+ var pz = KOHA.ExternalSearch._pz;
+ pz.showCallback = callback;
+ pz.show( offset );
+ },
+ GetDetailedRecord: function( recid, callback ) {
+ KOHA.ExternalSearch._pz.record( recid, 0, undefined, { callback: callback } );
+ },
+ };
+} )();
--- a/koha-tmpl/opac-tmpl/prog/en/lib/jquery/plugins/jquery.lightbox_me.js
+++ a/koha-tmpl/opac-tmpl/prog/en/lib/jquery/plugins/jquery.lightbox_me.js
@@ -0,0 +1,254 @@
+/*
+* $ lightbox_me
+* By: Buck Wilson
+* Version : 2.3
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+
+(function($) {
+
+ $.fn.lightbox_me = function(options) {
+
+ return this.each(function() {
+
+ var
+ opts = $.extend({}, $.fn.lightbox_me.defaults, options),
+ $overlay = $(),
+ $self = $(this),
+ $iframe = $(''),
+ ie6 = ($.browser.msie && $.browser.version < 7);
+
+ if (opts.showOverlay) {
+ //check if there's an existing overlay, if so, make subequent ones clear
+ var $currentOverlays = $(".js_lb_overlay:visible");
+ if ($currentOverlays.length > 0){
+ $overlay = $('
');
+ } else {
+ $overlay = $('
');
+ }
+ }
+
+ /*----------------------------------------------------
+ DOM Building
+ ---------------------------------------------------- */
+ if (ie6) {
+ var src = /^https/i.test(window.location.href || '') ? 'javascript:false' : 'about:blank';
+ $iframe.attr('src', src);
+ $('body').append($iframe);
+ } // iframe shim for ie6, to hide select elements
+ $('body').append($self.hide()).append($overlay);
+
+
+ /*----------------------------------------------------
+ Overlay CSS stuffs
+ ---------------------------------------------------- */
+
+ // set css of the overlay
+ if (opts.showOverlay) {
+ setOverlayHeight(); // pulled this into a function because it is called on window resize.
+ $overlay.css({ position: 'absolute', width: '100%', top: 0, left: 0, right: 0, bottom: 0, zIndex: (opts.zIndex + 2), display: 'none' });
+ if (!$overlay.hasClass('lb_overlay_clear')){
+ $overlay.css(opts.overlayCSS);
+ }
+ }
+
+ /*----------------------------------------------------
+ Animate it in.
+ ---------------------------------------------------- */
+ //
+ if (opts.showOverlay) {
+ $overlay.fadeIn(opts.overlaySpeed, function() {
+ setSelfPosition();
+ $self[opts.appearEffect](opts.lightboxSpeed, function() { setOverlayHeight(); setSelfPosition(); opts.onLoad()});
+ });
+ } else {
+ setSelfPosition();
+ $self[opts.appearEffect](opts.lightboxSpeed, function() { opts.onLoad()});
+ }
+
+ /*----------------------------------------------------
+ Hide parent if parent specified (parentLightbox should be jquery reference to any parent lightbox)
+ ---------------------------------------------------- */
+ if (opts.parentLightbox) {
+ opts.parentLightbox.fadeOut(200);
+ }
+
+
+ /*----------------------------------------------------
+ Bind Events
+ ---------------------------------------------------- */
+
+ $(window).resize(setOverlayHeight)
+ .resize(setSelfPosition)
+ .scroll(setSelfPosition);
+
+ $(window).bind('keyup.lightbox_me', observeKeyPress);
+
+ if (opts.closeClick) {
+ $overlay.click(function(e) { closeLightbox(); e.preventDefault; });
+ }
+ $self.delegate(opts.closeSelector, "click", function(e) {
+ closeLightbox(); e.preventDefault();
+ });
+ $self.bind('close', closeLightbox);
+ $self.bind('reposition', setSelfPosition);
+
+
+
+ /*--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- */
+
+
+ /*----------------------------------------------------
+ Private Functions
+ ---------------------------------------------------- */
+
+ /* Remove or hide all elements */
+ function closeLightbox() {
+ var s = $self[0].style;
+ if (opts.destroyOnClose) {
+ $self.add($overlay).remove();
+ } else {
+ $self.add($overlay).hide();
+ }
+
+ //show the hidden parent lightbox
+ if (opts.parentLightbox) {
+ opts.parentLightbox.fadeIn(200);
+ }
+
+ $iframe.remove();
+
+ // clean up events.
+ $self.undelegate(opts.closeSelector, "click");
+
+ $(window).unbind('reposition', setOverlayHeight);
+ $(window).unbind('reposition', setSelfPosition);
+ $(window).unbind('scroll', setSelfPosition);
+ $(window).unbind('keyup.lightbox_me');
+ if (ie6)
+ s.removeExpression('top');
+ opts.onClose();
+ }
+
+
+ /* Function to bind to the window to observe the escape/enter key press */
+ function observeKeyPress(e) {
+ if((e.keyCode == 27 || (e.DOM_VK_ESCAPE == 27 && e.which==0)) && opts.closeEsc) closeLightbox();
+ }
+
+
+ /* Set the height of the overlay
+ : if the document height is taller than the window, then set the overlay height to the document height.
+ : otherwise, just set overlay height: 100%
+ */
+ function setOverlayHeight() {
+ if ($(window).height() < $(document).height()) {
+ $overlay.css({height: $(document).height() + 'px'});
+ $iframe.css({height: $(document).height() + 'px'});
+ } else {
+ $overlay.css({height: '100%'});
+ if (ie6) {
+ $('html,body').css('height','100%');
+ $iframe.css('height', '100%');
+ } // ie6 hack for height: 100%; TODO: handle this in IE7
+ }
+ }
+
+
+ /* Set the position of the modal'd window ($self)
+ : if $self is taller than the window, then make it absolutely positioned
+ : otherwise fixed
+ */
+ function setSelfPosition() {
+ var s = $self[0].style;
+
+ // reset CSS so width is re-calculated for margin-left CSS
+ $self.css({left: '50%', marginLeft: ($self.outerWidth() / 2) * -1, zIndex: (opts.zIndex + 3) });
+
+
+ /* we have to get a little fancy when dealing with height, because lightbox_me
+ is just so fancy.
+ */
+
+ // if the height of $self is bigger than the window and self isn't already position absolute
+ if (($self.height() + 80 >= $(window).height()) && ($self.css('position') != 'absolute' || ie6)) {
+
+ // we are going to make it positioned where the user can see it, but they can still scroll
+ // so the top offset is based on the user's scroll position.
+ var topOffset = $(document).scrollTop() + 40;
+ $self.css({position: 'absolute', top: topOffset + 'px', marginTop: 0})
+ if (ie6) {
+ s.removeExpression('top');
+ }
+ } else if ($self.height()+ 80 < $(window).height()) {
+ //if the height is less than the window height, then we're gonna make this thing position: fixed.
+ // in ie6 we're gonna fake it.
+ if (ie6) {
+ s.position = 'absolute';
+ if (opts.centered) {
+ s.setExpression('top', '(document.documentElement.clientHeight || document.body.clientHeight) / 2 - (this.offsetHeight / 2) + (blah = document.documentElement.scrollTop ? document.documentElement.scrollTop : document.body.scrollTop) + "px"')
+ s.marginTop = 0;
+ } else {
+ var top = (opts.modalCSS && opts.modalCSS.top) ? parseInt(opts.modalCSS.top) : 0;
+ s.setExpression('top', '((blah = document.documentElement.scrollTop ? document.documentElement.scrollTop : document.body.scrollTop) + '+top+') + "px"')
+ }
+ } else {
+ if (opts.centered) {
+ $self.css({ position: 'fixed', top: '50%', marginTop: ($self.outerHeight() / 2) * -1})
+ } else {
+ $self.css({ position: 'fixed'}).css(opts.modalCSS);
+ }
+
+ }
+ }
+ }
+
+ });
+
+
+
+ };
+
+ $.fn.lightbox_me.defaults = {
+
+ // animation
+ appearEffect: "fadeIn",
+ appearEase: "",
+ overlaySpeed: 250,
+ lightboxSpeed: 300,
+
+ // close
+ closeSelector: ".close",
+ closeClick: true,
+ closeEsc: true,
+
+ // behavior
+ destroyOnClose: false,
+ showOverlay: true,
+ parentLightbox: false,
+
+ // callbacks
+ onLoad: function() {},
+ onClose: function() {},
+
+ // style
+ classPrefix: 'lb',
+ zIndex: 999,
+ centered: false,
+ modalCSS: {top: '40px'},
+ overlayCSS: {background: 'black', opacity: .3}
+ }
+})(jQuery);
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-external-search.tt
+++ a/koha-tmpl/opac-tmpl/prog/en/modules/opac-external-search.tt
@@ -0,0 +1,240 @@
+[% INCLUDE 'doc-head-open.inc' %]
+[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › External search for '[% q | html %]'
+[% INCLUDE 'doc-head-close.inc' %]
+
+
+
+
+
+
+
+
+
+
+ [% INCLUDE 'masthead.inc' %]
+
+
External search for '[% q | html %]'
+
+
+
+
+
+
+
+
Refine your search
+
+
+
+
+
+
+
+
+
+[% INCLUDE 'opac-bottom.inc' %]
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt
+++ a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt
@@ -16,7 +16,11 @@
[% END %]
-
+[% IF ( OverDriveEnabled ) %][% END %]
+[% IF ( OPACSearchExternalTargets ) %]
+
+
+[% END %]
[% IF ( OpacHighlightedWords ) %]
[% END %]