Attachment #25236 for bug #10486

View | Details | Raw Unified | Return to bug 10486
Collapse All | Expand All




  &GetDistinctValues
  &enabled_staff_search_views
  &PurgeSearchHistory
  &GetExternalSearchTargets
);

# make all your functions, whether exported or not;

    }
}

=head2 GetExternalSearchTargets

Returns the list of Z39.50 servers that are marked for search in the OPAC using
Pazpar2.

=cut

sub GetExternalSearchTargets {
    my ( $branchcode ) = @_;

    if ( $branchcode ) {
        return C4::Context->dbh->selectall_arrayref( q{
            SELECT * FROM external_targets et
            LEFT JOIN external_target_restrictions etr
                ON (etr.target_id = et.target_id and etr.branchcode = ?)
            WHERE etr.target_id IS NULL
            ORDER BY et.name
        }, { Slice => {} }, $branchcode );
    } else {
        return C4::Context->dbh->selectall_arrayref( q{
            SELECT * FROM external_targets et
            LEFT JOIN external_target_restrictions etr USING (target_id)
            GROUP by et.target_id
            HAVING branchcode IS NULL
            ORDER BY et.name
        }, { Slice => {} } );
    }
}


END { }    # module clean-up code here (global destructor)





    $VERSION = 3.07.00.049;
    @ISA = qw(Exporter);
    @EXPORT = qw(
        &XSLTGetFilename
        &XSLTParse4Display
        &GetURI
    );

    return $xslfilename;
}

sub XSLTGetFilename {
    my ( $marcflavour, $xslsyspref ) = @_;

    my $xslfilename = $marcflavour eq C4::Context->preference('marcflavour') ? C4::Context->preference($xslsyspref) : 'default';
    if ( $xslfilename =~ /^\s*"?default"?\s*$/i ) {
        my $htdocs;
        my $theme;

        if ($xslsyspref eq "XSLTDetailsDisplay") {
            $htdocs  = C4::Context->config('intrahtdocs');
            $theme   = C4::Context->preference("template");
            $xslfile = $marcflavour .
                       "slim2intranetDetail.xsl";
        } elsif ($xslsyspref eq "XSLTResultsDisplay") {
            $htdocs  = C4::Context->config('intrahtdocs');
            $theme   = C4::Context->preference("template");
            $xslfile = $marcflavour .
                        "slim2intranetResults.xsl";
        } elsif ($xslsyspref eq "OPACXSLTDetailsDisplay") {
            $htdocs  = C4::Context->config('opachtdocs');
            $theme   = C4::Context->preference("opacthemes");
            $xslfile = $marcflavour .
                       "slim2OPACDetail.xsl";
        } elsif ($xslsyspref eq "OPACXSLTResultsDisplay") {
            $htdocs  = C4::Context->config('opachtdocs');
            $theme   = C4::Context->preference("opacthemes");
            $xslfile = $marcflavour .
                       "slim2OPACResults.xsl";
        }
        $xslfilename = _get_best_default_xslt_filename($htdocs, $theme, $lang, $xslfile);

        $xslfilename =~ s/\{langcode\}/$lang/;
    }

    return $xslfilename;
}

sub XSLTParse4Display {
    my ( $biblionumber, $orig_record, $xslsyspref, $fixamps, $hidden_items ) = @_;

    my $xslfilename = XSLTGetFilename( C4::Context->preference( 'marcflavour' ), $xslsyspref );

    # grab the XML, run it through our stylesheet, push it out to the browser
    my $record = transformMARCXML4XSLT($biblionumber, $orig_record);
    #return $record->as_formatted();

Lines 536-542 if ($config{'INSTALL_ZEBRA'} eq "yes") { Link Here

(-)a/Makefile.PL (-1 / +1 lines)
536	);	536	);
537	if ($config{'INSTALL_PAZPAR2'} eq 'yes') {	537	if ($config{'INSTALL_PAZPAR2'} eq 'yes') {
538	push @{ $pl_files->{'rewrite-config.PL'} }, (	538	push @{ $pl_files->{'rewrite-config.PL'} }, (
539	'blib/PAZPAR2_CONF_DIR/koha-biblios.xml',	539	'blib/PAZPAR2_CONF_DIR/generic-settings.xml',
540	'blib/PAZPAR2_CONF_DIR/pazpar2.xml'	540	'blib/PAZPAR2_CONF_DIR/pazpar2.xml'
541	);	541	);
542	}	542	}




#!/usr/bin/perl
#
# Copyright 2013 Jesse Weaver
#
# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it under the
# terms of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
#
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along
# with Koha; if not, write to the Free Software Foundation, Inc.,
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#

use Modern::Perl '2010';

use CGI;

use C4::Auth;
use C4::Context;
use C4::Branch;
use C4::Output;
use URI::Escape;

our $dbh = C4::Context->dbh;
our $input = new CGI;

our ( $template, $loggedinuser, $cookie ) = get_template_and_user( {
    template_name => "admin/external-targets.tt",
    query => $input,
    type => "intranet",
    authnotrequired => 0,
    flagsrequired => {parameters => 'parameters_remaining_permissions'},
    debug => 1,
} );

our $op = $input->param( 'op' ) // 'show';
$template->{VARS}->{op} = $op;

given ( $op ) {
    when ( 'show' ) { show_external_targets(); }
    when ( 'add' ) { show_edit_form(); }
    when ( 'edit' ) { show_edit_form(); }
    when ( 'save' ) { save_target(); }
    when ( 'delete' ) { delete_target(); }
}

output_html_with_http_headers $input, $cookie, $template->output;

sub show_external_targets {
    $template->{VARS}->{saved_id} = $input->param( 'saved_id' );
    $template->{VARS}->{deleted_name} = $input->param( 'deleted_name' );
    $template->{VARS}->{targets} = $dbh->selectall_arrayref( q{
        SELECT *
        FROM external_targets
    }, { Slice => {} } );
}

sub show_edit_form {
    $template->{VARS}->{branches} = GetBranchesLoop( undef, 0 );
    $template->{VARS}->{syntaxes} = [ 'MARC21', 'UNIMARC', 'NORMARC' ];
    $template->{VARS}->{encodings} = { 'utf8' => 'UTF-8', 'marc8' => 'MARC-8' };

    my $target_id;
    if ( $target_id = $input->param( 'target_id' ) ) {
        $template->{VARS}->{target} = $dbh->selectrow_hashref( q{ SELECT * FROM external_targets WHERE target_id = ? }, {}, $target_id );

        my $available_branches = $dbh->selectall_hashref( q{ SELECT * FROM external_target_restrictions WHERE target_id = ? }, 'branchcode', {}, $target_id );

        foreach my $branch ( @{ $template->{VARS}->{branches} } ) {
            $branch->{selected} = 1 if ( $available_branches->{$branch->{branchcode}} );
        }
    }
}

