From dd7de23fed17f1ea9a4ffc5ff55d2b8dd6510f2c Mon Sep 17 00:00:00 2001 From: Olli-Antti Kivilahti Date: Fri, 13 Feb 2015 18:06:19 +0200 Subject: [PATCH] Bug 13707 - Adding a new column datereceived for items and biblioitems. New sortable Zebra index. --- C4/Search.pm | 8 ++++++++ Koha/QueryParser/Driver/PQF.pm | 2 ++ etc/zebradb/biblios/etc/bib1.att | 1 + etc/zebradb/ccl.properties | 3 +++ .../marc21/biblios/biblio-koha-indexdefs.xml | 11 +++++++++++ .../marc21/biblios/biblio-zebra-indexdefs.xsl | 14 ++++++++++++++ .../intranet-tmpl/prog/en/includes/resort_form.inc | 12 ++++++++++++ .../bootstrap/en/includes/resort_form.inc | 10 ++++++++++ 8 files changed, 61 insertions(+) diff --git a/C4/Search.pm b/C4/Search.pm index 5216a12..f7f50cb 100644 --- a/C4/Search.pm +++ b/C4/Search.pm @@ -413,6 +413,12 @@ sub getRecords { elsif ( $sort eq "acqdate_dsc" ) { $sort_by .= "1=32 >i "; } + elsif ( $sort eq "datereceived_asc" ) { + $sort_by .= "1=9015 add_bib1_filter_map( 'biblioserver', 'copydate', { 'target_syntax_callback' => \&Koha::QueryParser::Driver::PQF::date_filter_target_callback, '1' => '30', '4' => '4' }); $self->add_bib1_filter_map( 'biblioserver', 'pubdate', { 'target_syntax_callback' => \&Koha::QueryParser::Driver::PQF::date_filter_target_callback, '1' => 'pubdate', '4' => '4' }); $self->add_bib1_filter_map( 'biblioserver', 'acqdate', { 'target_syntax_callback' => \&Koha::QueryParser::Driver::PQF::date_filter_target_callback, '1' => 'Date-of-acquisition', '4' => '4' }); + $self->add_bib1_field_map('keyword' => 'datereceived' => 'biblioserver' => { '1' => '9015' } ); + $self->add_search_field_alias( 'keyword' => 'date-of-receival' => 'datereceived' ); $self->add_bib1_field_map('keyword' => 'isbn' => 'biblioserver' => { '1' => '7' } ); $self->add_search_field_alias( 'keyword' => 'isbn' => 'nb' ); $self->add_bib1_field_map('keyword' => 'issn' => 'biblioserver' => { '1' => '8' } ); diff --git a/etc/zebradb/biblios/etc/bib1.att b/etc/zebradb/biblios/etc/bib1.att index ed8c64b..8b7baa5 100644 --- a/etc/zebradb/biblios/etc/bib1.att +++ b/etc/zebradb/biblios/etc/bib1.att @@ -219,6 +219,7 @@ att 9009 cn-prefix att 9010 cn-suffix att 9011 Suppress att 9012 Identifier-other +att 9015 Date-of-receival # Items Index att 8001 withdrawn diff --git a/etc/zebradb/ccl.properties b/etc/zebradb/ccl.properties index 99e3498..daf29a0 100644 --- a/etc/zebradb/ccl.properties +++ b/etc/zebradb/ccl.properties @@ -346,6 +346,9 @@ pubdate Date-of-publication Date-of-acquisition 1=32 acqdate Date-of-acquisition +Date-of-receival 1=9015 +datereceived Date-of-receival + #Date/time added to 1011 The date and time that a 008/00-05 #database record was added to the # database. diff --git a/etc/zebradb/marc_defs/marc21/biblios/biblio-koha-indexdefs.xml b/etc/zebradb/marc_defs/marc21/biblios/biblio-koha-indexdefs.xml index c7dd166..4c8c0a8 100644 --- a/etc/zebradb/marc_defs/marc21/biblios/biblio-koha-indexdefs.xml +++ b/etc/zebradb/marc_defs/marc21/biblios/biblio-koha-indexdefs.xml @@ -1095,6 +1095,12 @@ totalissues:n totalissues:s + + + Date-of-receival:w + Date-of-receival:d + Date-of-receival:s + cn-bib-source:w @@ -1255,6 +1261,11 @@ datelastseen:w + + + Date-of-receival:w + Date-of-receival:d + datelastborrowed:w diff --git a/etc/zebradb/marc_defs/marc21/biblios/biblio-zebra-indexdefs.xsl b/etc/zebradb/marc_defs/marc21/biblios/biblio-zebra-indexdefs.xsl index db4c6f2..8a14395 100644 --- a/etc/zebradb/marc_defs/marc21/biblios/biblio-zebra-indexdefs.xsl +++ b/etc/zebradb/marc_defs/marc21/biblios/biblio-zebra-indexdefs.xsl @@ -1056,6 +1056,13 @@ definition file (probably something like {biblio,authority}-koha-indexdefs.xml) + + + + + + + @@ -1296,6 +1303,13 @@ definition file (probably something like {biblio,authority}-koha-indexdefs.xml) + + + + + + + diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/resort_form.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/resort_form.inc index 4326bea..ca1176c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/resort_form.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/resort_form.inc @@ -70,6 +70,18 @@ [% ELSE %] [% END %] + +[% IF ( sort_by == "datereceived_dsc" ) %] + +[% ELSE %] + +[% END %] + +[% IF ( sort_by == "datereceived_asc" ) %] + +[% ELSE %] + +[% END %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/resort_form.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/resort_form.inc index c5a30f6..a20ad96 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/resort_form.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/resort_form.inc @@ -56,6 +56,16 @@ [% ELSE %] [% END %] + [% IF ( sort_by == "datereceived_dsc" ) %] + + [% ELSE %] + + [% END %] + [% IF ( sort_by == "datereceived_asc" ) %] + + [% ELSE %] + + [% END %] [% IF ( sort_by == "title_az" || sort_by == "title_asc" ) %] -- 1.7.9.5