From 49b8700bc34ec6b47905d008f364a7534d55c0fc Mon Sep 17 00:00:00 2001 From: Fridolyn SOMERS Date: Wed, 21 Nov 2012 11:05:05 +0100 Subject: [PATCH] Bug 9123: Authorities search ordered by authid does not work Signed-off-by: Marcel de Rooy Tested with Zebra, marc21, grs1. Discovered that paging through auth search results does no longer work, but that is not related to these changes. Signed-off-by: Katrin Fischer Tested with Zebra, marc21, dom. All tests pass. Signed-off-by: Jared Camins-Esakov Signed-off-by: Chris Cormack --- C4/AuthoritiesMarc.pm | 4 ++-- .../marc_defs/marc21/authorities/authority-koha-indexdefs.xml | 1 + .../marc21/authorities/authority-zebra-indexdefs.xsl | 2 +- etc/zebradb/marc_defs/marc21/authorities/record.abs | 2 +- etc/zebradb/marc_defs/unimarc/authorities/record.abs | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/C4/AuthoritiesMarc.pm b/C4/AuthoritiesMarc.pm index c8183c1a9d..4a3392f045 100644 --- a/C4/AuthoritiesMarc.pm +++ b/C4/AuthoritiesMarc.pm @@ -292,9 +292,9 @@ sub SearchAuthorities { } elsif ($sortby eq 'HeadingDsc') { $orderstring = '@attr 7=2 @attr 1=Heading 0'; } elsif ($sortby eq 'AuthidAsc') { - $orderstring = '@attr 7=1 @attr 1=Local-Number 0'; + $orderstring = '@attr 7=1 @attr 4=109 @attr 1=Local-Number 0'; } elsif ($sortby eq 'AuthidDsc') { - $orderstring = '@attr 7=2 @attr 1=Local-Number 0'; + $orderstring = '@attr 7=2 @attr 4=109 @attr 1=Local-Number 0'; } $query=($query?$query:"\@attr 1=_ALLRECORDS \@attr 2=103 ''"); $query="\@or $orderstring $query" if $orderstring; diff --git a/etc/zebradb/marc_defs/marc21/authorities/authority-koha-indexdefs.xml b/etc/zebradb/marc_defs/marc21/authorities/authority-koha-indexdefs.xml index 5a34eb261d..752cd57317 100644 --- a/etc/zebradb/marc_defs/marc21/authorities/authority-koha-indexdefs.xml +++ b/etc/zebradb/marc_defs/marc21/authorities/authority-koha-indexdefs.xml @@ -24,6 +24,7 @@ authority-zebra-indexdefs.xsl` Local-Number:w + Local-Number:n Local-Number:s diff --git a/etc/zebradb/marc_defs/marc21/authorities/authority-zebra-indexdefs.xsl b/etc/zebradb/marc_defs/marc21/authorities/authority-zebra-indexdefs.xsl index 02509b3c65..1a9257bc53 100644 --- a/etc/zebradb/marc_defs/marc21/authorities/authority-zebra-indexdefs.xsl +++ b/etc/zebradb/marc_defs/marc21/authorities/authority-zebra-indexdefs.xsl @@ -50,7 +50,7 @@ definition file (probably something like {biblio,authority}-koha-indexdefs.xml) - + diff --git a/etc/zebradb/marc_defs/marc21/authorities/record.abs b/etc/zebradb/marc_defs/marc21/authorities/record.abs index e76107c257..f185887e0f 100644 --- a/etc/zebradb/marc_defs/marc21/authorities/record.abs +++ b/etc/zebradb/marc_defs/marc21/authorities/record.abs @@ -19,7 +19,7 @@ systag sysno rank xpath enable all any -melm 001 Local-Number,Local-Number:s +melm 001 Local-Number,Local-Number:n,Local-Number:s melm 942$a authtype:w,authtype:p # Personal Name diff --git a/etc/zebradb/marc_defs/unimarc/authorities/record.abs b/etc/zebradb/marc_defs/unimarc/authorities/record.abs index 18245c0036..c6ed01ffd1 100644 --- a/etc/zebradb/marc_defs/unimarc/authorities/record.abs +++ b/etc/zebradb/marc_defs/unimarc/authorities/record.abs @@ -11,7 +11,7 @@ systag sysno rank xpath enable all any -melm 001 Local-Number,Local-Number:s +melm 001 Local-Number,Local-Number:n,Local-Number:s melm 942$a authtype melm 152$b authtype:w,authtype:p -- 2.39.5