sub save_target {
    my $target_id;
    if ( $target_id = $input->param( 'target_id' ) ) {
        $dbh->do( q{
            UPDATE external_targets
            SET name = ?, host = ?, port = ?, db = ?, userid = ?, password = ?, syntax = ?, encoding = ?
            WHERE target_id = ?
        }, {}, map { $input->param( $_ ) // '' } qw( name host port db userid password syntax encoding target_id ) );
    } else {
        $dbh->do( q{
            INSERT
            INTO external_targets(name, host, port, db, userid, password, syntax, encoding)
            VALUES(?, ?, ?, ?, ?, ?, ?, ?)
        }, {}, map { $input->param( $_ ) // '' } qw( name host port db userid password syntax encoding ) );
        $target_id = $dbh->last_insert_id( undef, undef, undef, undef );
    }

    $dbh->do( q{
        DELETE
        FROM external_target_restrictions
        WHERE target_id = ?
    }, {}, $target_id );

    foreach my $branchcode ( $input->param( 'branch' ) ) {
        $dbh->do( q{
            INSERT
            INTO external_target_restrictions(branchcode, target_id)
            VALUES(?, ?)
        }, {}, $branchcode, $target_id );
    }

    print $input->redirect( '/cgi-bin/koha/admin/external_targets.pl?saved_id=' . $target_id );
    exit;
}

sub delete_target {
    my ($target_id, $target);

    return unless ( $target_id = $input->param( 'target_id' ) and $target = $dbh->selectrow_hashref( q{ SELECT * FROM external_targets WHERE target_id = ? }, {}, $target_id ) );

    $dbh->do( q{ DELETE FROM external_targets WHERE target_id = ? }, {}, $target_id );

    print $input->redirect( '/cgi-bin/koha/admin/external_targets.pl?deleted_name=' . uri_escape( $target->{'name'} ) );
}




<listen id="publicserver" >tcp:@:__ZEBRA_SRU_BIBLIOS_PORT__</listen>
-->

<!-- Settings for special biblio server instance for PazPar2.
     Because PazPar2 only connects to a Z39.50 server using TCP/IP,
     it cannot use the Unix-domain socket that biblioserver uses.
     Therefore, a custom server is defined. -->
__PAZPAR2_TOGGLE_XML_PRE__
<listen id="mergeserver">tcp:@:__MERGE_SERVER_PORT__</listen>
<server id="mergeserver"  listenref="mergeserver"> 
    <directory>__ZEBRA_DATA_DIR__/biblios</directory>
    <config>__ZEBRA_CONF_DIR__/__ZEBRA_BIB_CFG__</config>
    <cql2rpn>__ZEBRA_CONF_DIR__/pqf.properties</cql2rpn>
</server>
__PAZPAR2_TOGGLE_XML_POST__

<!-- BIBLIOGRAPHIC RECORDS -->
<server id="biblioserver"  listenref="biblioserver"> 
    <directory>__ZEBRA_DATA_DIR__/biblios</directory>

Lines 32-38 Link Here

(-)a/etc/koha-httpd.conf (-2 / +13 lines)
32	</Directory>	32	</Directory>
33		33
34	# Secure internal stuff	34	# Secure internal stuff
35	<DirectoryMatch "__OPAC_WWW_DIR__/.*/(modules\|xslt\|includes)">	35	<DirectoryMatch "__OPAC_WWW_DIR__/.*/(modules\|includes)">
36	Order deny,allow	36	Order deny,allow
37	Deny from all	37	Deny from all
38	</DirectoryMatch>	38	</DirectoryMatch>
Lines 113-118 Link Here
113	RewriteRule ^/isbn/([^\/]*)/?$ /search?q=isbn:$1 [PT]	113	RewriteRule ^/isbn/([^\/]*)/?$ /search?q=isbn:$1 [PT]
114	RewriteRule ^/issn/([^\/]*)/?$ /search?q=issn:$1 [PT]	114	RewriteRule ^/issn/([^\/]*)/?$ /search?q=issn:$1 [PT]
115	</IfModule>	115	</IfModule>
		116
		117	__PAZPAR2_TOGGLE_HTTPD_PRE__
		118	<Proxy *>
		119	AddDefaultCharset off
		120	Order deny,allow
		121	Allow from all
		122	</Proxy>
		123
		124	ProxyRequests off
		125	ProxyPass /pazpar2/search.pz2 http://__PAZPAR2_HOST__:__PAZPAR2_PORT__/search.pz2
		126	__PAZPAR2_TOGGLE_HTTPD_POST__
116	</VirtualHost>	127	</VirtualHost>
117		128
118	## Intranet	129	## Intranet
Lines 149-155 Link Here
149	</Directory>	160	</Directory>
150		161
151	# Secure internal stuff	162	# Secure internal stuff
152	<DirectoryMatch "__INTRANET_WWW_DIR__/.*/(modules\|xslt\|includes)">	163	<DirectoryMatch "__INTRANET_WWW_DIR__/.*/(modules\|includes)">
153	Order deny,allow	164	Order deny,allow
154	Deny from all	165	Deny from all
155	</DirectoryMatch>	166	</DirectoryMatch>




<settings target="*">
  <!-- This file introduces default settings for pazpar2 -->
  <!-- $Id: loc.xml,v 1.2 2007-07-10 13:43:07 adam Exp $ -->

  <!-- mapping for unqualified search -->
  <set name="pz:cclmap:term" value="u=1016 t=l,r s=al"/>

  <!-- field-specific mappings -->

  <set name="pz:cclmap:au" value="u=1004 s=al"/>
  <set name="pz:cclmap:ti" value="u=4 s=al"/>
  <set name="pz:cclmap:su" value="u=21 s=al"/>
  <set name="pz:cclmap:isbn" value="u=7"/>
  <set name="pz:cclmap:issn" value="u=8"/>
  <set name="pz:cclmap:date" value="u=30 r=r"/>

  <!-- Retrieval settings -->

  <set name="pz:elements" value="F"/>

</settings>

Lines 4-10 Link Here

(-)a/etc/pazpar2/pazpar2.xml (-1 / +1 lines)
4		4
5	<server>	5	<server>
6	<listen port="__PAZPAR2_PORT__"/>	6	<listen port="__PAZPAR2_PORT__"/>
7	<settings src="__PAZPAR2_CONF_DIR__/koha-biblios.xml"/>	7	<settings src="__PAZPAR2_CONF_DIR__/generic-settings.xml"/>
8		8
9	<relevance>	9	<relevance>
10	<icu_chain id="relevance" locale="el">	10	<icu_chain id="relevance" locale="el">




<?xml version="1.0" encoding="UTF-8"?>
<xsl:stylesheet
    version="1.0"
    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
    xmlns:pz="http://www.indexdata.com/pazpar2/1.0"
    xmlns:marc="http://www.loc.gov/MARC21/slim">

 <xsl:output indent="yes" method="xml" version="1.0" encoding="UTF-8"/>


  <xsl:template match="/marc:record">
    <pz:record>

      <xsl:for-each select="marc:controlfield[@tag='001']">
        <pz:metadata type="id">
          <xsl:value-of select="."/>
        </pz:metadata>
      </xsl:for-each>

      <!-- -->
      <xsl:for-each select="marc:datafield[@tag='020']">
	<xsl:if test="marc:subfield[@code='a'] = 'US'">
          <pz:metadata type="lccn">
	    <xsl:value-of select="marc:subfield[@code='b']"/>
	  </pz:metadata>
	</xsl:if>
      </xsl:for-each>

      <xsl:for-each select="marc:datafield[@tag='010']">
        <pz:metadata type="isbn">
	  <xsl:value-of select="marc:subfield[@code='a']"/>
	</pz:metadata>
      </xsl:for-each>

      <xsl:for-each select="marc:datafield[@tag='011']">
        <pz:metadata type="issn">
	  <xsl:value-of select="marc:subfield[@code='a']"/>
	</pz:metadata>
      </xsl:for-each>


      <xsl:for-each select="marc:datafield[@tag='200']">
        <pz:metadata type="work-title">
          <xsl:value-of select="marc:subfield[@code='a']"/>
        </pz:metadata>
      </xsl:for-each>


      <!-- Date of Pulbication -->
      <xsl:for-each select="marc:datafield[@tag='210']">
        <pz:metadata type="date">
	  <xsl:value-of select="marc:subfield[@code='d']"/>
	</pz:metadata>
      </xsl:for-each>

      <!--  Usmarc 650 maps to unimarc 606 and marc21 653 maps to unimarc 610 -->
      <xsl:for-each select="marc:datafield[@tag='606' or @tag='610']">
	<pz:metadata type="subject">
	  <xsl:value-of select="marc:subfield[@code='a']"/>
	</pz:metadata>
      </xsl:for-each>

      <xsl:for-each select="marc:datafield[@tag &gt;= 300 and @tag &lt;= 345]
                            [@tag != '325']">
        <pz:metadata type="description">
            <xsl:value-of select="*/text()"/>
        </pz:metadata>
      </xsl:for-each>


      <!-- Author : primary, alternative and secondary responsibility (equivalent marc21 tags : 100, 700 -->
      <xsl:for-each select="marc:datafield[@tag='700' or @tag='701' or @tag='702']">
	<pz:metadata type="work-author">
	  <xsl:value-of select="marc:subfield[@code='a']"/>
          <xsl:text>, </xsl:text>
	  <xsl:value-of select="marc:subfield[@code='b']"/>
	</pz:metadata>
      </xsl:for-each>

      <!-- Author : marc21 tag 720 maps to unimarc 730
      <xsl:for-each select="marc:datafield[@tag='730']">
	<pz:metadata type="author">
	  <xsl:value-of select="marc:subfield[@code='a']"/>
	</pz:metadata>
      </xsl:for-each>
      -->

      <!-- -->
      <xsl:for-each select="marc:datafield[@tag='856']">
	<pz:metadata type="url">
	  <xsl:value-of select="marc:subfield[@code='u']"/>
	</pz:metadata>
      </xsl:for-each>

    </pz:record>
  </xsl:template>

</xsl:stylesheet>

Lines 257-262 INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` Link Here

(-)a/installer/data/mysql/sysprefs.sql (+1 lines)
257	('OpacRenewalAllowed','0',NULL,'If ON, users can renew their issues directly from their OPAC account','YesNo'),	257	('OpacRenewalAllowed','0',NULL,'If ON, users can renew their issues directly from their OPAC account','YesNo'),
258	('OpacRenewalBranch','checkoutbranch','itemhomebranch\|patronhomebranch\|checkoutbranch\|null','Choose how the branch for an OPAC renewal is recorded in statistics','Choice'),	258	('OpacRenewalBranch','checkoutbranch','itemhomebranch\|patronhomebranch\|checkoutbranch\|null','Choose how the branch for an OPAC renewal is recorded in statistics','Choice'),
259	('OPACResultsSidebar','','70\|10','Define HTML to be included on the search results page, underneath the facets sidebar','Textarea'),	259	('OPACResultsSidebar','','70\|10','Define HTML to be included on the search results page, underneath the facets sidebar','Textarea'),
		260	('OPACSearchExternalTargets','0',NULL,'Whether to search external targets in the OPAC','YesNo'),
260	('OPACSearchForTitleIn','<li><a href=\"http://worldcat.org/search?q={TITLE}\" target=\"_blank\">Other Libraries (WorldCat)</a></li>\n<li><a href=\"http://www.scholar.google.com/scholar?q={TITLE}\" target=\"_blank\">Other Databases (Google Scholar)</a></li>\n<li><a href=\"http://www.bookfinder.com/search/?author={AUTHOR}&title={TITLE}&st=xl&ac=qr\" target=\"_blank\">Online Stores (Bookfinder.com)</a></li>\n<li><a href=\"http://openlibrary.org/search/?author=({AUTHOR})&title=({TITLE})\" target=\"_blank\">Open Library (openlibrary.org)</a></li>','70\|10','Enter the HTML that will appear in the \'Search for this title in\' box on the detail page in the OPAC. Enter {TITLE}, {AUTHOR}, or {ISBN} in place of their respective variables in the URL. Leave blank to disable \'More Searches\' menu.','Textarea'),	261	('OPACSearchForTitleIn','<li><a href=\"http://worldcat.org/search?q={TITLE}\" target=\"_blank\">Other Libraries (WorldCat)</a></li>\n<li><a href=\"http://www.scholar.google.com/scholar?q={TITLE}\" target=\"_blank\">Other Databases (Google Scholar)</a></li>\n<li><a href=\"http://www.bookfinder.com/search/?author={AUTHOR}&title={TITLE}&st=xl&ac=qr\" target=\"_blank\">Online Stores (Bookfinder.com)</a></li>\n<li><a href=\"http://openlibrary.org/search/?author=({AUTHOR})&title=({TITLE})\" target=\"_blank\">Open Library (openlibrary.org)</a></li>','70\|10','Enter the HTML that will appear in the \'Search for this title in\' box on the detail page in the OPAC. Enter {TITLE}, {AUTHOR}, or {ISBN} in place of their respective variables in the URL. Leave blank to disable \'More Searches\' menu.','Textarea'),
261	('OpacSeparateHoldings','0',NULL,'Separate current branch holdings from other holdings (OPAC)','YesNo'),	262	('OpacSeparateHoldings','0',NULL,'Separate current branch holdings from other holdings (OPAC)','YesNo'),
262	('OpacSeparateHoldingsBranch','homebranch','homebranch\|holdingbranch','Branch used to separate holdings (OPAC)','Choice'),	263	('OpacSeparateHoldingsBranch','homebranch','homebranch\|holdingbranch','Branch used to separate holdings (OPAC)','Choice'),




    SetVersion($DBversion);
}

$DBversion = "3.13.00.XXX";
if(CheckVersion($DBversion)) {
    $dbh->do(
"INSERT IGNORE INTO systempreferences (variable,value,explanation,options,type) VALUES('OPACSearchExternalTargets','0','Whether to search external targets in the OPAC','','YesNo')"
    );
    $dbh->do( q{
CREATE TABLE `external_targets` (
  `target_id` int(11) NOT NULL AUTO_INCREMENT,
  `host` varchar(128) NOT NULL,
  `port` int(11) NOT NULL,
  `db` varchar(64) NOT NULL,
  `userid` varchar(64) DEFAULT '',
  `password` varchar(64) DEFAULT '',
  `name` varchar(64) NOT NULL,
  `syntax` varchar(64) NOT NULL,
  `encoding` varchar(16) DEFAULT 'MARC-8',
  PRIMARY KEY (`target_id`)
) ENGINE=InnoDB AUTO_INCREMENT=21 DEFAULT CHARSET=utf8
    } );
    $dbh->do( q{
CREATE TABLE `external_target_restrictions` (
  `branchcode` varchar(10) NOT NULL,
  `target_id` int(11) NOT NULL,
  KEY `branchcode` (`branchcode`),
  KEY `target_id` (`target_id`),
  CONSTRAINT `external_target_restrictions_ibfk_1` FOREIGN KEY (`branchcode`) REFERENCES `branches` (`branchcode`) ON DELETE CASCADE,
  CONSTRAINT `external_target_restrictions_ibfk_2` FOREIGN KEY (`target_id`) REFERENCES `external_targets` (`target_id`) ON DELETE CASCADE
) ENGINE=InnoDB DEFAULT CHARSET=utf8
    } );
    print "Upgrade to $DBversion done (Bug 10486 - Allow external Z39.50 targets to be searched from the OPAC)\n";
    SetVersion($DBversion);
}

=head1 FUNCTIONS

=head2 TableExists($table)

Lines 270-275 tr.even td, tr.even.highlight td { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css (+14 lines)
270	border-right : 1px solid #BCBCBC;	270	border-right : 1px solid #BCBCBC;
271	}	271	}
272		272
		273	tr.highlight td {
		274	background-color : #F6F6F6;
		275	border-color : #BCBCBC;
		276	}
		277
		278	tr.highlight th[scope=row] {
		279	background-color : #DDDDDD;
		280	border-color : #BCBCBC;
		281	}
		282
273	td.od {	283	td.od {
274	color : #cc0000;	284	color : #cc0000;
275	font-weight : bold;	285	font-weight : bold;
Lines 287-292 tr.odd.onissue td { Link Here
287	background-color: #FFFFE1;	297	background-color: #FFFFE1;
288	}	298	}
289		299
		300	tr.updated td {
		301	background-color: #FFFFBB;
		302	}
		303
290	tfoot td {	304	tfoot td {
291	background-color : #f3f3f3;	305	background-color : #f3f3f3;
292	font-weight : bold;	306	font-weight : bold;

Lines 46-51 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc (+1 lines)
46	<li><a href="/cgi-bin/koha/admin/classsources.pl">Classification sources</a></li>	46	<li><a href="/cgi-bin/koha/admin/classsources.pl">Classification sources</a></li>
47	<li><a href="/cgi-bin/koha/admin/matching-rules.pl">Record matching rules</a></li>	47	<li><a href="/cgi-bin/koha/admin/matching-rules.pl">Record matching rules</a></li>
48	<li><a href="/cgi-bin/koha/admin/oai_sets.pl">OAI sets configuration</a></li>	48	<li><a href="/cgi-bin/koha/admin/oai_sets.pl">OAI sets configuration</a></li>
		49	<li><a href="/cgi-bin/koha/admin/external_targets.pl">External search targets</a></li>
49	</ul>	50	</ul>
50		51
51	<h5>Acquisition parameters</h5>	52	<h5>Acquisition parameters</h5>

Lines 84-89 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt (+2 lines)
84	<dt><a href="/cgi-bin/koha/admin/searchengine/solr/indexes.pl">Search engine configuration</a></dt>	84	<dt><a href="/cgi-bin/koha/admin/searchengine/solr/indexes.pl">Search engine configuration</a></dt>
85	<dd>Manage indexes, facets, and their mappings to MARC fields and subfields.</dd>	85	<dd>Manage indexes, facets, and their mappings to MARC fields and subfields.</dd>
86	[% END %]	86	[% END %]
		87	<dt><a href="/cgi-bin/koha/admin/external_targets.pl">External search targets</a></dt>
		88	<dd>Define external search targets that can be searched from the OPAC.</dd>
87	</dl>	89	</dl>
88		90
89	<h3>Acquisition parameters</h3>	91	<h3>Acquisition parameters</h3>




[% INCLUDE 'doc-head-open.inc' %]
[% IF op == 'show' %]
<title>Koha &rsaquo; Administration &rsaquo; External targets</title>
[% ELSIF op == 'add' %]
<title>Koha &rsaquo; Administration &rsaquo; External targets &rsaquo; Create an external target</title>
[% ELSIF op == 'edit' %]
<title>Koha &rsaquo; Administration &rsaquo; External targets &rsaquo; Editing '[% target.name %]'</title>
[% END %]
[% INCLUDE 'doc-head-close.inc' %]
<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.dataTables.min.js"></script>
[% INCLUDE 'datatables-strings.inc' %]
<script type="text/javascript" src="[% themelang %]/js/datatables.js"></script>
<script type="text/javascript">
//<![CDATA[
 $(document).ready(function() {
    [% IF ( targets.size ) %]
    var dTable = $("#targets").dataTable( $.extend( true, {}, dataTablesDefaults, {
        aoColumnDefs: [
            { aTargets: [ 1,2,3,4,5 ], bSortable: false, bSearchable: false },
        ],
        asStripeClasses: [ '', 'highlight' ],
        bPaginate: false,
    } ) );

    [% IF saved_id %]
    $( '#targets tr[data-targetid=[% saved_id %]]' ).addClass( 'updated' );
    [% END %]

    $( '#targets .delete' ).click( function() {
        return confirm( _("Are you sure you wish to delete this target?") );
    } );
    [% END %]
 });
//]]>
</script>

</head>
<body id="admin_z3950servers" class="admin">
[% INCLUDE 'header.inc' %]
[% INCLUDE 'cat-search.inc' %]

[% IF op == 'show' %]

<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; External targets</div>

[% ELSIF op == 'add' %]

<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; <a href="/cgi-bin/koha/admin/external_targets.pl">External targets</a> &rsaquo; Create an external target</div>

[% ELSIF op == 'edit' %]

<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; <a href="/cgi-bin/koha/admin/external_targets.pl">External targets</a> &rsaquo; Editing '[% target.name %]'</div>

[% END %]

<div id="doc3" class="yui-t2">
<div id="bd">

<div id="yui-main"><div class="yui-b">

[% IF op == 'show' %]

[% IF deleted_name %]
<div class="alert">
    <p>Deleted target '[% deleted_name %]'</p>
</div>
[% END %]

<div id="toolbar" class="btn-toolbar">
    <a id="newtarget" class="btn btn-small" href="/cgi-bin/koha/admin/external_targets.pl?op=add"><i class="icon-plus"></i> New external target</a>
</div>

<p>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.</p>

[% IF targets.size %]
<table id="targets">
    <thead><tr><th>Name</th><th>Connection</th><th>Login</th><th>Syntax</th><th>Encoding</th><th>&nbsp;</th><th>&nbsp;</th></tr></thead>
    <tbody>
        [% FOREACH target = targets %]
        <tr data-targetid="[% target.target_id %]">
            <td>[% target.name %]</td>
            <td>[% target.host %]:[% target.port %]/[% target.db %]</td>
            <td>[% IF target.userid %][% target.userid %] / [% IF target.password %]********[% ELSE %]<span class="hint">none</span>[% END %][% ELSE %]<span class="hint">none</span>[% END %]</td>
            <td>[% target.syntax %]</td>
            <td>
                [% IF target.encoding == 'marc8' %]
                MARC-8
                [% ELSIF target.encoding == 'utf8' %]
                UTF-8
                [% END %]
            </td>
            <td><a href="/cgi-bin/koha/admin/external_targets.pl?op=edit&amp;target_id=[% target.target_id %]">Edit</a></td>
            <td><a class="delete" href="/cgi-bin/koha/admin/external_targets.pl?op=delete&amp;target_id=[% target.target_id %]">Delete</a></td>
        </tr>
        [% END %]
    </tbody>
</table>
[% ELSE %]
<p>No external targets have been defined yet.</p>
[% END %]

[% ELSIF op == 'add' || op == 'edit' %]

<form action="/cgi-bin/koha/admin/external_targets.pl" method="POST">
    [% IF op == 'add' %]
    <h1>Create an external target</h1>
    [% ELSIF op == 'edit' %]
    <h1>Editing '[% target.name %]'</h1>
    [% END %]

    <input type="hidden" name="op" value="save">
    <input type="hidden" name="target_id" value="[% target.target_id %]">

    <fieldset class="rows">
        <ol>
            <li><label for="name">Name:</label> <input type="text" id="name" name="name" value="[% target.name %]" required></li>
            <li><label for="host">Host:</label> <input type="text" id="host" name="host" value="[% target.host %]" required></li>
            <li><label for="port">Port:</label> <input type="num" id="port" name="port" value="[% target.port %]" required></li>
            <li><label for="db">Database:</label> <input type="text" id="db" name="db" value="[% target.db %]" required></li>
            <li><label for="userid">User:</label> <input type="text" id="userid" name="userid" value="[% target.userid %]"></li>
            <li><label for="password">Password:</label> <input type="password" id="password" name="password" value="[% target.password %]" autocomplete="off"></li>
            <li>
                <label for="syntax">Syntax:</label>
                <select id="syntax" name="syntax">
                    [% FOREACH syntax = syntaxes %]
                    [% IF syntax == target.syntax %]
                    <option selected>[% syntax %]
                    [% ELSE %]
                    <option>[% syntax %]</option>
                    [% END %]
                    [% END %]
                </select>
            </li>
            <li>
                <label for="encoding">Encoding:</label>
                <select id="encoding" name="encoding">
                    [% FOREACH encoding = encodings %]
                    [% IF encoding.key == target.encoding %]
                    <option value="[% encoding.key %]" selected>[% encoding.value %]
                    [% ELSE %]
                    <option value="[% encoding.key %]">[% encoding.value %]</option>
                    [% END %]
                    [% END %]
                </select>
            </li>
            <li>
                <label>Restricted libraries:</label>
                <fieldset>
                    <legend>Not available to patrons from:</legend>
                    <p>Only targets with no restrictions will be shown to anonymous (not logged in) users.</p>
                    <ol>
                        [% FOREACH branch = branches %]
                        <li>
                            <label for="branch-[% branch.branchcode %]">[% branch.branchname %]</label>
                            [% IF branch.selected %]
                            <input type="checkbox" id="branch-[% branch.branchcode %]" name="branch" value="[% branch.branchcode %]" checked />
                            [% ELSE %]
                            <input type="checkbox" id="branch-[% branch.branchcode %]" name="branch" value="[% branch.branchcode %]" />
                            [% END %]
                        </li>
                        [% END %]
                    </ol>
                </fieldset>
            </li>
        </ol>
    </fieldset>

    <fieldset class="action"><input type="submit" value="Save"></fieldset>
</form>

[% END %]

</div></div>
<div class="yui-b">
[% INCLUDE 'admin-menu.inc' %]
</div>

</div>
[% INCLUDE 'intranet-bottom.inc' %]

Lines 430-435 OPAC: Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref (+7 lines)
430	yes: Allow	430	yes: Allow
431	no: Do not allow	431	no: Do not allow
432	- users to add a note when placing a hold.	432	- users to add a note when placing a hold.
		433	-
		434	- pref: OPACSearchExternalTargets
		435	default: 0
		436	choices:
		437	yes: Search
		438	no: "Don't search"
		439	- external targets from the OPAC.
433		440
434	Policy:	441	Policy:
435	-	442	-




  margin: 0;
  padding: 0;
}
#overdrive-results, #pazpar2-results {
  font-weight: bold;
  padding-left: 1em;
}

  -moz-box-shadow: 0px 1px 1px 0px rgba(0, 0, 0, 0.2);
  box-shadow: 0px 1px 1px 0px rgba(0, 0, 0, 0.2);
}
.sourcecol {
  vertical-align: top;
  width: 100px;
}
.notesrow label {
  font-weight: bold;
}
.notesrow span {
  display: block;
}
.notesrow textarea {
  width: 100%;
}
#modal-overlay {
  background-color: white;
  border-radius: 5px;
  max-width: 75%;
  padding: 15px;
}
@media only screen and (min-width: 0px) and (max-width: 304px) {
  /* Screens bewteen 0 and 304 pixels wide */
  #oh:after {




[% USE Koha %]
[% INCLUDE 'doc-head-open.inc' %]
[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo; External search for '[% q | html %]'
[% INCLUDE 'doc-head-close.inc' %]
[% BLOCK cssinclude %]
<style>
.actions a.addtocart {
    display: inline;
}
#targets-facet label {
    display: inline;
    font-size: inherit;
}
</style>
[% END %]
</head>
<body id="results" class="scrollto">
[% INCLUDE 'masthead.inc' %]

    <div class="main">
        <ul class="breadcrumb">
            <li><a href="/cgi-bin/koha/opac-main.pl">Home</a> <span class="divider">&rsaquo;</span></li>
            <li>
                <a href="#">External search for '[% q | html %]'</a>
            </li>
        </ul>

        <div id="maincontent" class="container-fluid">
            <div class="row-fluid">
                <div class="span3">
                    <div id="facetcontainer">
                        <div id="search-facets">
                            <h4><a href="#" class="menu-collapse-toggle">Refine your search</a></h4>
                            <ul class="menu-collapse">
                                <li id="targets-facet">
                                    Targets
                                    <ul>
                                        [% FOREACH target = external_search_targets %]
                                        <li>
                                            <input data-url="[% target.host %]:[% target.port %]/[% target.db %]" type="checkbox" id="target-[% loop.index %]" checked />
                                            <label for="target-[% loop.index %]">[% target.name %]
                                        </li>
                                        [% END %]
                                    </ul>
                                </li>
                            </ul>
                        </div>
                    </div>
                </div>
    
                <div class="span9 maincontent">
                    <p id="numresults"></p>
                    <div id="top-pages">
                        <div class="pagination pagination-small"><ul></ul></div>
                    </div>
                    <div id="searchresults">
                        <table class="table table-striped" id="results">
                            <tbody>
                            </tbody>
                        </table>
                    </div>
                    <div id="bottom-pages">
                        <div class="pagination pagination-small"><ul></ul></div>
                    </div>
                </div>
            </div>
        </div>
    </div>
</div>

</div>

<div id="modal-overlay" style="display: none"></div>
[% INCLUDE 'opac-bottom.inc' %]
[% BLOCK jsinclude %]
<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.lightbox_me.js"></script>
<script type="text/javascript" src="/opac-tmpl/lib/pz2.js"></script>
<script type="text/javascript" src="[% interface %]/[% theme %]/js/externalsearch.js"></script>
<script type="text/javascript">
var querystring = "[% q |replace( "'", "\'" ) |replace( '\n', '\\n' ) |replace( '\r', '\\r' ) |html %]";
var results_per_page = [% OPACnumSearchResults %];
KOHA.ExternalSearch.targets = {
    [% FOREACH target IN external_search_targets %]
        '[% target.host %]:[% target.port %]/[% target.db %]': {
            name: '[% target.name %]',
            syntax: '[% target.syntax %]',
        },
    [% END %]
};

var xsltResultStylesheets = {
    [% FOREACH stylesheet IN xslt_result_stylesheets %]
    '[% stylesheet.syntax %]': KOHA.XSLTGet( '[% stylesheet.url %]' ),
    [% END %]
};

var xsltDetailStylesheets = {
    [% FOREACH stylesheet IN xslt_detail_stylesheets %]
    '[% stylesheet.syntax %]': KOHA.XSLTGet( '[% stylesheet.url %]' ),
    [% END %]
};

var recordCache = {};
var resultRenderCache = {};

function showResult( syntax, recid ) {
    if ( recordCache[ recid ] ) {
        done( recordCache[ recid ] );
    } else {
        KOHA.ExternalSearch.GetDetailedRecord( recid, function( record ) {
            done( recordCache[ recid ] = record.xmlDoc );
        } );
    }

    function done( record ) {
        xsltResultStylesheets[ syntax ].done( function( xslDoc ) {
            var fragment = resultRenderCache[ recid ] = KOHA.TransformToFragment( record, xslDoc );
            var $tr = $( '#results tr' ).filter( function() { return $( this ).data( 'recid' ) == recid } );
            $tr.find( '.info' ).html( fragment );
            $tr.find( 'a' ).attr( 'href', '#' ).click( function() {
                showDetail( syntax, recid );

                return false;
            } );
        } );
    }
}

function showDetail( syntax, recid ) {
    var record = recordCache[ recid ];

    xsltDetailStylesheets[ syntax ].done( function( xslDoc ) {
        var fragment = KOHA.TransformToFragment( record, xslDoc );

        $( '#modal-overlay' ).html( fragment ).lightbox_me( {
            centered: true,
        } );
    } );
}

function search( offset, reset_search ) {
    $( '#pazpar2-status' ).html( _("Searching external targets...") + '<img class="throbber" src="/opac-tmpl/lib/jquery/plugins/themes/classic/throbber.gif" />' );

    if ( reset_search ) {
        KOHA.ExternalSearch.Search( querystring, results_per_page, callback );
    } else {
        KOHA.ExternalSearch.Fetch( offset, callback );
    }

    function callback( data ) {
        if ( data.error ) {
            $( '#pazpar2-status' ).html( '<strong class="unavailable">' + _("Error searching external targets.") + '</strong>' );
            return;
        }

        if ( !data.total ) {
            $( '#pazpar2-status' ).html( '<strong>' + _("No results found in the external targets.") + '</strong>' );
            return;
        }

        $( '#results tbody' ).empty();

        $( '#pazpar2-status' ).html( '<strong>' + _("Found __RESULTS__ results in __TARGETS__ external targets.").replace('__RESULTS__', data.total).replace('__TARGETS__', $( '#targets-facet input:checked' ).length ) );

        for ( var i = 0; data.hits[i]; i++ ) {
            var hit = data.hits[i];
            var results = [];
            var recordSyntax = KOHA.ExternalSearch.targets[ hit.location[0]['@id'] ].syntax;

            results.push( '<tr>' );

            results.push( '<td class="sourcecol">', hit.location[0]['@name'], '</td>' );

            results.push( '<td class="info">' );

            if ( resultRenderCache[ hit.recid[0] ] ) {
                results.push( resultRenderCache[ hit.recid[0] ] );
            } else {
                results.push( hit['md-work-title'] ? hit['md-work-title'][0] : _("Loading...") );
                showResult( recordSyntax, hit.recid[0] );
            }

            results.push( '</td>' );

            results.push( '</tr>' );
            var $tr = $( results.join( '' ) );
            $tr.data( 'recid', hit.recid[0] );
            $( '#results tbody' ).append( $tr );

            ( function( hit, recordSyntax ) {
                $tr.find( 'a' ).attr( 'href', '#' ).click( function() {
                    showDetail( recordSyntax, hit.recid[0] );

                    return false;
                } );
            } )( hit, recordSyntax );
        }

        var pages = [];
        var cur_page = data.start / results_per_page;
        var max_page = Math.floor( data.total / results_per_page );

        if ( cur_page != 0 ) {
            pages.push( '<li><a href="#" data-offset="' + (offset - results_per_page) + '">&lt;&lt; ' + _("Previous") + '</a></li>' );
        }

        for ( var page = Math.max( 0, cur_page - 9 ); page <= Math.min( max_page, cur_page + 9 ); page++ ) {
            if ( page == cur_page ) {
                pages.push( ' <li class="active"><a href="#">' + ( page + 1 ) + '</a></span>' );
            } else {
                pages.push( ' <li><a href="#" data-offset="' + ( page * results_per_page ) + '">' + ( page + 1 ) + '</a></li>' );
            }
        }

        if ( cur_page < max_page ) {
            pages.push( ' <li><a href="#" data-offset="' + (offset + results_per_page) + '">' + _("Next") + ' >></a></li>' );
        }

        if ( pages.length > 1 ) $( '#top-pages, #bottom-pages' ).find( '.pagination ul' ).html( pages.join( '' ) );
    }
}

$( document ).ready( function() {
    $( '#numresults' )
        .append( ' ' )
        .append( '<span id="pazpar2-status"></span>' );

    $( document ).on( 'click', 'a[data-offset]', function() {
        search( $(this).data('offset') );
        return false;
    });

    var reSearchTimeout;

    $( '#targets-facet input' ).each( function() {
        $( this ).click( function() {
            KOHA.ExternalSearch.targets[ $( this ).data( 'url' ) ].disabled = !this.checked;

            if ( reSearchTimeout ) clearTimeout( reSearchTimeout );

            reSearchTimeout = setTimeout( function() {
                if ( $( '#targets-facet input:checked' ).length ) search( 0, true );
            }, 1000 );
        } );

        KOHA.ExternalSearch.targets[ $( this ).data( 'url' ) ].disabled = !this.checked;
    } );

    search( 0, true );
} );
</script>
[% END %]

Lines 552-558 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt (-9 / +50 lines)
552	[% IF ( OverDriveEnabled ) %]<script type="text/javascript" src="[% interface %]/[% theme %]/js/overdrive.js"></script>[% END %]	552	[% IF ( OverDriveEnabled ) %]<script type="text/javascript" src="[% interface %]/[% theme %]/js/overdrive.js"></script>[% END %]
553	<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script>	553	<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script>
554	[% IF ( OpacHighlightedWords ) %]<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.highlight-3.js"></script>	554	[% IF ( OpacHighlightedWords ) %]<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.highlight-3.js"></script>
555	[% END %]<script type="text/javascript">	555	[% END %]
		556	[% IF ( Koha.Preference('OPACSearchExternalTargets') ) %]
		557	<script type="text/javascript" src="/opac-tmpl/lib/pz2.js"></script>
		558	<script type="text/javascript" src="[% interface %]/[% theme %]/js/externalsearch.js"></script>
		559	[% END %]
		560	<script type="text/javascript">
556	//<![CDATA[	561	//<![CDATA[
557	[% IF ( Koha.Preference( 'opacuserlogin' ) == 1 ) && ( Koha.Preference( 'RequestOnOpac' ) == 1 ) %]	562	[% IF ( Koha.Preference( 'opacuserlogin' ) == 1 ) && ( Koha.Preference( 'RequestOnOpac' ) == 1 ) %]
558	function holdMultiple() {	563	function holdMultiple() {
Lines 836-856 $(document).ready(function(){ Link Here
836	$("#highlight_toggle_on" ).hide().click(function() {highlightOn() ;});	841	$("#highlight_toggle_on" ).hide().click(function() {highlightOn() ;});
837	$("#highlight_toggle_off").show().click(function() {highlightOff();});	842	$("#highlight_toggle_off").show().click(function() {highlightOff();});
838	[% END %]	843	[% END %]
		844
		845	function StartExternalSearch(name, text) {
		846	$( '#numresults' )
		847	.eq( 0 )
		848	.append( ' <span id="' + name + '-results">' + text + '... <img class="throbber" src="/opac-tmpl/lib/jquery/plugins/themes/classic/throbber.gif" /></span>' );
		849	}
		850	function FailExternalSearch( name, text ) {
		851	$( '#' + name + '-results' ).html( text );
		852	}
		853	function FinishExternalSearch( name, text, numItems, url ) {
		854	if ( numItems ) {
		855	$( '#' + name + '-results' ).html( text.replace( '__LINK__', '<a href="' + url + '">' + _("__RESULTS__ results").replace( '__RESULTS__', numItems ) + '</a>' ) );
		856	} else {
		857	$( '#' + name + '-results' ).remove();
		858	}
		859	}
		860
839	[% IF ( OverDriveEnabled ) %]	861	[% IF ( OverDriveEnabled ) %]
840	var $overdrive_results = $( '<span id="overdrive-results">' + _( 'Searching OverDrive...' ) + ' <img class="throbber" src="[% interface %]/lib/jquery/plugins/themes/classic/throbber.gif" /></span>' );	862	StartExternalSearch( 'overdrive', _("Searching OverDrive") );
841	$( '#numresults' ) .append( ' ' )
842	.append( $overdrive_results );
843	KOHA.OverDrive.Search( "[% OverDriveLibraryID %]", querystring, 1, 0, function( data ) {	863	KOHA.OverDrive.Search( "[% OverDriveLibraryID %]", querystring, 1, 0, function( data ) {
844	if ( data.error ) {	864	if ( data.error ) {
845	$overdrive_results.html( _( 'Error searching OverDrive collection' ) );	865	FailExternalSearch( 'overdrive', _("Error searching OverDrive collection") );
846	return;	866	return;
847	}	867	}
848		868
849	if ( data.totalItems ) {	869	FinishExternalSearch( 'overdrive', _("Found __LINK__ in OverDrive collection"), data.totalItems, '/cgi-bin/koha/opac-overdrive-search.pl?q=' + escape( querystring ) );
850	$overdrive_results.html( _( 'Found' ) + ' <a href="/cgi-bin/koha/opac-overdrive-search.pl?q=' + escape( querystring ) + '">' + data.totalItems + ' ' + _( 'results' ) + '</a> ' + _( 'in OverDrive collection' ) );	870	} );
851	} else {	871	[% END %]
852	$overdrive_results.remove();	872
		873	[% IF ( OPACSearchExternalTargets ) %]
		874	KOHA.ExternalSearch.targets = {
		875	[% FOREACH target IN external_search_targets %]
		876	'[% target.host %]:[% target.port %]/[% target.db %]': {
		877	id: '[% target.target_id %]',
		878	name: '[% target.name %]',
		879	syntax: '[% target.syntax %]',
		880	},
		881	[% END %]
		882	};
		883	var num_targets = 0; $.each( KOHA.ExternalSearch.targets, function() { num_targets++ } );
		884	var first_succeeded;
		885
		886	StartExternalSearch( 'pazpar2', _("Searching external targets") );
		887	KOHA.ExternalSearch.Search( querystring, 1, function( data ) {
		888	if ( data.error ) {
		889	if ( !first_succeeded ) FailExternalSearch( 'pazpar2', _("Error searching external targets") );
		890	return;
853	}	891	}
		892
		893	first_succeeded = true;
		894	FinishExternalSearch( 'pazpar2', _("Found __LINK__ in __TARGETS__ external targets").replace( '__TARGETS__', num_targets ), data.total, '/cgi-bin/koha/opac-external-search.pl?q=' + escape( querystring ) );
854	} );	895	} );
855	[% END %]	896	[% END %]
856	[% END %]	897	[% END %]




  xmlns:marc="http://www.loc.gov/MARC21/slim"
  xmlns:items="http://www.koha-community.org/items"
  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
  xmlns="http://www.w3.org/1999/xhtml"
  exclude-result-prefixes="marc items">
    <xsl:import href="MARC21slimUtils.xsl"/>
    <xsl:output method = "html" indent="yes" omit-xml-declaration = "yes" encoding="UTF-8"/>
    <xsl:key name="item-by-status" match="items:item" use="items:status"/>
    <xsl:key name="item-by-status-and-branch" match="items:item" use="concat(items:status, ' ', items:homebranch)"/>
    <xsl:param name="showAvailability" select="true()"/>

    <xsl:template match="/">
            <xsl:apply-templates/>

                            </xsl:for-each>
                            </span>
                        </xsl:if>
                        <xsl:if test="$showAvailability">
                        <span class="results_summary availability">
                        <span class="label">Availability: </span>
                        <xsl:choose>

                            <xsl:when test="string-length($AlternateHoldingsField)=3 and marc:datafield[@tag=$AlternateHoldingsField]">
                            <xsl:variable name="AlternateHoldingsCount" select="count(marc:datafield[@tag=$AlternateHoldingsField])"/>
                            <xsl:for-each select="marc:datafield[@tag=$AlternateHoldingsField][1]">
                                <!-- Removed select="marc:datafield[@tag=$AlternateHoldingsField]" due to incompatibility with browser XSLT -->
                                <xsl:call-template name="subfieldSelect">
                                    <xsl:with-param name="codes"><xsl:value-of select="$AlternateHoldingsSubfields"/></xsl:with-param>
                                    <xsl:with-param name="delimeter"><xsl:value-of select="$AlternateHoldingsSeparator"/></xsl:with-param>
                                </xsl:call-template>

                       <xsl:text>). </xsl:text>                   </span>
                   </xsl:if>
               </span>
               </xsl:if>
    <xsl:choose>
        <xsl:when test="($OPACItemLocation='location' or $OPACItemLocation='ccode') and (count(key('item-by-status', 'available'))!=0 or count(key('item-by-status', 'reference'))!=0)">
            <span class="results_summary" id="location">

Lines 1-6 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slimUtils.xsl (-1 / +1 lines)
1	<?xml version='1.0'?>	1	<?xml version='1.0'?>
2	<!DOCTYPE stylesheet [<!ENTITY nbsp " " >]>	2	<!DOCTYPE stylesheet [<!ENTITY nbsp " " >]>
3	<xsl:stylesheet version="1.0" xmlns:marc="http://www.loc.gov/MARC21/slim" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">	3	<xsl:stylesheet version="1.0" xmlns:marc="http://www.loc.gov/MARC21/slim" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml">
4	<xsl:template name="datafield">	4	<xsl:template name="datafield">
5	<xsl:param name="tag"/>	5	<xsl:param name="tag"/>
6	<xsl:param name="ind1"><xsl:text> </xsl:text></xsl:param>	6	<xsl:param name="ind1"><xsl:text> </xsl:text></xsl:param>




  xmlns:marc="http://www.loc.gov/MARC21/slim"
  xmlns:items="http://www.koha-community.org/items"
  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
  xmlns="http://www.w3.org/1999/xhtml"
  exclude-result-prefixes="marc items">

<xsl:import href="UNIMARCslimUtils.xsl"/>
<xsl:output method = "html" indent="yes" omit-xml-declaration = "yes" encoding="UTF-8"/>
<xsl:key name="item-by-status" match="items:item" use="items:status"/>
<xsl:key name="item-by-status-and-branch" match="items:item" use="concat(items:status, ' ', items:homebranch)"/>
<xsl:param name="showAvailability" select="true()"/>

<xsl:template match="/">
  <xsl:apply-templates/>


  <xsl:call-template name="tag_215" />

  <xsl:if test="$showAvailability">
  <span class="results_summary">
    <span class="label">Availability: </span>
    <xsl:choose>

      </span>
    </xsl:if>
  </span>
  </xsl:if>

</xsl:template>





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 } );
        },
    };
} )();




/*
* $ 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 = $('<iframe id="foo" style="z-index: ' + (opts.zIndex + 1) + ';border: none; margin: 0; padding: 0; position: absolute; width: 100%; height: 100%; top: 0; left: 0; filter: mask();"/>'),
                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 = $('<div class="lb_overlay_clear js_lb_overlay"/>');
                } else {
                    $overlay = $('<div class="' + opts.classPrefix + '_overlay js_lb_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);

Lines 1596-1601 strong em, em strong { Link Here

(-)a/koha-tmpl/opac-tmpl/ccsr/en/css/opac.css (+16 lines)
1596	vertical-align: top;	1596	vertical-align: top;
1597	width: 10px;	1597	width: 10px;
1598	}	1598	}
		1599	.sourcecol {
		1600	vertical-align: top;
		1601	width: 100px;
		1602	}
1599	#container {	1603	#container {
1600	color : #000;	1604	color : #000;
1601	}	1605	}
Lines 2865-2867 a.reviewlink,a.reviewlink:visited { Link Here
2865	display: block;	2869	display: block;
2866	overflow: auto;	2870	overflow: auto;
2867	}	2871	}
		2872
		2873	#modal-overlay {
		2874	background-color: white;
		2875	border-radius: 5px;
		2876	max-width: 75%;
		2877	padding: 15px;
		2878	}
		2879
		2880	#overdrive-results, #pazpar2-results {
		2881	font-weight: bold;
		2882	padding-left: 1em;
		2883	}




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 } );
        },
    };
} )();




/*
* $ 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 = $('<iframe id="foo" style="z-index: ' + (opts.zIndex + 1) + ';border: none; margin: 0; padding: 0; position: absolute; width: 100%; height: 100%; top: 0; left: 0; filter: mask();"/>'),
                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 = $('<div class="lb_overlay_clear js_lb_overlay"/>');
                } else {
                    $overlay = $('<div class="' + opts.classPrefix + '_overlay js_lb_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);




/*
 * pz2.js - pazpar2's javascript client library.
 * Copyright (C) 2006-2013 Index Data.
 *
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License
 * as published by the Free Software Foundation; either version 2
 * of the License, or (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
*/

//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 <hit> 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 */
}

Lines 1677-1682 strong em, em strong { Link Here

(-)a/koha-tmpl/opac-tmpl/prog/en/css/opac.css (-1 / +26 lines)
1677	vertical-align: top;	1677	vertical-align: top;
1678	width: 10px;	1678	width: 10px;
1679	}	1679	}
		1680	.sourcecol {
		1681	vertical-align: top;
		1682	width: 100px;
		1683	}
1680	#container {	1684	#container {
1681	color : #000;	1685	color : #000;
1682	}	1686	}
Lines 3006-3011 float:left; Link Here
3006	padding: 0.1em 0;	3010	padding: 0.1em 0;
3007	}	3011	}
3008		3012
		3013	.notesrow label {
		3014	font-weight: bold;
		3015	}
		3016	.notesrow span {
		3017	display: block;
		3018	}
		3019	.notesrow textarea {
		3020	width: 100%;
		3021	}
		3022
3009	.thumbnail-shelfbrowser span {	3023	.thumbnail-shelfbrowser span {
3010	margin: 0px auto;	3024	margin: 0px auto;
3011	}	3025	}
Lines 3030-3036 padding: 0.1em 0; Link Here
3030	background: #EEEEEE none;	3044	background: #EEEEEE none;
3031	}	3045	}
3032		3046
3033	#overdrive-results {	3047	#overdrive-results, #pazpar2-results {
3034	font-weight: bold;	3048	font-weight: bold;
3035	padding-left: 1em;	3049	padding-left: 1em;
3036	}	3050	}
Lines 3074-3076 padding: 0.1em 0; Link Here
3074	width: 35%;	3088	width: 35%;
3075	font-size: 111%;	3089	font-size: 111%;
3076	}	3090	}
		3091
		3092	.thumbnail-shelfbrowser span {
		3093	margin: 0px auto;
		3094	}
		3095
		3096	#modal-overlay {
		3097	background-color: white;
		3098	border-radius: 5px;
		3099	max-width: 75%;
		3100	padding: 15px;
		3101	}




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 } );
        },
    };
} )();




/*
* $ 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 = $('<iframe id="foo" style="z-index: ' + (opts.zIndex + 1) + ';border: none; margin: 0; padding: 0; position: absolute; width: 100%; height: 100%; top: 0; left: 0; filter: mask();"/>'),
                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 = $('<div class="lb_overlay_clear js_lb_overlay"/>');
                } else {
                    $overlay = $('<div class="' + opts.classPrefix + '_overlay js_lb_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);




[% INCLUDE 'doc-head-open.inc' %]
[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo; External search for '[% q | html %]'
[% INCLUDE 'doc-head-close.inc' %]
<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.lightbox_me.js"></script>
<script type="text/javascript" src="/opac-tmpl/lib/pz2.js"></script>
<script type="text/javascript" src="[% themelang %]/js/externalsearch.js"></script>
<script type="text/javascript">
var querystring = "[% q |replace( "'", "\'" ) |replace( '\n', '\\n' ) |replace( '\r', '\\r' ) |html %]";
var results_per_page = [% OPACnumSearchResults %];
KOHA.ExternalSearch.targets = {
    [% FOREACH target IN external_search_targets %]
        '[% target.host %]:[% target.port %]/[% target.db %]': {
            name: '[% target.name %]',
            syntax: '[% target.syntax %]',
        },
    [% END %]
};

var xsltResultStylesheets = {
    [% FOREACH stylesheet IN xslt_result_stylesheets %]
    '[% stylesheet.syntax %]': KOHA.XSLTGet( '[% stylesheet.url %]' ),
    [% END %]
};

var xsltDetailStylesheets = {
    [% FOREACH stylesheet IN xslt_detail_stylesheets %]
    '[% stylesheet.syntax %]': KOHA.XSLTGet( '[% stylesheet.url %]' ),
    [% END %]
};

var recordCache = {};
var resultRenderCache = {};

function showResult( syntax, recid ) {
    if ( recordCache[ recid ] ) {
        done( recordCache[ recid ] );
    } else {
        KOHA.ExternalSearch.GetDetailedRecord( recid, function( record ) {
            done( recordCache[ recid ] = record.xmlDoc );
        } );
    }

    function done( record ) {
        xsltResultStylesheets[ syntax ].done( function( xslDoc ) {
            var fragment = resultRenderCache[ recid ] = KOHA.TransformToFragment( record, xslDoc );
            var $tr = $( '#results tr' ).filter( function() { return $( this ).data( 'recid' ) == recid } );
            $tr.find( '.info' ).html( fragment );
            $tr.find( 'a' ).attr( 'href', '#' ).click( function() {
                showDetail( syntax, recid );

                return false;
            } );
        } );
    }
}

function showDetail( syntax, recid ) {
    var record = recordCache[ recid ];
    console.info((new XMLSerializer).serializeToString( record ));

    xsltDetailStylesheets[ syntax ].done( function( xslDoc ) {
        var fragment = KOHA.TransformToFragment( record, xslDoc );

        $( '#modal-overlay' ).html( fragment ).lightbox_me( {
            centered: true,
        } );
    } );
}

function search( offset, reset_search ) {
    $( '#pazpar2-status' ).html( _("Searching external targets...") + '<img class="throbber" src="/opac-tmpl/lib/jquery/plugins/themes/classic/throbber.gif" />' );

    if ( reset_search ) {
        KOHA.ExternalSearch.Search( querystring, results_per_page, callback );
    } else {
        KOHA.ExternalSearch.Fetch( offset, callback );
    }

    function callback( data ) {
        if ( data.error ) {
            $( '#pazpar2-status' ).html( '<strong class="unavailable">' + _("Error searching external targets.") + '</strong>' );
            return;
        }

        if ( !data.total ) {
            $( '#pazpar2-status' ).html( '<strong>' + _("No results found in the external targets.") + '</strong>' );
            return;
        }

        $( '#results tbody' ).empty();

        $( '#pazpar2-status' ).html( '<strong>' + _("Found __RESULTS__ results in __TARGETS__ external targets.").replace('__RESULTS__', data.total).replace('__TARGETS__', $( '#targets-facet input:checked' ).length );

        for ( var i = 0; data.hits[i]; i++ ) {
            var hit = data.hits[i];
            var results = [];
            var recordSyntax = KOHA.ExternalSearch.targets[ hit.location[0]['@id'] ].syntax;

            results.push( '<tr>' );

            results.push( '<td class="sourcecol">', hit.location[0]['@name'], '</td>' );

            results.push( '<td class="info">' );

            if ( resultRenderCache[ hit.recid[0] ] ) {
                results.push( resultRenderCache[ hit.recid[0] ] );
            } else {
                results.push( hit['md-work-title'] ? hit['md-work-title'][0] : _("Loading...") );
                showResult( recordSyntax, hit.recid[0] );
            }

            results.push( '</td>' );

            results.push( '</tr>' );
            var $tr = $( results.join( '' ) );
            $tr.data( 'recid', hit.recid[0] );
            $( '#results tbody' ).append( $tr );

            ( function( hit, recordSyntax ) {
                $tr.find( 'a' ).attr( 'href', '#' ).click( function() {
                    showDetail( recordSyntax, hit.recid[0] );

                    return false;
                } );
            } )( hit, recordSyntax );
        }

        $( '#results tr:odd' ).addClass( 'highlight' );

        var pages = [];
        var cur_page = data.start / results_per_page;
        var max_page = Math.floor( data.total / results_per_page );

        if ( cur_page != 0 ) {
            pages.push( '<a class="nav" href="#" data-offset="' + (offset - results_per_page) + '">&lt;&lt; ' + _("Previous") + '</a>' );
        }

        for ( var page = Math.max( 0, cur_page - 9 ); page <= Math.min( max_page, cur_page + 9 ); page++ ) {
            if ( page == cur_page ) {
                pages.push( ' <span class="current">' + ( page + 1 ) + '</span>' );
            } else {
                pages.push( ' <a class="nav" href="#" data-offset="' + ( page * results_per_page ) + '">' + ( page + 1 ) + '</a>' );
            }
        }

        if ( cur_page < max_page ) {
            pages.push( ' <a class="nav" href="#" data-offset="' + (offset + results_per_page) + '">' + _("Next") + ' >></a>' );
        }

        if ( pages.length > 1 ) $( '#top-pages, #bottom-pages' ).find( '.pages' ).html( pages.join( '' ) );
    }
}

$( document ).ready( function() {
    $( '#breadcrumbs p' )
        .append( ' ' )
        .append( '<span id="pazpar2-status"></span>' );

    $( document ).on( 'click', 'a.nav', function() {
        search( $( this ).data( 'offset' ) );
        return false;
    });

    var reSearchTimeout;

    $( '#targets-facet input' ).each( function() {
        $( this ).click( function() {
            KOHA.ExternalSearch.targets[ $( this ).data( 'url' ) ].disabled = !this.checked;

            if ( reSearchTimeout ) clearTimeout( reSearchTimeout );

            reSearchTimeout = setTimeout( function() {
                if ( $( '#targets-facet input:checked' ).length ) search( 0, true );
            }, 1000 );
        } );

        KOHA.ExternalSearch.targets[ $( this ).data( 'url' ) ].disabled = !this.checked;
    } );

    search( 0, true );
} );
</script>
<style>
.actions a.addtocart {
    display: inline;
}
</style>
</head>
<body>
<div id="doc3" class="yui-t1">

<div id="bd">
    [% INCLUDE 'masthead.inc' %]

    <h1>External search for '[% q | html %]'</h1>
    <div id="breadcrumbs">
        <p></p>
    </div>

    <div id="yui-main"><div class="yui-b searchresults">
        <div id="top-pages">
            <div class="pages">
            </div>
        </div>
        <table id="results">
            <tbody>
            </tbody>
        </table>
        <div id="bottom-pages">
            <div class="pages">
            </div>
        </div>
    </div></div>

    <div class="yui-b"><div id="facetcontainer" class="container">
    <div id="search-facets">

        <h4>Refine your search</h4>

        <ul>
            <li id="targets-facet">
                Targets
                <ul>
                    [% FOREACH target = external_search_targets %]
                    <li>
                        <input data-url="[% target.host %]:[% target.port %]/[% target.db %]" type="checkbox" id="target-[% loop.index %]" checked />
                        <label for="target-[% loop.index %]">[% target.name %]
                    </li>
                    [% END %]
                </ul>
            </li>
        </ul>
    </div>
    </div></div>
</div>

</div>

<div id="modal-overlay" style="display: none"></div>
[% INCLUDE 'opac-bottom.inc' %]

Lines 16-22 Link Here

(-)a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt (-10 / +49 lines)
16	<link rel="stylesheet" type="text/css" href="[% themelang %]/css/jquery.rating.css" />	16	<link rel="stylesheet" type="text/css" href="[% themelang %]/css/jquery.rating.css" />
17	[% END %]	17	[% END %]
18		18
19	<script type="text/javascript" src="[% themelang %]/js/overdrive.js"></script>	19	[% IF ( OverDriveEnabled ) %]<script type="text/javascript" src="[% themelang %]/js/overdrive.js"></script>[% END %]
		20	[% IF ( Koha.Preference('OPACSearchExternalTargets') ) %]
		21	<script type="text/javascript" src="/opac-tmpl/lib/pz2.js"></script>
		22	<script type="text/javascript" src="[% themelang %]/js/externalsearch.js"></script>
		23	[% END %]
20	<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script>	24	<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script>
21	[% IF ( OpacHighlightedWords ) %]<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.highlight-3.js"></script>	25	[% IF ( OpacHighlightedWords ) %]<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.highlight-3.js"></script>
22	[% END %]<script type="text/javascript">	26	[% END %]<script type="text/javascript">
Lines 266-289 $(document).ready(function(){ Link Here
266	$("#highlight_toggle_on" ).hide().click(function() {highlightOn() ;});	270	$("#highlight_toggle_on" ).hide().click(function() {highlightOn() ;});
267	$("#highlight_toggle_off").show().click(function() {highlightOff();});	271	$("#highlight_toggle_off").show().click(function() {highlightOff();});
268	[% END %]	272	[% END %]
		273	function StartExternalSearch(name, text) {
		274	$( '#breadcrumbs p' )
		275	.eq( 0 )
		276	.append( ' <span id="' + name + '-results">' + text + '... <img class="throbber" src="/opac-tmpl/lib/jquery/plugins/themes/classic/throbber.gif" /></span>' );
		277	}
		278	function FailExternalSearch( name, text ) {
		279	$( '#' + name + '-results' ).html( text );
		280	}
		281	function FinishExternalSearch( name, text, numItems, url ) {
		282	if ( numItems ) {
		283	$( '#' + name + '-results' ).html( text.replace( '__LINK__', '<a href="' + url + '">' + numItems + _(" results") + '</a>' ) );
		284	} else {
		285	$( '#' + name + '-results' ).remove();
		286	}
		287	}
		288
269	[% IF ( OverDriveEnabled ) %]	289	[% IF ( OverDriveEnabled ) %]
270	var $overdrive_results = $( '<span id="overdrive-results">' + _( 'Searching OverDrive...' ) + ' <img class="throbber" src="/opac-tmpl/lib/jquery/plugins/themes/classic/throbber.gif" /></span>' );	290	StartExternalSearch( 'overdrive', _("Searching OverDrive") );
271	$( '#breadcrumbs p' ).eq(0)
272	.append( ' ' )
273	.append( $overdrive_results );
274	KOHA.OverDrive.Search( "[% OverDriveLibraryID %]", querystring, 1, 0, function( data ) {	291	KOHA.OverDrive.Search( "[% OverDriveLibraryID %]", querystring, 1, 0, function( data ) {
275	if ( data.error ) {	292	if ( data.error ) {
276	$overdrive_results.html( _( 'Error searching OverDrive collection' ) );	293	FailExternalSearch( 'overdrive', _("Error searching OverDrive collection") );
277	return;	294	return;
278	}	295	}
279		296
280	if ( data.totalItems ) {	297	FinishExternalSearch( 'overdrive', _("Found __LINK__ in OverDrive collection"), data.totalItems, '/cgi-bin/koha/opac-overdrive-search.pl?q=' + escape( querystring ) );
281	$overdrive_results.html( _( 'Found' ) + ' <a href="/cgi-bin/koha/opac-overdrive-search.pl?q=' + escape( querystring ) + '">' + data.totalItems + ' ' + _( 'results' ) + '</a> ' + _( 'in OverDrive collection' ) );	298	} );
282	} else {	299	[% END %]
283	$overdrive_results.remove();	300
		301	[% IF ( OPACSearchExternalTargets ) %]
		302	KOHA.ExternalSearch.targets = {
		303	[% FOREACH target IN external_search_targets %]
		304	'[% target.host %]:[% target.port %]/[% target.db %]': {
		305	id: '[% target.target_id %]',
		306	name: '[% target.name %]',
		307	syntax: '[% target.syntax %]',
		308	},
		309	[% END %]
		310	};
		311	var num_targets = 0; $.each( KOHA.ExternalSearch.targets, function() { num_targets++ } );
		312	var first_succeeded;
		313
		314	StartExternalSearch( 'pazpar2', _("Searching external targets") );
		315	KOHA.ExternalSearch.Search( querystring, 1, function( data ) {
		316	if ( data.error ) {
		317	if ( !first_succeeded ) FailExternalSearch( 'pazpar2', _("Error searching external targets") );
		318	return;
284	}	319	}
		320
		321	first_succeeded = true;
		322	FinishExternalSearch( 'pazpar2', _("Found __LINK__ in ") + num_targets + _(" external targets"), data.total, '/cgi-bin/koha/opac-external-search.pl?q=' + escape( querystring ) );
285	} );	323	} );
286	[% END %]	324	[% END %]
		325
287	[% END %]	326	[% END %]
288		327
289	[% IF ( TagsInputEnabled && loggedinusername ) %]	328	[% IF ( TagsInputEnabled && loggedinusername ) %]




  xmlns:marc="http://www.loc.gov/MARC21/slim"
  xmlns:items="http://www.koha-community.org/items"
  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
  xmlns="http://www.w3.org/1999/xhtml"
  exclude-result-prefixes="marc items">
    <xsl:import href="MARC21slimUtils.xsl"/>
    <xsl:output method = "html" indent="yes" omit-xml-declaration = "yes" encoding="UTF-8"/>
    <xsl:key name="item-by-status" match="items:item" use="items:status"/>
    <xsl:key name="item-by-status-and-branch" match="items:item" use="concat(items:status, ' ', items:homebranch)"/>
    <xsl:param name="showAvailability" select="true()"/>

    <xsl:template match="/">
            <xsl:apply-templates/>

                            </xsl:for-each>
                            </span>
                        </xsl:if>
                        <xsl:if test="$showAvailability">
                        <span class="results_summary availability">
                        <span class="label">Availability: </span>
                        <xsl:choose>

                            <xsl:when test="string-length($AlternateHoldingsField)=3 and marc:datafield[@tag=$AlternateHoldingsField]">
                            <xsl:variable name="AlternateHoldingsCount" select="count(marc:datafield[@tag=$AlternateHoldingsField])"/>
                            <xsl:for-each select="marc:datafield[@tag=$AlternateHoldingsField][1]">
                                <xsl:call-template name="subfieldSelect">
                                    <xsl:with-param name="codes"><xsl:value-of select="$AlternateHoldingsSubfields"/></xsl:with-param>
                                    <xsl:with-param name="delimeter"><xsl:value-of select="$AlternateHoldingsSeparator"/></xsl:with-param>
                                </xsl:call-template>

                       <xsl:text>). </xsl:text>                   </span>
                   </xsl:if>
               </span>
               </xsl:if>
    <xsl:choose>
        <xsl:when test="($OPACItemLocation='location' or $OPACItemLocation='ccode') and (count(key('item-by-status', 'available'))!=0 or count(key('item-by-status', 'reference'))!=0)">
            <span class="results_summary" id="location">

Lines 1-6 Link Here

(-)a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slimUtils.xsl (-1 / +1 lines)
1	<?xml version='1.0'?>	1	<?xml version='1.0'?>
2	<!DOCTYPE stylesheet [<!ENTITY nbsp " " >]>	2	<!DOCTYPE stylesheet [<!ENTITY nbsp " " >]>
3	<xsl:stylesheet version="1.0" xmlns:marc="http://www.loc.gov/MARC21/slim" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">	3	<xsl:stylesheet version="1.0" xmlns:marc="http://www.loc.gov/MARC21/slim" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml">
4	<xsl:template name="datafield">	4	<xsl:template name="datafield">
5	<xsl:param name="tag"/>	5	<xsl:param name="tag"/>
6	<xsl:param name="ind1"><xsl:text> </xsl:text></xsl:param>	6	<xsl:param name="ind1"><xsl:text> </xsl:text></xsl:param>




  xmlns:marc="http://www.loc.gov/MARC21/slim"
  xmlns:items="http://www.koha-community.org/items"
  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
  xmlns="http://www.w3.org/1999/xhtml"
  exclude-result-prefixes="marc items">

<xsl:import href="UNIMARCslimUtils.xsl"/>
<xsl:output method = "html" indent="yes" omit-xml-declaration = "yes" encoding="UTF-8"/>
<xsl:key name="item-by-status" match="items:item" use="items:status"/>
<xsl:key name="item-by-status-and-branch" match="items:item" use="concat(items:status, ' ', items:homebranch)"/>
<xsl:param name="showAvailability" select="true()"/>

<xsl:template match="/">
  <xsl:apply-templates/>


  <xsl:call-template name="tag_215" />

  <xsl:if test="$showAvailability">
  <span class="results_summary availability">
    <span class="label">Availability: </span>
    <xsl:choose>

      </span>
    </xsl:if>
  </span>
  </xsl:if>

</xsl:template>





#!/usr/bin/perl

# Copyright 2013 ByWater Solutions
#
# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# Koha is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with Koha; if not, see <http://www.gnu.org/licenses>.

use Modern::Perl;

use CGI;

use C4::Auth qw(:DEFAULT get_session);
use C4::Output;
use C4::Search qw( GetExternalSearchTargets );
use C4::XSLT qw( XSLTGetFilename );

my $cgi = new CGI;

# Getting the template and auth
my ($template, $loggedinuser, $cookie)
= get_template_and_user({template_name => "opac-external-search.tmpl",
                                query => $cgi,
                                type => "opac",
                                authnotrequired => 1,
                                flagsrequired => {borrowers => 1},
                                debug => 1,
                                });

$template->{VARS}->{q} = $cgi->param('q');
$template->{VARS}->{limit} = C4::Context->preference('OPACnumSearchResults') || 20;
$template->{VARS}->{OPACnumSearchResults} = C4::Context->preference('OPACnumSearchResults') || 20;
$template->{VARS}->{external_search_targets} = GetExternalSearchTargets( C4::Context->userenv ? C4::Context->userenv->{branch} : '' );

my @xsltResultStylesheets;
my @xsltDetailStylesheets;

foreach my $syntax ( qw( MARC21 UNIMARC NORMARC ) ) {
    if ( XSLTGetFilename( $syntax, 'OPACXSLTResultsDisplay' ) =~ m,/opac-tmpl/.*|^https:?.*, ) {
        push @xsltResultStylesheets, { syntax => $syntax, url => $& };
    }

    if ( XSLTGetFilename( $syntax, 'OPACXSLTDetailsDisplay' ) =~ m,/opac-tmpl/.*|^https:?.*, ) {
        push @xsltDetailStylesheets, { syntax => $syntax, url => $& };
    }
}

$template->{VARS}->{xslt_result_stylesheets} = \@xsltResultStylesheets;
$template->{VARS}->{xslt_detail_stylesheets} = \@xsltDetailStylesheets;

output_html_with_http_headers $cgi, $cookie, $template->output;

Lines 74-79 if ( $branch_group_limit ) { Link Here

(-)a/opac/opac-search.pl (-4 / +8 lines)
74	-name => 'multibranchlimit',	74	-name => 'multibranchlimit',
75	-values => substr($branch_group_limit, 17)	75	-values => substr($branch_group_limit, 17)
76	);	76	);
		77	} elsif ( $branch_group_limit eq '@overdrive' ) {
		78	print $cgi->redirect( '/cgi-bin/koha/opac-overdrive-search.pl?q=' . join( '+', $cgi->param( 'q' ) ) );
		79	exit;
77	} else {	80	} else {
78	$cgi->append(	81	$cgi->append(
79	-name => 'limit',	82	-name => 'limit',
Lines 879-888 $template->{VARS}->{IDreamBooksReviews} = C4::Context->preference('IDreamBooksRe Link Here
879	$template->{VARS}->{IDreamBooksReadometer} = C4::Context->preference('IDreamBooksReadometer');	882	$template->{VARS}->{IDreamBooksReadometer} = C4::Context->preference('IDreamBooksReadometer');
880	$template->{VARS}->{IDreamBooksResults} = C4::Context->preference('IDreamBooksResults');	883	$template->{VARS}->{IDreamBooksResults} = C4::Context->preference('IDreamBooksResults');
881		884
882	if ($offset == 0 && IsOverDriveEnabled()) {	885	$template->{VARS}->{OPACSearchExternalTargets} = C4::Context->preference('OPACSearchExternalTargets');
883	$template->param(OverDriveEnabled => 1);	886	$template->{VARS}->{external_search_targets} = GetExternalSearchTargets( C4::Context->userenv ? C4::Context->userenv->{branch} : '' );
884	$template->param(OverDriveLibraryID => C4::Context->preference('OverDriveLibraryID'));	887
885	}	888	$template->{VARS}->{OverDriveLibraryID} = C4::Context->preference('OverDriveLibraryID');
		889	$template->{VARS}->{OverDriveEnabled} = ($offset == 0 && IsOverDriveEnabled());
886		890
887	$template->param( borrowernumber => $borrowernumber);	891	$template->param( borrowernumber => $borrowernumber);
888	output_with_http_headers $cgi, $cookie, $template->output, $content_type;	892	output_with_http_headers $cgi, $cookie, $template->output, $content_type;




#!/usr/bin/perl

# Copyright 2013 ByWater Solutions
#
# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# Koha is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with Koha; if not, see <http://www.gnu.org/licenses>.

=head1 NAME

svc/pazpar2_init: Initialize a Pazpar2 session

=head1 SYNOPSIS

svc/pazpar2_init -> ../pazpar2/search.pz2?command=init&...

=head1 DESCRIPTION

This services connects to pazpar2 and authenticates connections on behalf of
client-side search code. The proxy is necessary to prevent exposing
authentication information.

=cut

use strict;
use warnings;

use CGI qw(-oldstyle_urls);
use HTTP::Request::Common;
use JSON;
use URI;
use XML::Simple;

use C4::Context;
use C4::Search;
use C4::Output;

my $dbh = C4::Context->dbh;
my $query = new CGI;

my %init_opts;

my $targets = GetExternalSearchTargets( C4::Context->userenv ? C4::Context->userenv->{branch} : '' );

foreach my $target ( @$targets ) {
    my $target_url = $target->{'host'} . ':' . $target->{'port'} . '/' . $target->{'db'};
    $init_opts{ 'pz:name[' . $target_url . ']' } = $target->{'name'};
    $init_opts{ 'pz:queryencoding[' . $target_url . ']' } = $target->{'encoding'};
    $init_opts{ 'pz:xslt[' . $target_url . ']' } = lc( $target->{'syntax'} ) . '-work-groups.xsl';
    $init_opts{ 'pz:requestsyntax[' . $target_url . ']' } = $target->{'syntax'};
    $init_opts{ 'pz:nativesyntax[' . $target_url . ']' } = 'iso2709';

    if ( $target->{'userid'} ) {
        if ( $target->{'password'} ) {
            $init_opts{ 'pz:authentication[' . $target_url . ']' } = $target->{'userid'} . '/' . $target->{'password'};
        } else {
            $init_opts{ 'pz:authentication[' . $target_url . ']' } = $target->{'userid'};
        }
    }
}

my $uri = 'http://' . C4::Context->preference( 'OPACBaseURL' ) . "/pazpar2/search.pz2";

my $request = HTTP::Request::Common::POST( $uri, [ command => 'init', %init_opts ] );

my $ua = LWP::UserAgent->new( "Koha " . C4::Context->KOHAVERSION );

my $response = $ua->request( $request ) ;
if ( !$response->is_success ) {
    print $query->header(
        -status => '500 Internal Server Error'
    );

    warn "Pazpar2 init failed: " . $response->message;
    my $content = to_json({
        error => 'Could not connect to Pazpar2',
    });
    output_with_http_headers $query, undef, $content, 'json', '500 Internal Server Error';

    exit;
} else {
    my $xs = XML::Simple->new;
    my $data = $xs->XMLin( $response->content );

    my $content = to_json({
        sessionID => $data->{'session'}
    });
    output_with_http_headers $query, undef, $content, 'json', '200 OK';
}




  "__INSTALL_ZEBRA__" => 'yes',
  "__INSTALL_SRU__" => 'yes',
  "__INSTALL_PAZPAR2__" => 'no',
  "__PAZPAR2_TOGGLE_HTTPD_PRE__" => '<IfDefine PAZPAR2_IS_DISABLED>',
  "__PAZPAR2_TOGGLE_HTTPD_POST__" => '</IfDefine>',
  "__AUTH_INDEX_MODE__" => 'grs1',
  "__BIB_INDEX_MODE__" => 'grs1',
  "__RUN_DATABASE_TESTS__" => 'no',

# munge commenting out the PazPar2 mergeserver
# entry in koha-conf.xml if necessary
if ($configuration{'__INSTALL_PAZPAR2__'} eq 'yes') {
    $configuration{'__PAZPAR2_TOGGLE_HTTPD_PRE__'} = '';
    $configuration{'__PAZPAR2_TOGGLE_HTTPD_POST__'} = '';
}

$fname = $ARGV[0];

Lines 6-12 Link Here

(-)a/t/XSLT.t (-16 / +79 lines)
6	use strict;	6	use strict;
7	use warnings;	7	use warnings;
8		8
9	use Test::More tests => 8;	9	use C4::Context;
		10	use C4::Templates;
		11	use Test::More tests => 13;
		12	use Test::MockModule;
		13	use File::Basename qw/dirname/;
10	use File::Temp;	14	use File::Temp;
11	use File::Path qw/make_path/;	15	use File::Path qw/make_path/;
12		16
Lines 14-49 BEGIN { Link Here
14	use_ok('C4::XSLT');	18	use_ok('C4::XSLT');
15	}	19	}
16		20
17	my $dir = File::Temp->newdir();	21	my $opacdir = File::Temp->newdir();
		22	my $staffdir = File::Temp->newdir();
18	my @themes = ('prog', 'test');	23	my @themes = ('prog', 'test');
19	my @langs = ('en', 'es-ES');	24	my @langs = ('en', 'es-ES');
20		25
		26	sub make_test_file {
		27	my ( $filename, $contents ) = @_;
		28
		29	make_path(dirname($filename));
		30	open my $fh, '>', $filename or die "Could not create test file: $filename";
		31	print $fh $contents;
		32	close $fh;
		33	}
		34
21	# create temporary files to be tested later	35	# create temporary files to be tested later
22	foreach my $theme (@themes) {	36	foreach my $theme (@themes) {
23	foreach my $lang (@langs) {	37	foreach my $lang (@langs) {
24	make_path("$dir/$theme/$lang/xslt");	38	foreach my $dir ($opacdir, $staffdir) {
25	open my $fh, '>', "$dir/$theme/$lang/xslt/my_file.xslt";	39	make_test_file( "$dir/$theme/$lang/xslt/my_file.xslt", "Theme $theme, language $lang" );
26	print $fh "Theme $theme, language $lang";	40	make_test_file( "$dir/$theme/$lang/xslt/MARC21slim2intranetDetail.xsl", "Theme $theme, language $lang, MARC21slim2intranetDetail" );
27	close $fh;	41	make_test_file( "$dir/$theme/$lang/xslt/test_en.xsl", "Theme $theme, language $lang, test_en" );
		42	make_test_file( "$dir/$theme/$lang/xslt/UNIMARCslim2OPACDetail.xsl", "Theme $theme, language $lang, UNIMARCslim2OPACDetail" );
		43	make_test_file( "$dir/$theme/$lang/xslt/nondefault_test.xsl", "Theme $theme, language $lang, nondefault_test" );
		44	make_test_file( "$dir/$theme/$lang/xslt/MARC21slim2OPACResults.xsl", "Theme $theme, language $lang, MARC21slim2OPACResults" );
		45	}
28	}	46	}
29	}	47	}
30		48
31	sub find_and_slurp {	49	sub find_and_slurp_default {
32	my ($dir, $theme, $lang) = @_;	50	my ($dir, $theme, $lang) = @_;
33		51
34	my $filename = C4::XSLT::_get_best_default_xslt_filename($dir, $theme, $lang, 'my_file.xslt');	52	my $filename = C4::XSLT::_get_best_default_xslt_filename($dir, $theme, $lang, 'my_file.xslt');
35	open my $fh, '<', $filename;	53	open my $fh, '<', $filename or return "Could not open: $filename";
36	my $str = <$fh>;	54	my $str = <$fh>;
37	close $fh;	55	close $fh;
38	return $str;	56	return $str;
39	}	57	}
40		58
		59	sub find_and_slurp {
		60	my ($marcflavour, $xslsyspref) = @_;
		61
		62	my $filename = C4::XSLT::XSLTGetFilename( $marcflavour, $xslsyspref );
		63	open my $fh, '<', $filename or return "Could not open: $filename";
		64	my $str = <$fh>;
		65	close $fh;
		66	return $str;
		67	}
		68
		69	my $module_context = new Test::MockModule('C4::Context');
		70	$module_context->mock(
		71	'config',
		72	sub {
		73	my ( $self, $var ) = @_;
		74	my %predefs = (
		75	opachtdocs => $opacdir,
		76	intrahtdocs => $staffdir,
		77	);
		78
		79	return $predefs{$var} \|\| $module_context->original('config')->(@_);
		80	}
		81	);
		82	$module_context->mock(
		83	'preference',
		84	sub {
		85	my ( $self, $var ) = @_;
		86	my %predefs = (
		87	template => 'prog',
		88	marcflavour => 'MARC21',
		89	opacthemes => 'test',
		90	XSLTDetailsDisplay => 'default',
		91	XSLTResultsDisplay => "$staffdir/prog/en/xslt/test_en.xsl",
		92	OPACXSLTDetailsDisplay => "$opacdir/test/en/xslt/nondefault_test.xsl",
		93	OPACXSLTResultsDisplay => '"default"',
		94	);
		95
		96	return $predefs{$var} \|\| $module_context->original('preference')->(@_);
		97	}
		98	);
		99
41	# These tests verify that we're finding the right XSLT file when present,	100	# These tests verify that we're finding the right XSLT file when present,
42	# and falling back to the right XSLT file when an exact match is not present.	101	# and falling back to the right XSLT file when an exact match is not present.
43	is(find_and_slurp($dir, 'test', 'en' ), 'Theme test, language en', 'Found test/en');	102	is(find_and_slurp_default($opacdir, 'test', 'en' ), 'Theme test, language en', 'Found test/en');
44	is(find_and_slurp($dir, 'test', 'es-ES'), 'Theme test, language es-ES', 'Found test/es-ES');	103	is(find_and_slurp_default($opacdir, 'test', 'es-ES'), 'Theme test, language es-ES', 'Found test/es-ES');
45	is(find_and_slurp($dir, 'prog', 'en', ), 'Theme prog, language en', 'Found test/en');	104	is(find_and_slurp_default($opacdir, 'prog', 'en', ), 'Theme prog, language en', 'Found test/en');
46	is(find_and_slurp($dir, 'prog', 'es-ES'), 'Theme prog, language es-ES', 'Found test/es-ES');	105	is(find_and_slurp_default($opacdir, 'prog', 'es-ES'), 'Theme prog, language es-ES', 'Found test/es-ES');
47	is(find_and_slurp($dir, 'test', 'fr-FR'), 'Theme test, language en', 'Fell back to test/en for test/fr-FR');	106	is(find_and_slurp_default($opacdir, 'test', 'fr-FR'), 'Theme test, language en', 'Fell back to test/en for test/fr-FR');
48	is(find_and_slurp($dir, 'nope', 'es-ES'), 'Theme prog, language es-ES', 'Fell back to prog/es-ES for nope/es-ES');	107	is(find_and_slurp_default($opacdir, 'nope', 'es-ES'), 'Theme prog, language es-ES', 'Fell back to prog/es-ES for nope/es-ES');
49	is(find_and_slurp($dir, 'nope', 'fr-FR'), 'Theme prog, language en', 'Fell back to prog/en for nope/fr-FR');	108	is(find_and_slurp_default($opacdir, 'nope', 'fr-FR'), 'Theme prog, language en', 'Fell back to prog/en for nope/fr-FR');
		109	is(find_and_slurp('MARC21', 'XSLTDetailsDisplay'), 'Theme prog, language en, MARC21slim2intranetDetail', 'Used default for staff/details');
		110	is(find_and_slurp('MARC21', 'XSLTResultsDisplay'), 'Theme prog, language en, test_en', 'Used non-default with langcode for staff/results');
		111	is(find_and_slurp('MARC21', 'OPACXSLTDetailsDisplay'), 'Theme test, language en, nondefault_test', 'not-prog: Used non-default for local marcflavour and opac/details');
		112	is(find_and_slurp('UNIMARC', 'OPACXSLTDetailsDisplay'), 'Theme test, language en, UNIMARCslim2OPACDetail', 'not-prog: Used default for non-local marcflavour and opac/details');
		113	is(find_and_slurp('MARC21', 'OPACXSLTResultsDisplay'), 'Theme test, language en, MARC21slim2OPACResults', 'not-prog: Used "default" for opac/results');
50	-

Return to bug 10486

Lines 7953-7958 if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) { Link Here

(-)a/installer/data/mysql/updatedatabase.pl (+33 lines)
7953	SetVersion($DBversion);	7953	SetVersion($DBversion);
7954	}	7954	}
7955		7955
		7956	$DBversion = "3.13.00.XXX";
		7957	if(CheckVersion($DBversion)) {
		7958	$dbh->do(
		7959	"INSERT IGNORE INTO systempreferences (variable,value,explanation,options,type) VALUES('OPACSearchExternalTargets','0','Whether to search external targets in the OPAC','','YesNo')"
		7960	);
		7961	$dbh->do( q{
		7962	CREATE TABLE `external_targets` (
		7963	`target_id` int(11) NOT NULL AUTO_INCREMENT,
		7964	`host` varchar(128) NOT NULL,
		7965	`port` int(11) NOT NULL,
		7966	`db` varchar(64) NOT NULL,
		7967	`userid` varchar(64) DEFAULT '',
		7968	`password` varchar(64) DEFAULT '',
		7969	`name` varchar(64) NOT NULL,
		7970	`syntax` varchar(64) NOT NULL,
		7971	`encoding` varchar(16) DEFAULT 'MARC-8',
		7972	PRIMARY KEY (`target_id`)
		7973	) ENGINE=InnoDB AUTO_INCREMENT=21 DEFAULT CHARSET=utf8
		7974	} );
		7975	$dbh->do( q{
		7976	CREATE TABLE `external_target_restrictions` (
		7977	`branchcode` varchar(10) NOT NULL,
		7978	`target_id` int(11) NOT NULL,
		7979	KEY `branchcode` (`branchcode`),
		7980	KEY `target_id` (`target_id`),
		7981	CONSTRAINT `external_target_restrictions_ibfk_1` FOREIGN KEY (`branchcode`) REFERENCES `branches` (`branchcode`) ON DELETE CASCADE,
		7982	CONSTRAINT `external_target_restrictions_ibfk_2` FOREIGN KEY (`target_id`) REFERENCES `external_targets` (`target_id`) ON DELETE CASCADE
		7983	) ENGINE=InnoDB DEFAULT CHARSET=utf8
		7984	} );
		7985	print "Upgrade to $DBversion done (Bug 10486 - Allow external Z39.50 targets to be searched from the OPAC)\n";
		7986	SetVersion($DBversion);
		7987	}
		7988
7956	=head1 FUNCTIONS	7989	=head1 FUNCTIONS
7957		7990
7958	=head2 TableExists($table)	7991	=head2 TableExists($table)

Lines 2142-2148 td img { Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/css/opac.css (-1 / +20 lines)
2142	margin: 0;	2142	margin: 0;
2143	padding: 0;	2143	padding: 0;
2144	}	2144	}
2145	#overdrive-results {	2145	#overdrive-results, #pazpar2-results {
2146	font-weight: bold;	2146	font-weight: bold;
2147	padding-left: 1em;	2147	padding-left: 1em;
2148	}	2148	}
Lines 2278-2283 a.reviewlink:visited { Link Here
2278	-moz-box-shadow: 0px 1px 1px 0px rgba(0, 0, 0, 0.2);	2278	-moz-box-shadow: 0px 1px 1px 0px rgba(0, 0, 0, 0.2);
2279	box-shadow: 0px 1px 1px 0px rgba(0, 0, 0, 0.2);	2279	box-shadow: 0px 1px 1px 0px rgba(0, 0, 0, 0.2);
2280	}	2280	}
		2281	.sourcecol {
		2282	vertical-align: top;
		2283	width: 100px;
		2284	}
		2285	.notesrow label {
		2286	font-weight: bold;
		2287	}
		2288	.notesrow span {
		2289	display: block;
		2290	}
		2291	.notesrow textarea {
		2292	width: 100%;
		2293	}
		2294	#modal-overlay {
		2295	background-color: white;
		2296	border-radius: 5px;
		2297	max-width: 75%;
		2298	padding: 15px;
		2299	}
2281	@media only screen and (min-width: 0px) and (max-width: 304px) {	2300	@media only screen and (min-width: 0px) and (max-width: 304px) {
2282	/* Screens bewteen 0 and 304 pixels wide */	2301	/* Screens bewteen 0 and 304 pixels wide */
2283	#oh:after {	2302	#oh:after {

Lines 72-77 This module provides searching functions for Koha's bibliographic databases Link Here

(-)a/C4/Search.pm (+30 lines)
72	&GetDistinctValues	72	&GetDistinctValues
73	&enabled_staff_search_views	73	&enabled_staff_search_views
74	&PurgeSearchHistory	74	&PurgeSearchHistory
		75	&GetExternalSearchTargets
75	);	76	);
76		77
77	# make all your functions, whether exported or not;	78	# make all your functions, whether exported or not;
Lines 2379-2384 sub _ZOOM_event_loop { Link Here
2379	}	2380	}
2380	}	2381	}
2381		2382
		2383	=head2 GetExternalSearchTargets
		2384
		2385	Returns the list of Z39.50 servers that are marked for search in the OPAC using
		2386	Pazpar2.
		2387
		2388	=cut
		2389
		2390	sub GetExternalSearchTargets {
		2391	my ( $branchcode ) = @_;
		2392
		2393	if ( $branchcode ) {
		2394	return C4::Context->dbh->selectall_arrayref( q{
		2395	SELECT * FROM external_targets et
		2396	LEFT JOIN external_target_restrictions etr
		2397	ON (etr.target_id = et.target_id and etr.branchcode = ?)
		2398	WHERE etr.target_id IS NULL
		2399	ORDER BY et.name
		2400	}, { Slice => {} }, $branchcode );
		2401	} else {
		2402	return C4::Context->dbh->selectall_arrayref( q{
		2403	SELECT * FROM external_targets et
		2404	LEFT JOIN external_target_restrictions etr USING (target_id)
		2405	GROUP by et.target_id
		2406	HAVING branchcode IS NULL
		2407	ORDER BY et.name
		2408	}, { Slice => {} } );
		2409	}
		2410	}
		2411
2382		2412
2383	END { } # module clean-up code here (global destructor)	2413	END { } # module clean-up code here (global destructor)
2384		2414

Lines 42-47 BEGIN { Link Here

(-)a/C4/XSLT.pm (-7 / +17 lines)
42	$VERSION = 3.07.00.049;	42	$VERSION = 3.07.00.049;
43	@ISA = qw(Exporter);	43	@ISA = qw(Exporter);
44	@EXPORT = qw(	44	@EXPORT = qw(
		45	&XSLTGetFilename
45	&XSLTParse4Display	46	&XSLTParse4Display
46	&GetURI	47	&GetURI
47	);	48	);
Lines 156-164 sub _get_best_default_xslt_filename { Link Here
156	return $xslfilename;	157	return $xslfilename;
157	}	158	}
158		159
159	sub XSLTParse4Display {	160	sub XSLTGetFilename {
160	my ( $biblionumber, $orig_record, $xslsyspref, $fixamps, $hidden_items ) = @_;	161	my ( $marcflavour, $xslsyspref ) = @_;
161	my $xslfilename = C4::Context->preference($xslsyspref);	162
		163	my $xslfilename = $marcflavour eq C4::Context->preference('marcflavour') ? C4::Context->preference($xslsyspref) : 'default';
162	if ( $xslfilename =~ /^\s"?default"?\s$/i ) {	164	if ( $xslfilename =~ /^\s"?default"?\s$/i ) {
163	my $htdocs;	165	my $htdocs;
164	my $theme;	166	my $theme;
Lines 167-188 sub XSLTParse4Display { Link Here
167	if ($xslsyspref eq "XSLTDetailsDisplay") {	169	if ($xslsyspref eq "XSLTDetailsDisplay") {
168	$htdocs = C4::Context->config('intrahtdocs');	170	$htdocs = C4::Context->config('intrahtdocs');
169	$theme = C4::Context->preference("template");	171	$theme = C4::Context->preference("template");
170	$xslfile = C4::Context->preference('marcflavour') .	172	$xslfile = $marcflavour .
171	"slim2intranetDetail.xsl";	173	"slim2intranetDetail.xsl";
172	} elsif ($xslsyspref eq "XSLTResultsDisplay") {	174	} elsif ($xslsyspref eq "XSLTResultsDisplay") {
173	$htdocs = C4::Context->config('intrahtdocs');	175	$htdocs = C4::Context->config('intrahtdocs');
174	$theme = C4::Context->preference("template");	176	$theme = C4::Context->preference("template");
175	$xslfile = C4::Context->preference('marcflavour') .	177	$xslfile = $marcflavour .
176	"slim2intranetResults.xsl";	178	"slim2intranetResults.xsl";
177	} elsif ($xslsyspref eq "OPACXSLTDetailsDisplay") {	179	} elsif ($xslsyspref eq "OPACXSLTDetailsDisplay") {
178	$htdocs = C4::Context->config('opachtdocs');	180	$htdocs = C4::Context->config('opachtdocs');
179	$theme = C4::Context->preference("opacthemes");	181	$theme = C4::Context->preference("opacthemes");
180	$xslfile = C4::Context->preference('marcflavour') .	182	$xslfile = $marcflavour .
181	"slim2OPACDetail.xsl";	183	"slim2OPACDetail.xsl";
182	} elsif ($xslsyspref eq "OPACXSLTResultsDisplay") {	184	} elsif ($xslsyspref eq "OPACXSLTResultsDisplay") {
183	$htdocs = C4::Context->config('opachtdocs');	185	$htdocs = C4::Context->config('opachtdocs');
184	$theme = C4::Context->preference("opacthemes");	186	$theme = C4::Context->preference("opacthemes");
185	$xslfile = C4::Context->preference('marcflavour') .	187	$xslfile = $marcflavour .
186	"slim2OPACResults.xsl";	188	"slim2OPACResults.xsl";
187	}	189	}
188	$xslfilename = _get_best_default_xslt_filename($htdocs, $theme, $lang, $xslfile);	190	$xslfilename = _get_best_default_xslt_filename($htdocs, $theme, $lang, $xslfile);
Lines 193-198 sub XSLTParse4Display { Link Here
193	$xslfilename =~ s/\{langcode\}/$lang/;	195	$xslfilename =~ s/\{langcode\}/$lang/;
194	}	196	}
195		197
		198	return $xslfilename;
		199	}
		200
		201	sub XSLTParse4Display {
		202	my ( $biblionumber, $orig_record, $xslsyspref, $fixamps, $hidden_items ) = @_;
		203
		204	my $xslfilename = XSLTGetFilename( C4::Context->preference( 'marcflavour' ), $xslsyspref );
		205
196	# grab the XML, run it through our stylesheet, push it out to the browser	206	# grab the XML, run it through our stylesheet, push it out to the browser
197	my $record = transformMARCXML4XSLT($biblionumber, $orig_record);	207	my $record = transformMARCXML4XSLT($biblionumber, $orig_record);
198	#return $record->as_formatted();	208	#return $record->as_formatted();

Line 0 Link Here

(-)a/admin/external_targets.pl (+125 lines)
		1	#!/usr/bin/perl
		2	#
		3	# Copyright 2013 Jesse Weaver
		4	#
		5	# This file is part of Koha.
		6	#
		7	# Koha is free software; you can redistribute it and/or modify it under the
		8	# terms of the GNU General Public License as published by the Free Software
		9	# Foundation; either version 2 of the License, or (at your option) any later
		10	# version.
		11	#
		12	# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
		13	# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
		14	# A PARTICULAR PURPOSE. See the GNU General Public License for more details.
		15	#
		16	# You should have received a copy of the GNU General Public License along
		17	# with Koha; if not, write to the Free Software Foundation, Inc.,
		18	# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
		19	#
		20
		21	use Modern::Perl '2010';
		22
		23	use CGI;
		24
		25	use C4::Auth;
		26	use C4::Context;
		27	use C4::Branch;
		28	use C4::Output;
		29	use URI::Escape;
		30
		31	our $dbh = C4::Context->dbh;
		32	our $input = new CGI;
		33
		34	our ( $template, $loggedinuser, $cookie ) = get_template_and_user( {
		35	template_name => "admin/external-targets.tt",
		36	query => $input,
		37	type => "intranet",
		38	authnotrequired => 0,
		39	flagsrequired => {parameters => 'parameters_remaining_permissions'},
		40	debug => 1,
		41	} );
		42
		43	our $op = $input->param( 'op' ) // 'show';
		44	$template->{VARS}->{op} = $op;
		45
		46	given ( $op ) {
		47	when ( 'show' ) { show_external_targets(); }
		48	when ( 'add' ) { show_edit_form(); }
		49	when ( 'edit' ) { show_edit_form(); }
		50	when ( 'save' ) { save_target(); }
		51	when ( 'delete' ) { delete_target(); }
		52	}
		53
		54	output_html_with_http_headers $input, $cookie, $template->output;
		55
		56	sub show_external_targets {
		57	$template->{VARS}->{saved_id} = $input->param( 'saved_id' );
		58	$template->{VARS}->{deleted_name} = $input->param( 'deleted_name' );
		59	$template->{VARS}->{targets} = $dbh->selectall_arrayref( q{
		60	SELECT *
		61	FROM external_targets
		62	}, { Slice => {} } );
		63	}
		64
65	sub show_edit_form {
66	$template->{VARS}->{branches} = GetBranchesLoop( undef, 0 );
67	$template->{VARS}->{syntaxes} = [ 'MARC21', 'UNIMARC', 'NORMARC' ];
68	$template->{VARS}->{encodings} = { 'utf8' => 'UTF-8', 'marc8' => 'MARC-8' };
69
70	my $target_id;
71	if ( $target_id = $input->param( 'target_id' ) ) {
72	$template->{VARS}->{target} = $dbh->selectrow_hashref( q{ SELECT * FROM external_targets WHERE target_id = ? }, {}, $target_id );
73
74	my $available_branches = $dbh->selectall_hashref( q{ SELECT * FROM external_target_restrictions WHERE target_id = ? }, 'branchcode', {}, $target_id );
75
76	foreach my $branch ( @{ $template->{VARS}->{branches} } ) {
77	$branch->{selected} = 1 if ( $available_branches->{$branch->{branchcode}} );
78	}
79	}
80	}
81
82	sub save_target {
83	my $target_id;
84	if ( $target_id = $input->param( 'target_id' ) ) {
85	$dbh->do( q{
86	UPDATE external_targets
87	SET name = ?, host = ?, port = ?, db = ?, userid = ?, password = ?, syntax = ?, encoding = ?
88	WHERE target_id = ?
89	}, {}, map { $input->param( $_ ) // '' } qw( name host port db userid password syntax encoding target_id ) );
90	} else {
91	$dbh->do( q{
92	INSERT
93	INTO external_targets(name, host, port, db, userid, password, syntax, encoding)
94	VALUES(?, ?, ?, ?, ?, ?, ?, ?)
95	}, {}, map { $input->param( $_ ) // '' } qw( name host port db userid password syntax encoding ) );
96	$target_id = $dbh->last_insert_id( undef, undef, undef, undef );
97	}
98
99	$dbh->do( q{
100	DELETE
101	FROM external_target_restrictions
102	WHERE target_id = ?
103	}, {}, $target_id );
104
105	foreach my $branchcode ( $input->param( 'branch' ) ) {
106	$dbh->do( q{
107	INSERT
108	INTO external_target_restrictions(branchcode, target_id)
109	VALUES(?, ?)
110	}, {}, $branchcode, $target_id );
111	}
112
113	print $input->redirect( '/cgi-bin/koha/admin/external_targets.pl?saved_id=' . $target_id );
114	exit;
115	}
116
117	sub delete_target {
118	my ($target_id, $target);
119
120	return unless ( $target_id = $input->param( 'target_id' ) and $target = $dbh->selectrow_hashref( q{ SELECT * FROM external_targets WHERE target_id = ? }, {}, $target_id ) );
121
122	$dbh->do( q{ DELETE FROM external_targets WHERE target_id = ? }, {}, $target_id );
123
124	print $input->redirect( '/cgi-bin/koha/admin/external_targets.pl?deleted_name=' . uri_escape( $target->{'name'} ) );
125	}

Lines 19-37 Link Here

(-)a/etc/koha-conf.xml (-13 lines)
19	<listen id="publicserver" >tcp:@:__ZEBRA_SRU_BIBLIOS_PORT__</listen>	19	<listen id="publicserver" >tcp:@:__ZEBRA_SRU_BIBLIOS_PORT__</listen>
20	-->	20	-->
21		21
22	<!-- Settings for special biblio server instance for PazPar2.
23	Because PazPar2 only connects to a Z39.50 server using TCP/IP,
24	it cannot use the Unix-domain socket that biblioserver uses.
25	Therefore, a custom server is defined. -->
26	__PAZPAR2_TOGGLE_XML_PRE__
27	<listen id="mergeserver">tcp:@:__MERGE_SERVER_PORT__</listen>
28	<server id="mergeserver" listenref="mergeserver">
29	<directory>__ZEBRA_DATA_DIR__/biblios</directory>
30	<config>__ZEBRA_CONF_DIR__/__ZEBRA_BIB_CFG__</config>
31	<cql2rpn>__ZEBRA_CONF_DIR__/pqf.properties</cql2rpn>
32	</server>
33	__PAZPAR2_TOGGLE_XML_POST__
34
35	<!-- BIBLIOGRAPHIC RECORDS -->	22	<!-- BIBLIOGRAPHIC RECORDS -->
36	<server id="biblioserver" listenref="biblioserver">	23	<server id="biblioserver" listenref="biblioserver">
37	<directory>__ZEBRA_DATA_DIR__/biblios</directory>	24	<directory>__ZEBRA_DATA_DIR__/biblios</directory>

Line 0 Link Here

(-)a/etc/pazpar2/generic-settings.xml (+21 lines)
	1	<settings target="*">
	2	<!-- This file introduces default settings for pazpar2 -->
	3	<!-- $Id: loc.xml,v 1.2 2007-07-10 13:43:07 adam Exp $ -->
	4
	5	<!-- mapping for unqualified search -->
	6	<set name="pz:cclmap:term" value="u=1016 t=l,r s=al"/>
	7
	8	<!-- field-specific mappings -->
	9
	10	<set name="pz:cclmap:au" value="u=1004 s=al"/>
	11	<set name="pz:cclmap:ti" value="u=4 s=al"/>
	12	<set name="pz:cclmap:su" value="u=21 s=al"/>
	13	<set name="pz:cclmap:isbn" value="u=7"/>
	14	<set name="pz:cclmap:issn" value="u=8"/>
	15	<set name="pz:cclmap:date" value="u=30 r=r"/>
	16
	17	<!-- Retrieval settings -->
	18
	19	<set name="pz:elements" value="F"/>
	20
	21	</settings>

Line 0 Link Here

(-)a/etc/pazpar2/unimarc-work-groups.xsl (+98 lines)
		1	<?xml version="1.0" encoding="UTF-8"?>
		2	<xsl:stylesheet
		3	version="1.0"
		4	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
		5	xmlns:pz="http://www.indexdata.com/pazpar2/1.0"
		6	xmlns:marc="http://www.loc.gov/MARC21/slim">
		7
		8	<xsl:output indent="yes" method="xml" version="1.0" encoding="UTF-8"/>
		9
		10
		11	<xsl:template match="/marc:record">
		12	<pz:record>
		13
		14	<xsl:for-each select="marc:controlfield[@tag='001']">
		15	<pz:metadata type="id">
		16	<xsl:value-of select="."/>
		17	</pz:metadata>
		18	</xsl:for-each>
		19
		20	<!-- -->
		21	<xsl:for-each select="marc:datafield[@tag='020']">
		22	<xsl:if test="marc:subfield[@code='a'] = 'US'">
		23	<pz:metadata type="lccn">
		24	<xsl:value-of select="marc:subfield[@code='b']"/>
		25	</pz:metadata>
		26	</xsl:if>
		27	</xsl:for-each>
		28
		29	<xsl:for-each select="marc:datafield[@tag='010']">
		30	<pz:metadata type="isbn">
		31	<xsl:value-of select="marc:subfield[@code='a']"/>
		32	</pz:metadata>
		33	</xsl:for-each>
		34
		35	<xsl:for-each select="marc:datafield[@tag='011']">
		36	<pz:metadata type="issn">
		37	<xsl:value-of select="marc:subfield[@code='a']"/>
		38	</pz:metadata>
		39	</xsl:for-each>
		40
		41
		42	<xsl:for-each select="marc:datafield[@tag='200']">
		43	<pz:metadata type="work-title">
		44	<xsl:value-of select="marc:subfield[@code='a']"/>
		45	</pz:metadata>
		46	</xsl:for-each>
		47
		48
		49	<!-- Date of Pulbication -->
		50	<xsl:for-each select="marc:datafield[@tag='210']">
		51	<pz:metadata type="date">
		52	<xsl:value-of select="marc:subfield[@code='d']"/>
		53	</pz:metadata>
		54	</xsl:for-each>
		55
		56	<!-- Usmarc 650 maps to unimarc 606 and marc21 653 maps to unimarc 610 -->
		57	<xsl:for-each select="marc:datafield[@tag='606' or @tag='610']">
		58	<pz:metadata type="subject">
		59	<xsl:value-of select="marc:subfield[@code='a']"/>
		60	</pz:metadata>
		61	</xsl:for-each>
		62
		63	<xsl:for-each select="marc:datafield[@tag >= 300 and @tag <= 345]
		64	[@tag != '325']">
65	<pz:metadata type="description">
66	<xsl:value-of select="*/text()"/>
67	</pz:metadata>
68	</xsl:for-each>
69
70
71	<!-- Author : primary, alternative and secondary responsibility (equivalent marc21 tags : 100, 700 -->
72	<xsl:for-each select="marc:datafield[@tag='700' or @tag='701' or @tag='702']">
73	<pz:metadata type="work-author">
74	<xsl:value-of select="marc:subfield[@code='a']"/>
75	<xsl:text>, </xsl:text>
76	<xsl:value-of select="marc:subfield[@code='b']"/>
77	</pz:metadata>
78	</xsl:for-each>
79
80	<!-- Author : marc21 tag 720 maps to unimarc 730
81	<xsl:for-each select="marc:datafield[@tag='730']">
82	<pz:metadata type="author">
83	<xsl:value-of select="marc:subfield[@code='a']"/>
84	</pz:metadata>
85	</xsl:for-each>
86	-->
87
88	<!-- -->
89	<xsl:for-each select="marc:datafield[@tag='856']">
90	<pz:metadata type="url">
91	<xsl:value-of select="marc:subfield[@code='u']"/>
92	</pz:metadata>
93	</xsl:for-each>
94
95	</pz:record>
96	</xsl:template>
97
98	</xsl:stylesheet>

Line 0 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/external-targets.tt (+180 lines)
		1	[% INCLUDE 'doc-head-open.inc' %]
		2	[% IF op == 'show' %]
		3	<title>Koha &rsaquo; Administration &rsaquo; External targets</title>
		4	[% ELSIF op == 'add' %]
		5	<title>Koha &rsaquo; Administration &rsaquo; External targets &rsaquo; Create an external target</title>
		6	[% ELSIF op == 'edit' %]
		7	<title>Koha &rsaquo; Administration &rsaquo; External targets &rsaquo; Editing '[% target.name %]'</title>
		8	[% END %]
		9	[% INCLUDE 'doc-head-close.inc' %]
		10	<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
		11	<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.dataTables.min.js"></script>
		12	[% INCLUDE 'datatables-strings.inc' %]
		13	<script type="text/javascript" src="[% themelang %]/js/datatables.js"></script>
		14	<script type="text/javascript">
		15	//<![CDATA[
		16	$(document).ready(function() {
		17	[% IF ( targets.size ) %]
		18	var dTable = $("#targets").dataTable( $.extend( true, {}, dataTablesDefaults, {
		19	aoColumnDefs: [
		20	{ aTargets: [ 1,2,3,4,5 ], bSortable: false, bSearchable: false },
		21	],
		22	asStripeClasses: [ '', 'highlight' ],
		23	bPaginate: false,
		24	} ) );
		25
		26	[% IF saved_id %]
		27	$( '#targets tr[data-targetid=[% saved_id %]]' ).addClass( 'updated' );
		28	[% END %]
		29
		30	$( '#targets .delete' ).click( function() {
		31	return confirm( _("Are you sure you wish to delete this target?") );
		32	} );
		33	[% END %]
		34	});
		35	//]]>
		36	</script>
		37
		38	</head>
		39	<body id="admin_z3950servers" class="admin">
		40	[% INCLUDE 'header.inc' %]
		41	[% INCLUDE 'cat-search.inc' %]
		42
		43	[% IF op == 'show' %]
		44
		45	<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; External targets</div>
		46
		47	[% ELSIF op == 'add' %]
		48
		49	<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; <a href="/cgi-bin/koha/admin/external_targets.pl">External targets</a> &rsaquo; Create an external target</div>
		50
		51	[% ELSIF op == 'edit' %]
		52
		53	<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; <a href="/cgi-bin/koha/admin/external_targets.pl">External targets</a> &rsaquo; Editing '[% target.name %]'</div>
		54
		55	[% END %]
		56
		57	<div id="doc3" class="yui-t2">
		58	<div id="bd">
		59
		60	<div id="yui-main"><div class="yui-b">
		61
		62	[% IF op == 'show' %]
		63
		64	[% IF deleted_name %]
65	<div class="alert">
66	<p>Deleted target '[% deleted_name %]'</p>
67	</div>
68	[% END %]
69
70	<div id="toolbar" class="btn-toolbar">
71	<a id="newtarget" class="btn btn-small" href="/cgi-bin/koha/admin/external_targets.pl?op=add"><i class="icon-plus"></i> New external target</a>
72	</div>
73
74	<p>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.</p>
75
76	[% IF targets.size %]
77	<table id="targets">
78	<thead><tr><th>Name</th><th>Connection</th><th>Login</th><th>Syntax</th><th>Encoding</th><th> </th><th> </th></tr></thead>
79	<tbody>
80	[% FOREACH target = targets %]
81	<tr data-targetid="[% target.target_id %]">
82	<td>[% target.name %]</td>
83	<td>[% target.host %]:[% target.port %]/[% target.db %]</td>
84	<td>[% IF target.userid %][% target.userid %] / [% IF target.password %]********[% ELSE %]<span class="hint">none</span>[% END %][% ELSE %]<span class="hint">none</span>[% END %]</td>
85	<td>[% target.syntax %]</td>
86	<td>
87	[% IF target.encoding == 'marc8' %]
88	MARC-8
89	[% ELSIF target.encoding == 'utf8' %]
90	UTF-8
91	[% END %]
92	</td>
93	<td><a href="/cgi-bin/koha/admin/external_targets.pl?op=edit&target_id=[% target.target_id %]">Edit</a></td>
94	<td><a class="delete" href="/cgi-bin/koha/admin/external_targets.pl?op=delete&target_id=[% target.target_id %]">Delete</a></td>
95	</tr>
96	[% END %]
97	</tbody>
98	</table>
99	[% ELSE %]
100	<p>No external targets have been defined yet.</p>
101	[% END %]
102
103	[% ELSIF op == 'add' \|\| op == 'edit' %]
104
105	<form action="/cgi-bin/koha/admin/external_targets.pl" method="POST">
106	[% IF op == 'add' %]
107	<h1>Create an external target</h1>
108	[% ELSIF op == 'edit' %]
109	<h1>Editing '[% target.name %]'</h1>
110	[% END %]
111
112	<input type="hidden" name="op" value="save">
113	<input type="hidden" name="target_id" value="[% target.target_id %]">
114
115	<fieldset class="rows">
116	<ol>
117	<li><label for="name">Name:</label> <input type="text" id="name" name="name" value="[% target.name %]" required></li>
118	<li><label for="host">Host:</label> <input type="text" id="host" name="host" value="[% target.host %]" required></li>
119	<li><label for="port">Port:</label> <input type="num" id="port" name="port" value="[% target.port %]" required></li>
120	<li><label for="db">Database:</label> <input type="text" id="db" name="db" value="[% target.db %]" required></li>
121	<li><label for="userid">User:</label> <input type="text" id="userid" name="userid" value="[% target.userid %]"></li>
122	<li><label for="password">Password:</label> <input type="password" id="password" name="password" value="[% target.password %]" autocomplete="off"></li>
123	<li>
124	<label for="syntax">Syntax:</label>
125	<select id="syntax" name="syntax">
126	[% FOREACH syntax = syntaxes %]
127	[% IF syntax == target.syntax %]
128	<option selected>[% syntax %]
129	[% ELSE %]
130	<option>[% syntax %]</option>
131	[% END %]
132	[% END %]
133	</select>
134	</li>
135	<li>
136	<label for="encoding">Encoding:</label>
137	<select id="encoding" name="encoding">
138	[% FOREACH encoding = encodings %]
139	[% IF encoding.key == target.encoding %]
140	<option value="[% encoding.key %]" selected>[% encoding.value %]
141	[% ELSE %]
142	<option value="[% encoding.key %]">[% encoding.value %]</option>
143	[% END %]
144	[% END %]
145	</select>
146	</li>
147	<li>
148	<label>Restricted libraries:</label>
149	<fieldset>
150	<legend>Not available to patrons from:</legend>
151	<p>Only targets with no restrictions will be shown to anonymous (not logged in) users.</p>
152	<ol>
153	[% FOREACH branch = branches %]
154	<li>
155	<label for="branch-[% branch.branchcode %]">[% branch.branchname %]</label>
156	[% IF branch.selected %]
157	<input type="checkbox" id="branch-[% branch.branchcode %]" name="branch" value="[% branch.branchcode %]" checked />
158	[% ELSE %]
159	<input type="checkbox" id="branch-[% branch.branchcode %]" name="branch" value="[% branch.branchcode %]" />
160	[% END %]
161	</li>
162	[% END %]
163	</ol>
164	</fieldset>
165	</li>
166	</ol>
167	</fieldset>
168
169	<fieldset class="action"><input type="submit" value="Save"></fieldset>
170	</form>
171
172	[% END %]
173
174	</div></div>
175	<div class="yui-b">
176	[% INCLUDE 'admin-menu.inc' %]
177	</div>
178
179	</div>
180	[% INCLUDE 'intranet-bottom.inc' %]

Line 0 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-external-search.tt (+252 lines)
		1	[% USE Koha %]
		2	[% INCLUDE 'doc-head-open.inc' %]
		3	[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo; External search for '[% q \| html %]'
		4	[% INCLUDE 'doc-head-close.inc' %]
		5	[% BLOCK cssinclude %]
		6	<style>
		7	.actions a.addtocart {
		8	display: inline;
		9	}
		10	#targets-facet label {
		11	display: inline;
		12	font-size: inherit;
		13	}
		14	</style>
		15	[% END %]
		16	</head>
		17	<body id="results" class="scrollto">
		18	[% INCLUDE 'masthead.inc' %]
		19
		20	<div class="main">
		21	<ul class="breadcrumb">
		22	<li><a href="/cgi-bin/koha/opac-main.pl">Home</a> <span class="divider">&rsaquo;</span></li>
		23	<li>
		24	<a href="#">External search for '[% q \| html %]'</a>
		25	</li>
		26	</ul>
		27
		28	<div id="maincontent" class="container-fluid">
		29	<div class="row-fluid">
		30	<div class="span3">
		31	<div id="facetcontainer">
		32	<div id="search-facets">
		33	<h4><a href="#" class="menu-collapse-toggle">Refine your search</a></h4>
		34	<ul class="menu-collapse">
		35	<li id="targets-facet">
		36	Targets
		37	<ul>
		38	[% FOREACH target = external_search_targets %]
		39	<li>
		40	<input data-url="[% target.host %]:[% target.port %]/[% target.db %]" type="checkbox" id="target-[% loop.index %]" checked />
		41	<label for="target-[% loop.index %]">[% target.name %]
		42	</li>
		43	[% END %]
		44	</ul>
		45	</li>
		46	</ul>
		47	</div>
		48	</div>
		49	</div>
		50
		51	<div class="span9 maincontent">
		52	<p id="numresults"></p>
		53	<div id="top-pages">
		54	<div class="pagination pagination-small"><ul></ul></div>
		55	</div>
		56	<div id="searchresults">
		57	<table class="table table-striped" id="results">
		58	<tbody>
		59	</tbody>
		60	</table>
		61	</div>
		62	<div id="bottom-pages">
		63	<div class="pagination pagination-small"><ul></ul></div>
		64	</div>
65	</div>
66	</div>
67	</div>
68	</div>
69	</div>
70
71	</div>
72
73	<div id="modal-overlay" style="display: none"></div>
74	[% INCLUDE 'opac-bottom.inc' %]
75	[% BLOCK jsinclude %]
76	<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.lightbox_me.js"></script>
77	<script type="text/javascript" src="/opac-tmpl/lib/pz2.js"></script>
78	<script type="text/javascript" src="[% interface %]/[% theme %]/js/externalsearch.js"></script>
79	<script type="text/javascript">
80	var querystring = "[% q \|replace( "'", "\'" ) \|replace( '\n', '\\n' ) \|replace( '\r', '\\r' ) \|html %]";
81	var results_per_page = [% OPACnumSearchResults %];
82	KOHA.ExternalSearch.targets = {
83	[% FOREACH target IN external_search_targets %]
84	'[% target.host %]:[% target.port %]/[% target.db %]': {
85	name: '[% target.name %]',
86	syntax: '[% target.syntax %]',
87	},
88	[% END %]
89	};
90
91	var xsltResultStylesheets = {
92	[% FOREACH stylesheet IN xslt_result_stylesheets %]
93	'[% stylesheet.syntax %]': KOHA.XSLTGet( '[% stylesheet.url %]' ),
94	[% END %]
95	};
96
97	var xsltDetailStylesheets = {
98	[% FOREACH stylesheet IN xslt_detail_stylesheets %]
99	'[% stylesheet.syntax %]': KOHA.XSLTGet( '[% stylesheet.url %]' ),
100	[% END %]
101	};
102
103	var recordCache = {};
104	var resultRenderCache = {};
105
106	function showResult( syntax, recid ) {
107	if ( recordCache[ recid ] ) {
108	done( recordCache[ recid ] );
109	} else {
110	KOHA.ExternalSearch.GetDetailedRecord( recid, function( record ) {
111	done( recordCache[ recid ] = record.xmlDoc );
112	} );
113	}
114
115	function done( record ) {
116	xsltResultStylesheets[ syntax ].done( function( xslDoc ) {
117	var fragment = resultRenderCache[ recid ] = KOHA.TransformToFragment( record, xslDoc );
118	var $tr = $( '#results tr' ).filter( function() { return $( this ).data( 'recid' ) == recid } );
119	$tr.find( '.info' ).html( fragment );
120	$tr.find( 'a' ).attr( 'href', '#' ).click( function() {
121	showDetail( syntax, recid );
122
123	return false;
124	} );
125	} );
126	}
127	}
128
129	function showDetail( syntax, recid ) {
130	var record = recordCache[ recid ];
131
132	xsltDetailStylesheets[ syntax ].done( function( xslDoc ) {
133	var fragment = KOHA.TransformToFragment( record, xslDoc );
134
135	$( '#modal-overlay' ).html( fragment ).lightbox_me( {
136	centered: true,
137	} );
138	} );
139	}
140
141	function search( offset, reset_search ) {
142	$( '#pazpar2-status' ).html( _("Searching external targets...") + '<img class="throbber" src="/opac-tmpl/lib/jquery/plugins/themes/classic/throbber.gif" />' );
143
144	if ( reset_search ) {
145	KOHA.ExternalSearch.Search( querystring, results_per_page, callback );
146	} else {
147	KOHA.ExternalSearch.Fetch( offset, callback );
148	}
149
150	function callback( data ) {
151	if ( data.error ) {
152	$( '#pazpar2-status' ).html( '<strong class="unavailable">' + _("Error searching external targets.") + '</strong>' );
153	return;
154	}
155
156	if ( !data.total ) {
157	$( '#pazpar2-status' ).html( '<strong>' + _("No results found in the external targets.") + '</strong>' );
158	return;
159	}
160
161	$( '#results tbody' ).empty();
162
163	$( '#pazpar2-status' ).html( '<strong>' + _("Found __RESULTS__ results in __TARGETS__ external targets.").replace('__RESULTS__', data.total).replace('__TARGETS__', $( '#targets-facet input:checked' ).length ) );
164
165	for ( var i = 0; data.hits[i]; i++ ) {
166	var hit = data.hits[i];
167	var results = [];
168	var recordSyntax = KOHA.ExternalSearch.targets[ hit.location[0]['@id'] ].syntax;
169
170	results.push( '<tr>' );
171
172	results.push( '<td class="sourcecol">', hit.location[0]['@name'], '</td>' );
173
174	results.push( '<td class="info">' );
175
176	if ( resultRenderCache[ hit.recid[0] ] ) {
177	results.push( resultRenderCache[ hit.recid[0] ] );
178	} else {
179	results.push( hit['md-work-title'] ? hit['md-work-title'][0] : _("Loading...") );
180	showResult( recordSyntax, hit.recid[0] );
181	}
182
183	results.push( '</td>' );
184
185	results.push( '</tr>' );
186	var $tr = $( results.join( '' ) );
187	$tr.data( 'recid', hit.recid[0] );
188	$( '#results tbody' ).append( $tr );
189
190	( function( hit, recordSyntax ) {
191	$tr.find( 'a' ).attr( 'href', '#' ).click( function() {
192	showDetail( recordSyntax, hit.recid[0] );
193
194	return false;
195	} );
196	} )( hit, recordSyntax );
197	}
198
199	var pages = [];
200	var cur_page = data.start / results_per_page;
201	var max_page = Math.floor( data.total / results_per_page );
202
203	if ( cur_page != 0 ) {
204	pages.push( '<li><a href="#" data-offset="' + (offset - results_per_page) + '"><< ' + _("Previous") + '</a></li>' );
205	}
206
207	for ( var page = Math.max( 0, cur_page - 9 ); page <= Math.min( max_page, cur_page + 9 ); page++ ) {
208	if ( page == cur_page ) {
209	pages.push( ' <li class="active"><a href="#">' + ( page + 1 ) + '</a></span>' );
210	} else {
211	pages.push( ' <li><a href="#" data-offset="' + ( page * results_per_page ) + '">' + ( page + 1 ) + '</a></li>' );
212	}
213	}
214
215	if ( cur_page < max_page ) {
216	pages.push( ' <li><a href="#" data-offset="' + (offset + results_per_page) + '">' + _("Next") + ' >></a></li>' );
217	}
218
219	if ( pages.length > 1 ) $( '#top-pages, #bottom-pages' ).find( '.pagination ul' ).html( pages.join( '' ) );
220	}
221	}
222
223	$( document ).ready( function() {
224	$( '#numresults' )
225	.append( ' ' )
226	.append( '<span id="pazpar2-status"></span>' );
227
228	$( document ).on( 'click', 'a[data-offset]', function() {
229	search( $(this).data('offset') );
230	return false;
231	});
232
233	var reSearchTimeout;
234
235	$( '#targets-facet input' ).each( function() {
236	$( this ).click( function() {
237	KOHA.ExternalSearch.targets[ $( this ).data( 'url' ) ].disabled = !this.checked;
238
239	if ( reSearchTimeout ) clearTimeout( reSearchTimeout );
240
241	reSearchTimeout = setTimeout( function() {
242	if ( $( '#targets-facet input:checked' ).length ) search( 0, true );
243	}, 1000 );
244	} );
245
246	KOHA.ExternalSearch.targets[ $( this ).data( 'url' ) ].disabled = !this.checked;
247	} );
248
249	search( 0, true );
250	} );
251	</script>
252	[% END %]

Line 0 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/js/externalsearch.js (+106 lines)
		1	if ( typeof KOHA == "undefined" \|\| !KOHA ) {
		2	var KOHA = {};
		3	}
		4
		5	KOHA.XSLTGet = ( function() {
		6	// Horrible browser hack, but required due to the following hard-to-detect and long-unfixed bug:
		7	// https://bugs.webkit.org/show_bug.cgi?id=60276
		8	var isChrome = /Chrome/.test(navigator.userAgent) && /Google Inc/.test(navigator.vendor);
		9	var isSafari = /Safari/.test(navigator.userAgent) && /Apple Computer/.test(navigator.vendor);
		10
		11	if ( !isChrome && !isSafari ) return $.get;
		12
		13	return function( url ) {
		14	var result = new jQuery.Deferred();
		15	var basepath = url.match( /(.\/)/ )[0];
		16
		17	$.get( url ).done( function( xslDoc ) {
		18	var xslImports = xslDoc.getElementsByTagNameNS( 'http://www.w3.org/1999/XSL/Transform', 'import' );
		19	var importsRemaining = xslImports.length;
		20
		21	if ( importsRemaining == 0 ) {
		22	result.resolve( xslDoc );
		23	return;
		24	}
		25
		26	$.each( xslImports, function( i, importElem ) {
		27	var path = $( importElem ).attr( 'href' );
		28	if ( !/^(\/\|https?:)/.test( path ) ) path = basepath + path;
		29
		30	KOHA.XSLTGet( path ).done( function( subDoc ) {
		31	importsRemaining--;
		32	$( importElem ).replaceWith( subDoc.documentElement.childNodes );
		33
		34	if ( importsRemaining == 0 ) result.resolve( xslDoc );
		35	} ).fail( function() {
		36	importsRemaining = -1;
		37
		38	result.reject();
		39	} );
		40	} );
		41	} ).fail( function() {
		42	result.reject();
		43	} );
		44
		45	return result;
		46	};
		47	} )();
		48
		49	KOHA.TransformToFragment = function( xmlDoc, xslDoc ) {
		50	if ( window.XSLTProcessor ) {
		51	var proc = new XSLTProcessor();
		52	proc.importStylesheet( xslDoc );
		53	proc.setParameter( null, 'showAvailability', false );
		54	return (new XMLSerializer).serializeToString( proc.transformToFragment( xmlDoc, document ) );
		55	} else if ( window.ActiveXObject ) {
		56	var xslt = new ActiveXObject( "Msxml2.XSLTemplate" );
		57	xslt.stylesheet = xslDoc;
		58	var xslProc = xslt.createProcessor();
		59	xslProc.input = xmlDoc;
		60	xslProc.addParameter( 'showAvailability', false );
		61	xslProc.transform();
		62	return xslProc.output;
		63	}
		64	};
65
66	KOHA.ExternalSearch = ( function() {
67	return {
68	targets: {},
69	Search: function( q, limit, callback ) {
70	var targetIDs = [];
71	var includedTargets = [];
72
73	$.each( KOHA.ExternalSearch.targets, function ( url, info ) {
74	if ( !info.disabled ) {
75	includedTargets.push( url );
76	targetIDs.push( info.id );
77	}
78	} );
79
80	if ( KOHA.ExternalSearch._pz !== undefined ) {
81	afterinit( KOHA.ExternalSearch._pz );
82	} else {
83	$.get( '/cgi-bin/koha/svc/pazpar2_init', { targets: targetIDs.join(',') }, function( data ) {
84	KOHA.ExternalSearch._pz = new pz2({
85	sessionId: data.sessionID,
86	onshow: callback,
87	errorhandler: function ( error ) { callback( { error: error } ) },
88	} );
89	afterinit( KOHA.ExternalSearch._pz );
90	} );
91	}
92
93	function afterinit( pz ) {
94	pz.search( q, limit, 'relevance:0', 'pz:id=' + includedTargets.join( '\|' ) );
95	}
96	},
97	Fetch: function( offset, callback ) {
98	var pz = KOHA.ExternalSearch._pz;
99	pz.showCallback = callback;
100	pz.show( offset );
101	},
102	GetDetailedRecord: function( recid, callback ) {
103	KOHA.ExternalSearch._pz.record( recid, 0, undefined, { callback: callback } );
104	},
105	};
106	} )();

Line 0 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/lib/jquery/plugins/jquery.lightbox_me.js (+254 lines)
		1	/*
		2	* $ lightbox_me
		3	* By: Buck Wilson
		4	* Version : 2.3
		5	*
		6	* Licensed under the Apache License, Version 2.0 (the "License");
		7	* you may not use this file except in compliance with the License.
		8	* You may obtain a copy of the License at
		9	*
		10	* http://www.apache.org/licenses/LICENSE-2.0
		11	*
		12	* Unless required by applicable law or agreed to in writing, software
		13	* distributed under the License is distributed on an "AS IS" BASIS,
		14	* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		15	* See the License for the specific language governing permissions and
		16	* limitations under the License.
		17	*/
		18
		19
		20	(function($) {
		21
		22	$.fn.lightbox_me = function(options) {
		23
		24	return this.each(function() {
		25
		26	var
		27	opts = $.extend({}, $.fn.lightbox_me.defaults, options),
		28	$overlay = $(),
		29	$self = $(this),
		30	$iframe = $('<iframe id="foo" style="z-index: ' + (opts.zIndex + 1) + ';border: none; margin: 0; padding: 0; position: absolute; width: 100%; height: 100%; top: 0; left: 0; filter: mask();"/>'),
		31	ie6 = ($.browser.msie && $.browser.version < 7);
		32
		33	if (opts.showOverlay) {
		34	//check if there's an existing overlay, if so, make subequent ones clear
		35	var $currentOverlays = $(".js_lb_overlay:visible");
		36	if ($currentOverlays.length > 0){
		37	$overlay = $('<div class="lb_overlay_clear js_lb_overlay"/>');
		38	} else {
		39	$overlay = $('<div class="' + opts.classPrefix + '_overlay js_lb_overlay"/>');
		40	}
		41	}
		42
		43	/*----------------------------------------------------
		44	DOM Building
		45	---------------------------------------------------- */
		46	if (ie6) {
		47	var src = /^https/i.test(window.location.href \|\| '') ? 'javascript:false' : 'about:blank';
		48	$iframe.attr('src', src);
		49	$('body').append($iframe);
		50	} // iframe shim for ie6, to hide select elements
		51	$('body').append($self.hide()).append($overlay);
		52
		53
		54	/*----------------------------------------------------
		55	Overlay CSS stuffs
		56	---------------------------------------------------- */
		57
		58	// set css of the overlay
		59	if (opts.showOverlay) {
		60	setOverlayHeight(); // pulled this into a function because it is called on window resize.
		61	$overlay.css({ position: 'absolute', width: '100%', top: 0, left: 0, right: 0, bottom: 0, zIndex: (opts.zIndex + 2), display: 'none' });
		62	if (!$overlay.hasClass('lb_overlay_clear')){
		63	$overlay.css(opts.overlayCSS);
		64	}
65	}
66
67	/*----------------------------------------------------
68	Animate it in.
69	---------------------------------------------------- */
70	//
71	if (opts.showOverlay) {
72	$overlay.fadeIn(opts.overlaySpeed, function() {
73	setSelfPosition();
74	$self[opts.appearEffect](opts.lightboxSpeed, function() { setOverlayHeight(); setSelfPosition(); opts.onLoad()});
75	});
76	} else {
77	setSelfPosition();
78	$self[opts.appearEffect](opts.lightboxSpeed, function() { opts.onLoad()});
79	}
80
81	/*----------------------------------------------------
82	Hide parent if parent specified (parentLightbox should be jquery reference to any parent lightbox)
83	---------------------------------------------------- */
84	if (opts.parentLightbox) {
85	opts.parentLightbox.fadeOut(200);
86	}
87
88
89	/*----------------------------------------------------
90	Bind Events
91	---------------------------------------------------- */
92
93	$(window).resize(setOverlayHeight)
94	.resize(setSelfPosition)
95	.scroll(setSelfPosition);
96
97	$(window).bind('keyup.lightbox_me', observeKeyPress);
98
99	if (opts.closeClick) {
100	$overlay.click(function(e) { closeLightbox(); e.preventDefault; });
101	}
102	$self.delegate(opts.closeSelector, "click", function(e) {
103	closeLightbox(); e.preventDefault();
104	});
105	$self.bind('close', closeLightbox);
106	$self.bind('reposition', setSelfPosition);
107
108
109
110	/*--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
111	-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- */
112
113
114	/*----------------------------------------------------
115	Private Functions
116	---------------------------------------------------- */
117
118	/* Remove or hide all elements */
119	function closeLightbox() {
120	var s = $self[0].style;
121	if (opts.destroyOnClose) {
122	$self.add($overlay).remove();
123	} else {
124	$self.add($overlay).hide();
125	}
126
127	//show the hidden parent lightbox
128	if (opts.parentLightbox) {
129	opts.parentLightbox.fadeIn(200);
130	}
131
132	$iframe.remove();
133
134	// clean up events.
135	$self.undelegate(opts.closeSelector, "click");
136
137	$(window).unbind('reposition', setOverlayHeight);
138	$(window).unbind('reposition', setSelfPosition);
139	$(window).unbind('scroll', setSelfPosition);
140	$(window).unbind('keyup.lightbox_me');
141	if (ie6)
142	s.removeExpression('top');
143	opts.onClose();
144	}
145
146
147	/* Function to bind to the window to observe the escape/enter key press */
148	function observeKeyPress(e) {
149	if((e.keyCode == 27 \|\| (e.DOM_VK_ESCAPE == 27 && e.which==0)) && opts.closeEsc) closeLightbox();
150	}
151
152
153	/* Set the height of the overlay
154	: if the document height is taller than the window, then set the overlay height to the document height.
155	: otherwise, just set overlay height: 100%
156	*/
157	function setOverlayHeight() {
158	if ($(window).height() < $(document).height()) {
159	$overlay.css({height: $(document).height() + 'px'});
160	$iframe.css({height: $(document).height() + 'px'});
161	} else {
162	$overlay.css({height: '100%'});
163	if (ie6) {
164	$('html,body').css('height','100%');
165	$iframe.css('height', '100%');
166	} // ie6 hack for height: 100%; TODO: handle this in IE7
167	}
168	}
169
170
171	/* Set the position of the modal'd window ($self)
172	: if $self is taller than the window, then make it absolutely positioned
173	: otherwise fixed
174	*/
175	function setSelfPosition() {
176	var s = $self[0].style;
177
178	// reset CSS so width is re-calculated for margin-left CSS
179	$self.css({left: '50%', marginLeft: ($self.outerWidth() / 2) * -1, zIndex: (opts.zIndex + 3) });
180
181
182	/* we have to get a little fancy when dealing with height, because lightbox_me
183	is just so fancy.
184	*/
185
186	// if the height of $self is bigger than the window and self isn't already position absolute
187	if (($self.height() + 80 >= $(window).height()) && ($self.css('position') != 'absolute' \|\| ie6)) {
188
189	// we are going to make it positioned where the user can see it, but they can still scroll
190	// so the top offset is based on the user's scroll position.
191	var topOffset = $(document).scrollTop() + 40;
192	$self.css({position: 'absolute', top: topOffset + 'px', marginTop: 0})
193	if (ie6) {
194	s.removeExpression('top');
195	}
196	} else if ($self.height()+ 80 < $(window).height()) {
197	//if the height is less than the window height, then we're gonna make this thing position: fixed.
198	// in ie6 we're gonna fake it.
199	if (ie6) {
200	s.position = 'absolute';
201	if (opts.centered) {
202	s.setExpression('top', '(document.documentElement.clientHeight \|\| document.body.clientHeight) / 2 - (this.offsetHeight / 2) + (blah = document.documentElement.scrollTop ? document.documentElement.scrollTop : document.body.scrollTop) + "px"')
203	s.marginTop = 0;
204	} else {
205	var top = (opts.modalCSS && opts.modalCSS.top) ? parseInt(opts.modalCSS.top) : 0;
206	s.setExpression('top', '((blah = document.documentElement.scrollTop ? document.documentElement.scrollTop : document.body.scrollTop) + '+top+') + "px"')
207	}
208	} else {
209	if (opts.centered) {
210	$self.css({ position: 'fixed', top: '50%', marginTop: ($self.outerHeight() / 2) * -1})
211	} else {
212	$self.css({ position: 'fixed'}).css(opts.modalCSS);
213	}
214
215	}
216	}
217	}
218
219	});
220
221
222
223	};
224
225	$.fn.lightbox_me.defaults = {
226
227	// animation
228	appearEffect: "fadeIn",
229	appearEase: "",
230	overlaySpeed: 250,
231	lightboxSpeed: 300,
232
233	// close
234	closeSelector: ".close",
235	closeClick: true,
236	closeEsc: true,
237
238	// behavior
239	destroyOnClose: false,
240	showOverlay: true,
241	parentLightbox: false,
242
243	// callbacks
244	onLoad: function() {},
245	onClose: function() {},
246
247	// style
248	classPrefix: 'lb',
249	zIndex: 999,
250	centered: false,
251	modalCSS: {top: '40px'},
252	overlayCSS: {background: 'black', opacity: .3}
253	}
254	})(jQuery);

Line 0 Link Here

(-)a/koha-tmpl/opac-tmpl/ccsr/en/js/externalsearch.js (+106 lines)
		1	if ( typeof KOHA == "undefined" \|\| !KOHA ) {
		2	var KOHA = {};
		3	}
		4
		5	KOHA.XSLTGet = ( function() {
		6	// Horrible browser hack, but required due to the following hard-to-detect and long-unfixed bug:
		7	// https://bugs.webkit.org/show_bug.cgi?id=60276
		8	var isChrome = /Chrome/.test(navigator.userAgent) && /Google Inc/.test(navigator.vendor);
		9	var isSafari = /Safari/.test(navigator.userAgent) && /Apple Computer/.test(navigator.vendor);
		10
		11	if ( !isChrome && !isSafari ) return $.get;
		12
		13	return function( url ) {
		14	var result = new jQuery.Deferred();
		15	var basepath = url.match( /(.\/)/ )[0];
		16
		17	$.get( url ).done( function( xslDoc ) {
		18	var xslImports = xslDoc.getElementsByTagNameNS( 'http://www.w3.org/1999/XSL/Transform', 'import' );
		19	var importsRemaining = xslImports.length;
		20
		21	if ( importsRemaining == 0 ) {
		22	result.resolve( xslDoc );
		23	return;
		24	}
		25
		26	$.each( xslImports, function( i, importElem ) {
		27	var path = $( importElem ).attr( 'href' );
		28	if ( !/^(\/\|https?:)/.test( path ) ) path = basepath + path;
		29
		30	KOHA.XSLTGet( path ).done( function( subDoc ) {
		31	importsRemaining--;
		32	$( importElem ).replaceWith( subDoc.documentElement.childNodes );
		33
		34	if ( importsRemaining == 0 ) result.resolve( xslDoc );
		35	} ).fail( function() {
		36	importsRemaining = -1;
		37
		38	result.reject();
		39	} );
		40	} );
		41	} ).fail( function() {
		42	result.reject();
		43	} );
		44
		45	return result;
		46	};
		47	} )();
		48
		49	KOHA.TransformToFragment = function( xmlDoc, xslDoc ) {
		50	if ( window.XSLTProcessor ) {
		51	var proc = new XSLTProcessor();
		52	proc.importStylesheet( xslDoc );
		53	proc.setParameter( null, 'showAvailability', false );
		54	return (new XMLSerializer).serializeToString( proc.transformToFragment( xmlDoc, document ) );
		55	} else if ( window.ActiveXObject ) {
		56	var xslt = new ActiveXObject( "Msxml2.XSLTemplate" );
		57	xslt.stylesheet = xslDoc;
		58	var xslProc = xslt.createProcessor();
		59	xslProc.input = xmlDoc;
		60	xslProc.addParameter( 'showAvailability', false );
		61	xslProc.transform();
		62	return xslProc.output;
		63	}
		64	};
65
66	KOHA.ExternalSearch = ( function() {
67	return {
68	targets: {},
69	Search: function( q, limit, callback ) {
70	var targetIDs = [];
71	var includedTargets = [];
72
73	$.each( KOHA.ExternalSearch.targets, function ( url, info ) {
74	if ( !info.disabled ) {
75	includedTargets.push( url );
76	targetIDs.push( info.id );
77	}
78	} );
79
80	if ( KOHA.ExternalSearch._pz !== undefined ) {
81	afterinit( KOHA.ExternalSearch._pz );
82	} else {
83	$.get( '/cgi-bin/koha/svc/pazpar2_init', { targets: targetIDs.join(',') }, function( data ) {
84	KOHA.ExternalSearch._pz = new pz2({
85	sessionId: data.sessionID,
86	onshow: callback,
87	errorhandler: function ( error ) { callback( { error: error } ) },
88	} );
89	afterinit( KOHA.ExternalSearch._pz );
90	} );
91	}
92
93	function afterinit( pz ) {
94	pz.search( q, limit, 'relevance:0', 'pz:id=' + includedTargets.join( '\|' ) );
95	}
96	},
97	Fetch: function( offset, callback ) {
98	var pz = KOHA.ExternalSearch._pz;
99	pz.showCallback = callback;
100	pz.show( offset );
101	},
102	GetDetailedRecord: function( recid, callback ) {
103	KOHA.ExternalSearch._pz.record( recid, 0, undefined, { callback: callback } );
104	},
105	};
106	} )();

Line 0 Link Here

(-)a/koha-tmpl/opac-tmpl/ccsr/en/lib/jquery/plugins/jquery.lightbox_me.js (+254 lines)
		1	/*
		2	* $ lightbox_me
		3	* By: Buck Wilson
		4	* Version : 2.3
		5	*
		6	* Licensed under the Apache License, Version 2.0 (the "License");
		7	* you may not use this file except in compliance with the License.
		8	* You may obtain a copy of the License at
		9	*
		10	* http://www.apache.org/licenses/LICENSE-2.0
		11	*
		12	* Unless required by applicable law or agreed to in writing, software
		13	* distributed under the License is distributed on an "AS IS" BASIS,
		14	* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		15	* See the License for the specific language governing permissions and
		16	* limitations under the License.
		17	*/
		18
		19
		20	(function($) {
		21
		22	$.fn.lightbox_me = function(options) {
		23
		24	return this.each(function() {
		25
		26	var
		27	opts = $.extend({}, $.fn.lightbox_me.defaults, options),
		28	$overlay = $(),
		29	$self = $(this),
		30	$iframe = $('<iframe id="foo" style="z-index: ' + (opts.zIndex + 1) + ';border: none; margin: 0; padding: 0; position: absolute; width: 100%; height: 100%; top: 0; left: 0; filter: mask();"/>'),
		31	ie6 = ($.browser.msie && $.browser.version < 7);
		32
		33	if (opts.showOverlay) {
		34	//check if there's an existing overlay, if so, make subequent ones clear
		35	var $currentOverlays = $(".js_lb_overlay:visible");
		36	if ($currentOverlays.length > 0){
		37	$overlay = $('<div class="lb_overlay_clear js_lb_overlay"/>');
		38	} else {
		39	$overlay = $('<div class="' + opts.classPrefix + '_overlay js_lb_overlay"/>');
		40	}
		41	}
		42
		43	/*----------------------------------------------------
		44	DOM Building
		45	---------------------------------------------------- */
		46	if (ie6) {
		47	var src = /^https/i.test(window.location.href \|\| '') ? 'javascript:false' : 'about:blank';
		48	$iframe.attr('src', src);
		49	$('body').append($iframe);
		50	} // iframe shim for ie6, to hide select elements
		51	$('body').append($self.hide()).append($overlay);
		52
		53
		54	/*----------------------------------------------------
		55	Overlay CSS stuffs
		56	---------------------------------------------------- */
		57
		58	// set css of the overlay
		59	if (opts.showOverlay) {
		60	setOverlayHeight(); // pulled this into a function because it is called on window resize.
		61	$overlay.css({ position: 'absolute', width: '100%', top: 0, left: 0, right: 0, bottom: 0, zIndex: (opts.zIndex + 2), display: 'none' });
		62	if (!$overlay.hasClass('lb_overlay_clear')){
		63	$overlay.css(opts.overlayCSS);
		64	}
65	}
66
67	/*----------------------------------------------------
68	Animate it in.
69	---------------------------------------------------- */
70	//
71	if (opts.showOverlay) {
72	$overlay.fadeIn(opts.overlaySpeed, function() {
73	setSelfPosition();
74	$self[opts.appearEffect](opts.lightboxSpeed, function() { setOverlayHeight(); setSelfPosition(); opts.onLoad()});
75	});
76	} else {
77	setSelfPosition();
78	$self[opts.appearEffect](opts.lightboxSpeed, function() { opts.onLoad()});
79	}
80
81	/*----------------------------------------------------
82	Hide parent if parent specified (parentLightbox should be jquery reference to any parent lightbox)
83	---------------------------------------------------- */
84	if (opts.parentLightbox) {
85	opts.parentLightbox.fadeOut(200);
86	}
87
88
89	/*----------------------------------------------------
90	Bind Events
91	---------------------------------------------------- */
92
93	$(window).resize(setOverlayHeight)
94	.resize(setSelfPosition)
95	.scroll(setSelfPosition);
96
97	$(window).bind('keyup.lightbox_me', observeKeyPress);
98
99	if (opts.closeClick) {
100	$overlay.click(function(e) { closeLightbox(); e.preventDefault; });
101	}
102	$self.delegate(opts.closeSelector, "click", function(e) {
103	closeLightbox(); e.preventDefault();
104	});
105	$self.bind('close', closeLightbox);
106	$self.bind('reposition', setSelfPosition);
107
108
109
110	/*--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
111	-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- */
112
113
114	/*----------------------------------------------------
115	Private Functions
116	---------------------------------------------------- */
117
118	/* Remove or hide all elements */
119	function closeLightbox() {
120	var s = $self[0].style;
121	if (opts.destroyOnClose) {
122	$self.add($overlay).remove();
123	} else {
124	$self.add($overlay).hide();
125	}
126
127	//show the hidden parent lightbox
128	if (opts.parentLightbox) {
129	opts.parentLightbox.fadeIn(200);
130	}
131
132	$iframe.remove();
133
134	// clean up events.
135	$self.undelegate(opts.closeSelector, "click");
136
137	$(window).unbind('reposition', setOverlayHeight);
138	$(window).unbind('reposition', setSelfPosition);
139	$(window).unbind('scroll', setSelfPosition);
140	$(window).unbind('keyup.lightbox_me');
141	if (ie6)
142	s.removeExpression('top');
143	opts.onClose();
144	}
145
146
147	/* Function to bind to the window to observe the escape/enter key press */
148	function observeKeyPress(e) {
149	if((e.keyCode == 27 \|\| (e.DOM_VK_ESCAPE == 27 && e.which==0)) && opts.closeEsc) closeLightbox();
150	}
151
152
153	/* Set the height of the overlay
154	: if the document height is taller than the window, then set the overlay height to the document height.
155	: otherwise, just set overlay height: 100%
156	*/
157	function setOverlayHeight() {
158	if ($(window).height() < $(document).height()) {
159	$overlay.css({height: $(document).height() + 'px'});
160	$iframe.css({height: $(document).height() + 'px'});
161	} else {
162	$overlay.css({height: '100%'});
163	if (ie6) {
164	$('html,body').css('height','100%');
165	$iframe.css('height', '100%');
166	} // ie6 hack for height: 100%; TODO: handle this in IE7
167	}
168	}
169
170
171	/* Set the position of the modal'd window ($self)
172	: if $self is taller than the window, then make it absolutely positioned
173	: otherwise fixed
174	*/
175	function setSelfPosition() {
176	var s = $self[0].style;
177
178	// reset CSS so width is re-calculated for margin-left CSS
179	$self.css({left: '50%', marginLeft: ($self.outerWidth() / 2) * -1, zIndex: (opts.zIndex + 3) });
180
181
182	/* we have to get a little fancy when dealing with height, because lightbox_me
183	is just so fancy.
184	*/
185
186	// if the height of $self is bigger than the window and self isn't already position absolute
187	if (($self.height() + 80 >= $(window).height()) && ($self.css('position') != 'absolute' \|\| ie6)) {
188
189	// we are going to make it positioned where the user can see it, but they can still scroll
190	// so the top offset is based on the user's scroll position.
191	var topOffset = $(document).scrollTop() + 40;
192	$self.css({position: 'absolute', top: topOffset + 'px', marginTop: 0})
193	if (ie6) {
194	s.removeExpression('top');
195	}
196	} else if ($self.height()+ 80 < $(window).height()) {
197	//if the height is less than the window height, then we're gonna make this thing position: fixed.
198	// in ie6 we're gonna fake it.
199	if (ie6) {
200	s.position = 'absolute';
201	if (opts.centered) {
202	s.setExpression('top', '(document.documentElement.clientHeight \|\| document.body.clientHeight) / 2 - (this.offsetHeight / 2) + (blah = document.documentElement.scrollTop ? document.documentElement.scrollTop : document.body.scrollTop) + "px"')
203	s.marginTop = 0;
204	} else {
205	var top = (opts.modalCSS && opts.modalCSS.top) ? parseInt(opts.modalCSS.top) : 0;
206	s.setExpression('top', '((blah = document.documentElement.scrollTop ? document.documentElement.scrollTop : document.body.scrollTop) + '+top+') + "px"')
207	}
208	} else {
209	if (opts.centered) {
210	$self.css({ position: 'fixed', top: '50%', marginTop: ($self.outerHeight() / 2) * -1})
211	} else {
212	$self.css({ position: 'fixed'}).css(opts.modalCSS);
213	}
214
215	}
216	}
217	}
218
219	});
220
221
222
223	};
224
225	$.fn.lightbox_me.defaults = {
226
227	// animation
228	appearEffect: "fadeIn",
229	appearEase: "",
230	overlaySpeed: 250,
231	lightboxSpeed: 300,
232
233	// close
234	closeSelector: ".close",
235	closeClick: true,
236	closeEsc: true,
237
238	// behavior
239	destroyOnClose: false,
240	showOverlay: true,
241	parentLightbox: false,
242
243	// callbacks
244	onLoad: function() {},
245	onClose: function() {},
246
247	// style
248	classPrefix: 'lb',
249	zIndex: 999,
250	centered: false,
251	modalCSS: {top: '40px'},
252	overlayCSS: {background: 'black', opacity: .3}
253	}
254	})(jQuery);

Line 0 Link Here

(-)a/koha-tmpl/opac-tmpl/prog/en/js/externalsearch.js (+106 lines)
		1	if ( typeof KOHA == "undefined" \|\| !KOHA ) {
		2	var KOHA = {};
		3	}
		4
		5	KOHA.XSLTGet = ( function() {
		6	// Horrible browser hack, but required due to the following hard-to-detect and long-unfixed bug:
		7	// https://bugs.webkit.org/show_bug.cgi?id=60276
		8	var isChrome = /Chrome/.test(navigator.userAgent) && /Google Inc/.test(navigator.vendor);
		9	var isSafari = /Safari/.test(navigator.userAgent) && /Apple Computer/.test(navigator.vendor);
		10
		11	if ( !isChrome && !isSafari ) return $.get;
		12
		13	return function( url ) {
		14	var result = new jQuery.Deferred();
		15	var basepath = url.match( /(.\/)/ )[0];
		16
		17	$.get( url ).done( function( xslDoc ) {
		18	var xslImports = xslDoc.getElementsByTagNameNS( 'http://www.w3.org/1999/XSL/Transform', 'import' );
		19	var importsRemaining = xslImports.length;
		20
		21	if ( importsRemaining == 0 ) {
		22	result.resolve( xslDoc );
		23	return;
		24	}
		25
		26	$.each( xslImports, function( i, importElem ) {
		27	var path = $( importElem ).attr( 'href' );
		28	if ( !/^(\/\|https?:)/.test( path ) ) path = basepath + path;
		29
		30	KOHA.XSLTGet( path ).done( function( subDoc ) {
		31	importsRemaining--;
		32	$( importElem ).replaceWith( subDoc.documentElement.childNodes );
		33
		34	if ( importsRemaining == 0 ) result.resolve( xslDoc );
		35	} ).fail( function() {
		36	importsRemaining = -1;
		37
		38	result.reject();
		39	} );
		40	} );
		41	} ).fail( function() {
		42	result.reject();
		43	} );
		44
		45	return result;
		46	};
		47	} )();
		48
		49	KOHA.TransformToFragment = function( xmlDoc, xslDoc ) {
		50	if ( window.XSLTProcessor ) {
		51	var proc = new XSLTProcessor();
		52	proc.importStylesheet( xslDoc );
		53	proc.setParameter( null, 'showAvailability', false );
		54	return (new XMLSerializer).serializeToString( proc.transformToFragment( xmlDoc, document ) );
		55	} else if ( window.ActiveXObject ) {
		56	var xslt = new ActiveXObject( "Msxml2.XSLTemplate" );
		57	xslt.stylesheet = xslDoc;
		58	var xslProc = xslt.createProcessor();
		59	xslProc.input = xmlDoc;
		60	xslProc.addParameter( 'showAvailability', false );
		61	xslProc.transform();
		62	return xslProc.output;
		63	}
		64	};
65
66	KOHA.ExternalSearch = ( function() {
67	return {
68	targets: {},
69	Search: function( q, limit, callback ) {
70	var targetIDs = [];
71	var includedTargets = [];
72
73	$.each( KOHA.ExternalSearch.targets, function ( url, info ) {
74	if ( !info.disabled ) {
75	includedTargets.push( url );
76	targetIDs.push( info.id );
77	}
78	} );
79
80	if ( KOHA.ExternalSearch._pz !== undefined ) {
81	afterinit( KOHA.ExternalSearch._pz );
82	} else {
83	$.get( '/cgi-bin/koha/svc/pazpar2_init', { targets: targetIDs.join(',') }, function( data ) {
84	KOHA.ExternalSearch._pz = new pz2({
85	sessionId: data.sessionID,
86	onshow: callback,
87	errorhandler: function ( error ) { callback( { error: error } ) },
88	} );
89	afterinit( KOHA.ExternalSearch._pz );
90	} );
91	}
92
93	function afterinit( pz ) {
94	pz.search( q, limit, 'relevance:0', 'pz:id=' + includedTargets.join( '\|' ) );
95	}
96	},
97	Fetch: function( offset, callback ) {
98	var pz = KOHA.ExternalSearch._pz;
99	pz.showCallback = callback;
100	pz.show( offset );
101	},
102	GetDetailedRecord: function( recid, callback ) {
103	KOHA.ExternalSearch._pz.record( recid, 0, undefined, { callback: callback } );
104	},
105	};
106	} )();

Line 0 Link Here

(-)a/koha-tmpl/opac-tmpl/prog/en/lib/jquery/plugins/jquery.lightbox_me.js (+254 lines)
		1	/*
		2	* $ lightbox_me
		3	* By: Buck Wilson
		4	* Version : 2.3
		5	*
		6	* Licensed under the Apache License, Version 2.0 (the "License");
		7	* you may not use this file except in compliance with the License.
		8	* You may obtain a copy of the License at
		9	*
		10	* http://www.apache.org/licenses/LICENSE-2.0
		11	*
		12	* Unless required by applicable law or agreed to in writing, software
		13	* distributed under the License is distributed on an "AS IS" BASIS,
		14	* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		15	* See the License for the specific language governing permissions and
		16	* limitations under the License.
		17	*/
		18
		19
		20	(function($) {
		21
		22	$.fn.lightbox_me = function(options) {
		23
		24	return this.each(function() {
		25
		26	var
		27	opts = $.extend({}, $.fn.lightbox_me.defaults, options),
		28	$overlay = $(),
		29	$self = $(this),
		30	$iframe = $('<iframe id="foo" style="z-index: ' + (opts.zIndex + 1) + ';border: none; margin: 0; padding: 0; position: absolute; width: 100%; height: 100%; top: 0; left: 0; filter: mask();"/>'),
		31	ie6 = ($.browser.msie && $.browser.version < 7);
		32
		33	if (opts.showOverlay) {
		34	//check if there's an existing overlay, if so, make subequent ones clear
		35	var $currentOverlays = $(".js_lb_overlay:visible");
		36	if ($currentOverlays.length > 0){
		37	$overlay = $('<div class="lb_overlay_clear js_lb_overlay"/>');
		38	} else {
		39	$overlay = $('<div class="' + opts.classPrefix + '_overlay js_lb_overlay"/>');
		40	}
		41	}
		42
		43	/*----------------------------------------------------
		44	DOM Building
		45	---------------------------------------------------- */
		46	if (ie6) {
		47	var src = /^https/i.test(window.location.href \|\| '') ? 'javascript:false' : 'about:blank';
		48	$iframe.attr('src', src);
		49	$('body').append($iframe);
		50	} // iframe shim for ie6, to hide select elements
		51	$('body').append($self.hide()).append($overlay);
		52
		53
		54	/*----------------------------------------------------
		55	Overlay CSS stuffs
		56	---------------------------------------------------- */
		57
		58	// set css of the overlay
		59	if (opts.showOverlay) {
		60	setOverlayHeight(); // pulled this into a function because it is called on window resize.
		61	$overlay.css({ position: 'absolute', width: '100%', top: 0, left: 0, right: 0, bottom: 0, zIndex: (opts.zIndex + 2), display: 'none' });
		62	if (!$overlay.hasClass('lb_overlay_clear')){
		63	$overlay.css(opts.overlayCSS);
		64	}
65	}
66
67	/*----------------------------------------------------
68	Animate it in.
69	---------------------------------------------------- */
70	//
71	if (opts.showOverlay) {
72	$overlay.fadeIn(opts.overlaySpeed, function() {
73	setSelfPosition();
74	$self[opts.appearEffect](opts.lightboxSpeed, function() { setOverlayHeight(); setSelfPosition(); opts.onLoad()});
75	});
76	} else {
77	setSelfPosition();
78	$self[opts.appearEffect](opts.lightboxSpeed, function() { opts.onLoad()});
79	}
80
81	/*----------------------------------------------------
82	Hide parent if parent specified (parentLightbox should be jquery reference to any parent lightbox)
83	---------------------------------------------------- */
84	if (opts.parentLightbox) {
85	opts.parentLightbox.fadeOut(200);
86	}
87
88
89	/*----------------------------------------------------
90	Bind Events
91	---------------------------------------------------- */
92
93	$(window).resize(setOverlayHeight)
94	.resize(setSelfPosition)
95	.scroll(setSelfPosition);
96
97	$(window).bind('keyup.lightbox_me', observeKeyPress);
98
99	if (opts.closeClick) {
100	$overlay.click(function(e) { closeLightbox(); e.preventDefault; });
101	}
102	$self.delegate(opts.closeSelector, "click", function(e) {
103	closeLightbox(); e.preventDefault();
104	});
105	$self.bind('close', closeLightbox);
106	$self.bind('reposition', setSelfPosition);
107
108
109
110	/*--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
111	-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- */
112
113
114	/*----------------------------------------------------
115	Private Functions
116	---------------------------------------------------- */
117
118	/* Remove or hide all elements */
119	function closeLightbox() {
120	var s = $self[0].style;
121	if (opts.destroyOnClose) {
122	$self.add($overlay).remove();
123	} else {
124	$self.add($overlay).hide();
125	}
126
127	//show the hidden parent lightbox
128	if (opts.parentLightbox) {
129	opts.parentLightbox.fadeIn(200);
130	}
131
132	$iframe.remove();
133
134	// clean up events.
135	$self.undelegate(opts.closeSelector, "click");
136
137	$(window).unbind('reposition', setOverlayHeight);
138	$(window).unbind('reposition', setSelfPosition);
139	$(window).unbind('scroll', setSelfPosition);
140	$(window).unbind('keyup.lightbox_me');
141	if (ie6)
142	s.removeExpression('top');
143	opts.onClose();
144	}
145
146
147	/* Function to bind to the window to observe the escape/enter key press */
148	function observeKeyPress(e) {
149	if((e.keyCode == 27 \|\| (e.DOM_VK_ESCAPE == 27 && e.which==0)) && opts.closeEsc) closeLightbox();
150	}
151
152
153	/* Set the height of the overlay
154	: if the document height is taller than the window, then set the overlay height to the document height.
155	: otherwise, just set overlay height: 100%
156	*/
157	function setOverlayHeight() {
158	if ($(window).height() < $(document).height()) {
159	$overlay.css({height: $(document).height() + 'px'});
160	$iframe.css({height: $(document).height() + 'px'});
161	} else {
162	$overlay.css({height: '100%'});
163	if (ie6) {
164	$('html,body').css('height','100%');
165	$iframe.css('height', '100%');
166	} // ie6 hack for height: 100%; TODO: handle this in IE7
167	}
168	}
169
170
171	/* Set the position of the modal'd window ($self)
172	: if $self is taller than the window, then make it absolutely positioned
173	: otherwise fixed
174	*/
175	function setSelfPosition() {
176	var s = $self[0].style;
177
178	// reset CSS so width is re-calculated for margin-left CSS
179	$self.css({left: '50%', marginLeft: ($self.outerWidth() / 2) * -1, zIndex: (opts.zIndex + 3) });
180
181
182	/* we have to get a little fancy when dealing with height, because lightbox_me
183	is just so fancy.
184	*/
185
186	// if the height of $self is bigger than the window and self isn't already position absolute
187	if (($self.height() + 80 >= $(window).height()) && ($self.css('position') != 'absolute' \|\| ie6)) {
188
189	// we are going to make it positioned where the user can see it, but they can still scroll
190	// so the top offset is based on the user's scroll position.
191	var topOffset = $(document).scrollTop() + 40;
192	$self.css({position: 'absolute', top: topOffset + 'px', marginTop: 0})
193	if (ie6) {
194	s.removeExpression('top');
195	}
196	} else if ($self.height()+ 80 < $(window).height()) {
197	//if the height is less than the window height, then we're gonna make this thing position: fixed.
198	// in ie6 we're gonna fake it.
199	if (ie6) {
200	s.position = 'absolute';
201	if (opts.centered) {
202	s.setExpression('top', '(document.documentElement.clientHeight \|\| document.body.clientHeight) / 2 - (this.offsetHeight / 2) + (blah = document.documentElement.scrollTop ? document.documentElement.scrollTop : document.body.scrollTop) + "px"')
203	s.marginTop = 0;
204	} else {
205	var top = (opts.modalCSS && opts.modalCSS.top) ? parseInt(opts.modalCSS.top) : 0;
206	s.setExpression('top', '((blah = document.documentElement.scrollTop ? document.documentElement.scrollTop : document.body.scrollTop) + '+top+') + "px"')
207	}
208	} else {
209	if (opts.centered) {
210	$self.css({ position: 'fixed', top: '50%', marginTop: ($self.outerHeight() / 2) * -1})
211	} else {
212	$self.css({ position: 'fixed'}).css(opts.modalCSS);
213	}
214
215	}
216	}
217	}
218
219	});
220
221
222
223	};
224
225	$.fn.lightbox_me.defaults = {
226
227	// animation
228	appearEffect: "fadeIn",
229	appearEase: "",
230	overlaySpeed: 250,
231	lightboxSpeed: 300,
232
233	// close
234	closeSelector: ".close",
235	closeClick: true,
236	closeEsc: true,
237
238	// behavior
239	destroyOnClose: false,
240	showOverlay: true,
241	parentLightbox: false,
242
243	// callbacks
244	onLoad: function() {},
245	onClose: function() {},
246
247	// style
248	classPrefix: 'lb',
249	zIndex: 999,
250	centered: false,
251	modalCSS: {top: '40px'},
252	overlayCSS: {background: 'black', opacity: .3}
253	}
254	})(jQuery);

Lines 6-17 Link Here

(-)a/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslim2OPACResults.xsl (+4 lines)
6	xmlns:marc="http://www.loc.gov/MARC21/slim"	6	xmlns:marc="http://www.loc.gov/MARC21/slim"
7	xmlns:items="http://www.koha-community.org/items"	7	xmlns:items="http://www.koha-community.org/items"
8	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"	8	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
		9	xmlns="http://www.w3.org/1999/xhtml"
9	exclude-result-prefixes="marc items">	10	exclude-result-prefixes="marc items">
10		11
11	<xsl:import href="UNIMARCslimUtils.xsl"/>	12	<xsl:import href="UNIMARCslimUtils.xsl"/>
12	<xsl:output method = "html" indent="yes" omit-xml-declaration = "yes" encoding="UTF-8"/>	13	<xsl:output method = "html" indent="yes" omit-xml-declaration = "yes" encoding="UTF-8"/>
13	<xsl:key name="item-by-status" match="items:item" use="items:status"/>	14	<xsl:key name="item-by-status" match="items:item" use="items:status"/>
14	<xsl:key name="item-by-status-and-branch" match="items:item" use="concat(items:status, ' ', items:homebranch)"/>	15	<xsl:key name="item-by-status-and-branch" match="items:item" use="concat(items:status, ' ', items:homebranch)"/>
		16	<xsl:param name="showAvailability" select="true()"/>
15		17
16	<xsl:template match="/">	18	<xsl:template match="/">
17	<xsl:apply-templates/>	19	<xsl:apply-templates/>
Lines 99-104 Link Here
99		101
100	<xsl:call-template name="tag_215" />	102	<xsl:call-template name="tag_215" />
101		103
		104	<xsl:if test="$showAvailability">
102	<span class="results_summary availability">	105	<span class="results_summary availability">
103	<span class="label">Availability: </span>	106	<span class="label">Availability: </span>
104	<xsl:choose>	107	<xsl:choose>
Lines 247-252 Link Here
247	</span>	250	</span>
248	</xsl:if>	251	</xsl:if>
249	</span>	252	</span>
		253	</xsl:if>
250		254
251	</xsl:template>	255	</xsl:template>
252		256

Line 0 Link Here

(-)a/opac/opac-external-search.pl (+62 lines)
	1	#!/usr/bin/perl
	2
	3	# Copyright 2013 ByWater Solutions
	4	#
	5	# This file is part of Koha.
	6	#
	7	# Koha is free software; you can redistribute it and/or modify it
	8	# under the terms of the GNU General Public License as published by
	9	# the Free Software Foundation; either version 3 of the License, or
	10	# (at your option) any later version.
	11	#
	12	# Koha is distributed in the hope that it will be useful, but
	13	# WITHOUT ANY WARRANTY; without even the implied warranty of
	14	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	15	# GNU General Public License for more details.
	16	#
	17	# You should have received a copy of the GNU General Public License
	18	# along with Koha; if not, see <http://www.gnu.org/licenses>.
	19
	20	use Modern::Perl;
	21
	22	use CGI;
	23
	24	use C4::Auth qw(:DEFAULT get_session);
	25	use C4::Output;
	26	use C4::Search qw( GetExternalSearchTargets );
	27	use C4::XSLT qw( XSLTGetFilename );
	28
	29	my $cgi = new CGI;
	30
	31	# Getting the template and auth
	32	my ($template, $loggedinuser, $cookie)
	33	= get_template_and_user({template_name => "opac-external-search.tmpl",
	34	query => $cgi,
	35	type => "opac",
	36	authnotrequired => 1,
	37	flagsrequired => {borrowers => 1},
	38	debug => 1,
	39	});
	40
	41	$template->{VARS}->{q} = $cgi->param('q');
	42	$template->{VARS}->{limit} = C4::Context->preference('OPACnumSearchResults') \|\| 20;
	43	$template->{VARS}->{OPACnumSearchResults} = C4::Context->preference('OPACnumSearchResults') \|\| 20;
	44	$template->{VARS}->{external_search_targets} = GetExternalSearchTargets( C4::Context->userenv ? C4::Context->userenv->{branch} : '' );
	45
	46	my @xsltResultStylesheets;
	47	my @xsltDetailStylesheets;
	48
	49	foreach my $syntax ( qw( MARC21 UNIMARC NORMARC ) ) {
	50	if ( XSLTGetFilename( $syntax, 'OPACXSLTResultsDisplay' ) =~ m,/opac-tmpl/.\|^https:?., ) {
	51	push @xsltResultStylesheets, { syntax => $syntax, url => $& };
	52	}
	53
	54	if ( XSLTGetFilename( $syntax, 'OPACXSLTDetailsDisplay' ) =~ m,/opac-tmpl/.\|^https:?., ) {
	55	push @xsltDetailStylesheets, { syntax => $syntax, url => $& };
	56	}
	57	}
	58
	59	$template->{VARS}->{xslt_result_stylesheets} = \@xsltResultStylesheets;
	60	$template->{VARS}->{xslt_detail_stylesheets} = \@xsltDetailStylesheets;
	61
	62	output_html_with_http_headers $cgi, $cookie, $template->output;

Line 0 Link Here

(-)a/opac/svc/pazpar2_init (+100 lines)
		1	#!/usr/bin/perl
		2
		3	# Copyright 2013 ByWater Solutions
		4	#
		5	# This file is part of Koha.
		6	#
		7	# Koha is free software; you can redistribute it and/or modify it
		8	# under the terms of the GNU General Public License as published by
		9	# the Free Software Foundation; either version 3 of the License, or
		10	# (at your option) any later version.
		11	#
		12	# Koha is distributed in the hope that it will be useful, but
		13	# WITHOUT ANY WARRANTY; without even the implied warranty of
		14	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		15	# GNU General Public License for more details.
		16	#
		17	# You should have received a copy of the GNU General Public License
		18	# along with Koha; if not, see <http://www.gnu.org/licenses>.
		19
		20	=head1 NAME
		21
		22	svc/pazpar2_init: Initialize a Pazpar2 session
		23
		24	=head1 SYNOPSIS
		25
		26	svc/pazpar2_init -> ../pazpar2/search.pz2?command=init&...
		27
		28	=head1 DESCRIPTION
		29
		30	This services connects to pazpar2 and authenticates connections on behalf of
		31	client-side search code. The proxy is necessary to prevent exposing
		32	authentication information.
		33
		34	=cut
		35
		36	use strict;
		37	use warnings;
		38
		39	use CGI qw(-oldstyle_urls);
		40	use HTTP::Request::Common;
		41	use JSON;
		42	use URI;
		43	use XML::Simple;
		44
		45	use C4::Context;
		46	use C4::Search;
		47	use C4::Output;
		48
		49	my $dbh = C4::Context->dbh;
		50	my $query = new CGI;
		51
		52	my %init_opts;
		53
		54	my $targets = GetExternalSearchTargets( C4::Context->userenv ? C4::Context->userenv->{branch} : '' );
		55
		56	foreach my $target ( @$targets ) {
		57	my $target_url = $target->{'host'} . ':' . $target->{'port'} . '/' . $target->{'db'};
		58	$init_opts{ 'pz:name[' . $target_url . ']' } = $target->{'name'};
		59	$init_opts{ 'pz:queryencoding[' . $target_url . ']' } = $target->{'encoding'};
		60	$init_opts{ 'pz:xslt[' . $target_url . ']' } = lc( $target->{'syntax'} ) . '-work-groups.xsl';
		61	$init_opts{ 'pz:requestsyntax[' . $target_url . ']' } = $target->{'syntax'};
		62	$init_opts{ 'pz:nativesyntax[' . $target_url . ']' } = 'iso2709';
		63
		64	if ( $target->{'userid'} ) {
65	if ( $target->{'password'} ) {
66	$init_opts{ 'pz:authentication[' . $target_url . ']' } = $target->{'userid'} . '/' . $target->{'password'};
67	} else {
68	$init_opts{ 'pz:authentication[' . $target_url . ']' } = $target->{'userid'};
69	}
70	}
71	}
72
73	my $uri = 'http://' . C4::Context->preference( 'OPACBaseURL' ) . "/pazpar2/search.pz2";
74
75	my $request = HTTP::Request::Common::POST( $uri, [ command => 'init', %init_opts ] );
76
77	my $ua = LWP::UserAgent->new( "Koha " . C4::Context->KOHAVERSION );
78
79	my $response = $ua->request( $request ) ;
80	if ( !$response->is_success ) {
81	print $query->header(
82	-status => '500 Internal Server Error'
83	);
84
85	warn "Pazpar2 init failed: " . $response->message;
86	my $content = to_json({
87	error => 'Could not connect to Pazpar2',
88	});
89	output_with_http_headers $query, undef, $content, 'json', '500 Internal Server Error';
90
91	exit;
92	} else {
93	my $xs = XML::Simple->new;
94	my $data = $xs->XMLin( $response->content );
95
96	my $content = to_json({
97	sessionID => $data->{'session'}
98	});
99	output_with_http_headers $query, undef, $content, 'json', '200 OK';
100	}

Lines 137-144 $prefix = $ENV{'INSTALL_BASE'} \|\| "/usr"; Link Here

(-)a/rewrite-config.PL (-4 / +4 lines)
137	"__INSTALL_ZEBRA__" => 'yes',	137	"__INSTALL_ZEBRA__" => 'yes',
138	"__INSTALL_SRU__" => 'yes',	138	"__INSTALL_SRU__" => 'yes',
139	"__INSTALL_PAZPAR2__" => 'no',	139	"__INSTALL_PAZPAR2__" => 'no',
140	"__PAZPAR2_TOGGLE_XML_PRE__" => '<!--',	140	"__PAZPAR2_TOGGLE_HTTPD_PRE__" => '<IfDefine PAZPAR2_IS_DISABLED>',
141	"__PAZPAR2_TOGGLE_XML_POST__" => '-->',	141	"__PAZPAR2_TOGGLE_HTTPD_POST__" => '</IfDefine>',
142	"__AUTH_INDEX_MODE__" => 'grs1',	142	"__AUTH_INDEX_MODE__" => 'grs1',
143	"__BIB_INDEX_MODE__" => 'grs1',	143	"__BIB_INDEX_MODE__" => 'grs1',
144	"__RUN_DATABASE_TESTS__" => 'no',	144	"__RUN_DATABASE_TESTS__" => 'no',
Lines 158-165 foreach $key (keys %configuration) { Link Here
158	# munge commenting out the PazPar2 mergeserver	158	# munge commenting out the PazPar2 mergeserver
159	# entry in koha-conf.xml if necessary	159	# entry in koha-conf.xml if necessary
160	if ($configuration{'__INSTALL_PAZPAR2__'} eq 'yes') {	160	if ($configuration{'__INSTALL_PAZPAR2__'} eq 'yes') {
161	$configuration{'__PAZPAR2_TOGGLE_XML_PRE__'} = '';	161	$configuration{'__PAZPAR2_TOGGLE_HTTPD_PRE__'} = '';
162	$configuration{'__PAZPAR2_TOGGLE_XML_POST__'} = '';	162	$configuration{'__PAZPAR2_TOGGLE_HTTPD_POST__'} = '';
163	}	163	}
164		164
165	$fname = $ARGV[0];	165	$fname = $ARGV[0];