Bugzilla – Attachment 7084 Details for
Bug 7284
Authority matching algorithm improvements
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 7284: Add heading match option to auth plugin
Bug-7284-Add-heading-match-option-to-auth-plugin.patch (text/plain), 54.68 KB, created by
Jared Camins-Esakov
on 2012-01-07 22:33:08 UTC
(
hide
)
Description:
Bug 7284: Add heading match option to auth plugin
Filename:
MIME Type:
Creator:
Jared Camins-Esakov
Created:
2012-01-07 22:33:08 UTC
Size:
54.68 KB
patch
obsolete
>From 476876470fc34760b1d512a2aad5d1b1100a373c Mon Sep 17 00:00:00 2001 >From: Jared Camins-Esakov <jcamins@cpbibliography.com> >Date: Sat, 31 Dec 2011 10:54:23 -0500 >Subject: [PATCH] Bug 7284: Add heading match option to auth plugin >Content-Type: text/plain; charset="UTF-8" > >Added an additional box to the authority finder plugin for "Heading match," >which consults not just the main entry but also See-from and See-also-from >headings. >--- > C4/AuthoritiesMarc.pm | 4 +- > authorities/auth_finder.pl | 8 +- > etc/zebradb/authorities/etc/bib1.att | 1 + > .../authorities/authority-koha-indexdefs.xml | 48 ++++++++ > .../authorities/authority-zebra-indexdefs.xsl | 96 ++++++++-------- > .../marc_defs/unimarc/authorities/record.abs | 120 ++++++++++---------- > .../prog/en/includes/auth-finder-search.inc | 14 ++- > 7 files changed, 177 insertions(+), 114 deletions(-) > >diff --git a/C4/AuthoritiesMarc.pm b/C4/AuthoritiesMarc.pm >index e55183a..49c20b6 100644 >--- a/C4/AuthoritiesMarc.pm >+++ b/C4/AuthoritiesMarc.pm >@@ -229,8 +229,10 @@ sub SearchAuthorities { > > }elsif (@$tags[$i] eq "mainentry") { > $attr =" \@attr 1=Heading "; >- }else{ >+ }elsif (@$tags[$i] eq "any") { > $attr =" \@attr 1=Any "; >+ }else { >+ $attr =" \@attr 1=Match "; > } > if (@$operator[$i] eq 'is') { > $attr.=" \@attr 4=1 \@attr 5=100 ";##Phrase, No truncation,all of subfield field must match >diff --git a/authorities/auth_finder.pl b/authorities/auth_finder.pl >index 99ac2c1..932886b 100755 >--- a/authorities/auth_finder.pl >+++ b/authorities/auth_finder.pl >@@ -60,7 +60,7 @@ if ( $op eq "do_search" ) { > my @and_or = $query->param('and_or'); > my @excluding = $query->param('excluding'); > my @operator = $query->param('operator'); >- my @value = ($query->param('value_mainstr')||undef, $query->param('value_main')||undef, $query->param('value_any')||undef); >+ my @value = ($query->param('value_mainstr')||undef, $query->param('value_main')||undef, $query->param('value_any')||undef, $query->param('value_match')||undef); > my $orderby = $query->param('orderby'); > > $resultsperpage = $query->param('resultsperpage'); >@@ -106,6 +106,7 @@ if ( $op eq "do_search" ) { > push @field_data, { term => "value_mainstr", val => $query->param('value_mainstr') || "" }; > push @field_data, { term => "value_main", val => $query->param('value_main') || "" }; > push @field_data, { term => "value_any", val => $query->param('value_any') || ""}; >+ push @field_data, { term => "value_match", val => $query->param('value_match') || ""}; > > my @numbers = (); > >@@ -162,6 +163,7 @@ if ( $op eq "do_search" ) { > value_mainstr => $query->param('value_mainstr') || "", > value_main => $query->param('value_main') || "", > value_any => $query->param('value_any') || "", >+ value_match => $query->param('value_match') || "", > ); > } else { > ( $template, $loggedinuser, $cookie ) = get_template_and_user( >@@ -183,13 +185,11 @@ $template->param( > value_mainstr => $query->param('value_mainstr') || "", > value_main => $query->param('value_main') || "", > value_any => $query->param('value_any') || "", >+ value_match => $query->param('value_match') || "", > tagid => $tagid, > index => $index, > authtypesloop => \@authtypesloop, > authtypecode => $authtypecode, >- value_mainstr => $query->param('value_mainstr') || "", >- value_main => $query->param('value_main') || "", >- value_any => $query->param('value_any') || "", > ); > > # Print the page >diff --git a/etc/zebradb/authorities/etc/bib1.att b/etc/zebradb/authorities/etc/bib1.att >index b34e6b5..ef462f3 100644 >--- a/etc/zebradb/authorities/etc/bib1.att >+++ b/etc/zebradb/authorities/etc/bib1.att >@@ -74,6 +74,7 @@ att 8807 Subdivision-see-also-from > att 8808 Subdivision-see-from > att 8809 Match-heading-see-from > att 8810 Match-subdivision-see-from >+att 8900 Match > > # General Subdivision (defined in att 47) > att 9023 General-subdivision >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 87d31bc..42cd3a7 100644 >--- a/etc/zebradb/marc_defs/marc21/authorities/authority-koha-indexdefs.xml >+++ b/etc/zebradb/marc_defs/marc21/authorities/authority-koha-indexdefs.xml >@@ -65,6 +65,8 @@ authority-zebra-indexdefs.xsl` > <kohaidx:target_index>Heading-Main:s</kohaidx:target_index> > </kohaidx:index_heading> > <kohaidx:index_match_heading tag="100" subfields="abcdefghjklmnopqrstvxyz" subdivisions="vxyz"> >+ <kohaidx:target_index>Match:w</kohaidx:target_index> >+ <kohaidx:target_index>Match:p</kohaidx:target_index> > <kohaidx:target_index>Match-heading:p</kohaidx:target_index> > <kohaidx:target_index>Match-heading:s</kohaidx:target_index> > </kohaidx:index_match_heading> >@@ -78,6 +80,8 @@ authority-zebra-indexdefs.xsl` > <kohaidx:target_index>See-from:s</kohaidx:target_index> > </kohaidx:index_heading> > <kohaidx:index_match_heading tag="400" subfields="abcdefghjklmnopqrstvxyz" subdivisions="vxyz"> >+ <kohaidx:target_index>Match:w</kohaidx:target_index> >+ <kohaidx:target_index>Match:p</kohaidx:target_index> > <kohaidx:target_index>Match-heading-see-from:p</kohaidx:target_index> > <kohaidx:target_index>Match-heading-see-from:s</kohaidx:target_index> > </kohaidx:index_match_heading> >@@ -89,6 +93,8 @@ authority-zebra-indexdefs.xsl` > <kohaidx:target_index>See-also-from:w</kohaidx:target_index> > <kohaidx:target_index>See-also-from:p</kohaidx:target_index> > <kohaidx:target_index>See-also-from:s</kohaidx:target_index> >+ <kohaidx:target_index>Match:w</kohaidx:target_index> >+ <kohaidx:target_index>Match:p</kohaidx:target_index> > </kohaidx:index_heading> > > <!-- Corporate name headings --> >@@ -110,6 +116,8 @@ authority-zebra-indexdefs.xsl` > <kohaidx:target_index>Heading-Main:s</kohaidx:target_index> > </kohaidx:index_heading> > <kohaidx:index_match_heading tag="110" subfields="abcdefghklmnoprstvxyz" subdivisions="vxyz"> >+ <kohaidx:target_index>Match:w</kohaidx:target_index> >+ <kohaidx:target_index>Match:p</kohaidx:target_index> > <kohaidx:target_index>Match-heading:p</kohaidx:target_index> > <kohaidx:target_index>Match-heading:s</kohaidx:target_index> > </kohaidx:index_match_heading> >@@ -123,6 +131,8 @@ authority-zebra-indexdefs.xsl` > <kohaidx:target_index>See-from:s</kohaidx:target_index> > </kohaidx:index_heading> > <kohaidx:index_match_heading tag="410" subfields="abcdefghklmnoprstvxyz" subdivisions="vxyz"> >+ <kohaidx:target_index>Match:w</kohaidx:target_index> >+ <kohaidx:target_index>Match:p</kohaidx:target_index> > <kohaidx:target_index>Match-heading-see-from:p</kohaidx:target_index> > <kohaidx:target_index>Match-heading-see-from:s</kohaidx:target_index> > </kohaidx:index_match_heading> >@@ -134,6 +144,8 @@ authority-zebra-indexdefs.xsl` > <kohaidx:target_index>See-also-from:w</kohaidx:target_index> > <kohaidx:target_index>See-also-from:p</kohaidx:target_index> > <kohaidx:target_index>See-also-from:s</kohaidx:target_index> >+ <kohaidx:target_index>Match:w</kohaidx:target_index> >+ <kohaidx:target_index>Match:p</kohaidx:target_index> > </kohaidx:index_heading> > > <!-- Meeting name --> >@@ -155,6 +167,8 @@ authority-zebra-indexdefs.xsl` > <kohaidx:target_index>Heading-Main:s</kohaidx:target_index> > </kohaidx:index_heading> > <kohaidx:index_match_heading tag="111" subfields="acdefghjklnpqstvxyz" subdivisions="vxyz"> >+ <kohaidx:target_index>Match:w</kohaidx:target_index> >+ <kohaidx:target_index>Match:p</kohaidx:target_index> > <kohaidx:target_index>Match-heading:p</kohaidx:target_index> > <kohaidx:target_index>Match-heading:s</kohaidx:target_index> > </kohaidx:index_match_heading> >@@ -168,6 +182,8 @@ authority-zebra-indexdefs.xsl` > <kohaidx:target_index>See-from:s</kohaidx:target_index> > </kohaidx:index_heading> > <kohaidx:index_match_heading tag="411" subfields="acdefghjklnpqstvxyz" subdivisions="vxyz"> >+ <kohaidx:target_index>Match:w</kohaidx:target_index> >+ <kohaidx:target_index>Match:p</kohaidx:target_index> > <kohaidx:target_index>Match-heading-see-from:p</kohaidx:target_index> > <kohaidx:target_index>Match-heading-see-from:s</kohaidx:target_index> > </kohaidx:index_match_heading> >@@ -179,6 +195,8 @@ authority-zebra-indexdefs.xsl` > <kohaidx:target_index>See-also-from:w</kohaidx:target_index> > <kohaidx:target_index>See-also-from:p</kohaidx:target_index> > <kohaidx:target_index>See-also-from:s</kohaidx:target_index> >+ <kohaidx:target_index>Match:w</kohaidx:target_index> >+ <kohaidx:target_index>Match:p</kohaidx:target_index> > </kohaidx:index_heading> > > <!-- Uniform title --> >@@ -200,6 +218,8 @@ authority-zebra-indexdefs.xsl` > <kohaidx:target_index>Heading-Main:s</kohaidx:target_index> > </kohaidx:index_heading> > <kohaidx:index_match_heading tag="130" subfields="adfghklmnoprstvxyz" subdivisions="vxyz"> >+ <kohaidx:target_index>Match:w</kohaidx:target_index> >+ <kohaidx:target_index>Match:p</kohaidx:target_index> > <kohaidx:target_index>Match-heading:p</kohaidx:target_index> > <kohaidx:target_index>Match-heading:s</kohaidx:target_index> > </kohaidx:index_match_heading> >@@ -213,6 +233,8 @@ authority-zebra-indexdefs.xsl` > <kohaidx:target_index>See-from:s</kohaidx:target_index> > </kohaidx:index_heading> > <kohaidx:index_match_heading tag="430" subfields="adfghklmnoprstvxyz" subdivisions="vxyz"> >+ <kohaidx:target_index>Match:w</kohaidx:target_index> >+ <kohaidx:target_index>Match:p</kohaidx:target_index> > <kohaidx:target_index>Match-heading-see-from:p</kohaidx:target_index> > <kohaidx:target_index>Match-heading-see-from:s</kohaidx:target_index> > </kohaidx:index_match_heading> >@@ -224,6 +246,8 @@ authority-zebra-indexdefs.xsl` > <kohaidx:target_index>See-also-from:w</kohaidx:target_index> > <kohaidx:target_index>See-also-from:p</kohaidx:target_index> > <kohaidx:target_index>See-also-from:s</kohaidx:target_index> >+ <kohaidx:target_index>Match:w</kohaidx:target_index> >+ <kohaidx:target_index>Match:p</kohaidx:target_index> > </kohaidx:index_heading> > > <!-- Chronological term --> >@@ -245,6 +269,8 @@ authority-zebra-indexdefs.xsl` > <kohaidx:target_index>Heading-Main:s</kohaidx:target_index> > </kohaidx:index_heading> > <kohaidx:index_match_heading tag="148" subfields="avxyz" subdivisions="vxyz"> >+ <kohaidx:target_index>Match:w</kohaidx:target_index> >+ <kohaidx:target_index>Match:p</kohaidx:target_index> > <kohaidx:target_index>Match-heading:p</kohaidx:target_index> > <kohaidx:target_index>Match-heading:s</kohaidx:target_index> > </kohaidx:index_match_heading> >@@ -258,6 +284,8 @@ authority-zebra-indexdefs.xsl` > <kohaidx:target_index>See-from:s</kohaidx:target_index> > </kohaidx:index_heading> > <kohaidx:index_match_heading tag="448" subfields="avxyz" subdivisions="vxyz"> >+ <kohaidx:target_index>Match:w</kohaidx:target_index> >+ <kohaidx:target_index>Match:p</kohaidx:target_index> > <kohaidx:target_index>Match-heading-see-from:p</kohaidx:target_index> > <kohaidx:target_index>Match-heading-see-from:s</kohaidx:target_index> > </kohaidx:index_match_heading> >@@ -269,6 +297,8 @@ authority-zebra-indexdefs.xsl` > <kohaidx:target_index>See-also-from:w</kohaidx:target_index> > <kohaidx:target_index>See-also-from:p</kohaidx:target_index> > <kohaidx:target_index>See-also-from:s</kohaidx:target_index> >+ <kohaidx:target_index>Match:w</kohaidx:target_index> >+ <kohaidx:target_index>Match:p</kohaidx:target_index> > </kohaidx:index_heading> > > >@@ -291,6 +321,8 @@ authority-zebra-indexdefs.xsl` > <kohaidx:target_index>Heading-Main:s</kohaidx:target_index> > </kohaidx:index_heading> > <kohaidx:index_match_heading tag="150" subfields="abvxyz" subdivisions="vxyz"> >+ <kohaidx:target_index>Match:w</kohaidx:target_index> >+ <kohaidx:target_index>Match:p</kohaidx:target_index> > <kohaidx:target_index>Match-heading:p</kohaidx:target_index> > <kohaidx:target_index>Match-heading:s</kohaidx:target_index> > </kohaidx:index_match_heading> >@@ -304,6 +336,8 @@ authority-zebra-indexdefs.xsl` > <kohaidx:target_index>See-from:s</kohaidx:target_index> > </kohaidx:index_heading> > <kohaidx:index_match_heading tag="450" subfields="abvxyz" subdivisions="vxyz"> >+ <kohaidx:target_index>Match:w</kohaidx:target_index> >+ <kohaidx:target_index>Match:p</kohaidx:target_index> > <kohaidx:target_index>Match-heading-see-from:p</kohaidx:target_index> > <kohaidx:target_index>Match-heading-see-from:s</kohaidx:target_index> > </kohaidx:index_match_heading> >@@ -315,6 +349,8 @@ authority-zebra-indexdefs.xsl` > <kohaidx:target_index>See-also-from:w</kohaidx:target_index> > <kohaidx:target_index>See-also-from:p</kohaidx:target_index> > <kohaidx:target_index>See-also-from:s</kohaidx:target_index> >+ <kohaidx:target_index>Match:w</kohaidx:target_index> >+ <kohaidx:target_index>Match:p</kohaidx:target_index> > </kohaidx:index_heading> > > <!-- Geographic name --> >@@ -336,6 +372,8 @@ authority-zebra-indexdefs.xsl` > <kohaidx:target_index>Heading-Main:s</kohaidx:target_index> > </kohaidx:index_heading> > <kohaidx:index_match_heading tag="151" subfields="avxyz" subdivisions="vxyz"> >+ <kohaidx:target_index>Match:w</kohaidx:target_index> >+ <kohaidx:target_index>Match:p</kohaidx:target_index> > <kohaidx:target_index>Match-heading:p</kohaidx:target_index> > <kohaidx:target_index>Match-heading:s</kohaidx:target_index> > </kohaidx:index_match_heading> >@@ -349,6 +387,8 @@ authority-zebra-indexdefs.xsl` > <kohaidx:target_index>See-from:s</kohaidx:target_index> > </kohaidx:index_heading> > <kohaidx:index_match_heading tag="451" subfields="avxyz" subdivisions="vxyz"> >+ <kohaidx:target_index>Match:w</kohaidx:target_index> >+ <kohaidx:target_index>Match:p</kohaidx:target_index> > <kohaidx:target_index>Match-heading-see-from:p</kohaidx:target_index> > <kohaidx:target_index>Match-heading-see-from:s</kohaidx:target_index> > </kohaidx:index_match_heading> >@@ -360,6 +400,8 @@ authority-zebra-indexdefs.xsl` > <kohaidx:target_index>See-also-from:w</kohaidx:target_index> > <kohaidx:target_index>See-also-from:p</kohaidx:target_index> > <kohaidx:target_index>See-also-from:s</kohaidx:target_index> >+ <kohaidx:target_index>Match:w</kohaidx:target_index> >+ <kohaidx:target_index>Match:p</kohaidx:target_index> > </kohaidx:index_heading> > > <!-- Genre/form term --> >@@ -381,6 +423,8 @@ authority-zebra-indexdefs.xsl` > <kohaidx:target_index>Heading-Main:s</kohaidx:target_index> > </kohaidx:index_heading> > <kohaidx:index_match_heading tag="155" subfields="avxyz" subdivisions="vxyz"> >+ <kohaidx:target_index>Match:w</kohaidx:target_index> >+ <kohaidx:target_index>Match:p</kohaidx:target_index> > <kohaidx:target_index>Match-heading:p</kohaidx:target_index> > <kohaidx:target_index>Match-heading:s</kohaidx:target_index> > </kohaidx:index_match_heading> >@@ -394,6 +438,8 @@ authority-zebra-indexdefs.xsl` > <kohaidx:target_index>See-from:s</kohaidx:target_index> > </kohaidx:index_heading> > <kohaidx:index_match_heading tag="455" subfields="avxyz" subdivisions="vxyz"> >+ <kohaidx:target_index>Match:w</kohaidx:target_index> >+ <kohaidx:target_index>Match:p</kohaidx:target_index> > <kohaidx:target_index>Match-heading-see-from:p</kohaidx:target_index> > <kohaidx:target_index>Match-heading-see-from:s</kohaidx:target_index> > </kohaidx:index_match_heading> >@@ -405,6 +451,8 @@ authority-zebra-indexdefs.xsl` > <kohaidx:target_index>See-also-from:w</kohaidx:target_index> > <kohaidx:target_index>See-also-from:p</kohaidx:target_index> > <kohaidx:target_index>See-also-from:s</kohaidx:target_index> >+ <kohaidx:target_index>Match:w</kohaidx:target_index> >+ <kohaidx:target_index>Match:p</kohaidx:target_index> > </kohaidx:index_heading> > > <!-- General subdivision --> >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 5c37bc6..079cb51 100644 >--- a/etc/zebradb/marc_defs/marc21/authorities/authority-zebra-indexdefs.xsl >+++ b/etc/zebradb/marc_defs/marc21/authorities/authority-zebra-indexdefs.xsl >@@ -213,10 +213,10 @@ authority-zebra-indexdefs.xsl` (substituting the appropriate file names). > </z:index> > </xslo:template> > <xslo:template mode="index_heading" match="marc:datafield[@tag='500']"> >- <z:index name="Personal-name-see-also-from:w Personal-name-see-also-from:p Personal-name-see-also-from:s See-also-from:w See-also-from:p See-also-from:s"> >+ <z:index name="Personal-name-see-also-from:w Personal-name-see-also-from:p Personal-name-see-also-from:s See-also-from:w See-also-from:p See-also-from:s Match:w Match:p"> > <xslo:variable name="raw_heading"> > <xslo:for-each select="marc:subfield"> >- <xslo:if test="contains('abcdefghjklmnopqrstvxyz', @code)" name="Personal-name-see-also-from:w Personal-name-see-also-from:p Personal-name-see-also-from:s See-also-from:w See-also-from:p See-also-from:s"> >+ <xslo:if test="contains('abcdefghjklmnopqrstvxyz', @code)" name="Personal-name-see-also-from:w Personal-name-see-also-from:p Personal-name-see-also-from:s See-also-from:w See-also-from:p See-also-from:s Match:w Match:p"> > <xslo:if test="position() > 1"> > <xslo:choose> > <xslo:when test="contains('vxyz', @code)"> >@@ -299,10 +299,10 @@ authority-zebra-indexdefs.xsl` (substituting the appropriate file names). > </z:index> > </xslo:template> > <xslo:template mode="index_heading" match="marc:datafield[@tag='510']"> >- <z:index name="Corporate-name-see-also-from:w Corporate-name-see-also-from:p Corporate-name-see-also-from:s See-also-from:w See-also-from:p See-also-from:s"> >+ <z:index name="Corporate-name-see-also-from:w Corporate-name-see-also-from:p Corporate-name-see-also-from:s See-also-from:w See-also-from:p See-also-from:s Match:w Match:p"> > <xslo:variable name="raw_heading"> > <xslo:for-each select="marc:subfield"> >- <xslo:if test="contains('abcdefghklmnoprstvxyz', @code)" name="Corporate-name-see-also-from:w Corporate-name-see-also-from:p Corporate-name-see-also-from:s See-also-from:w See-also-from:p See-also-from:s"> >+ <xslo:if test="contains('abcdefghklmnoprstvxyz', @code)" name="Corporate-name-see-also-from:w Corporate-name-see-also-from:p Corporate-name-see-also-from:s See-also-from:w See-also-from:p See-also-from:s Match:w Match:p"> > <xslo:if test="position() > 1"> > <xslo:choose> > <xslo:when test="contains('vxyz', @code)"> >@@ -385,10 +385,10 @@ authority-zebra-indexdefs.xsl` (substituting the appropriate file names). > </z:index> > </xslo:template> > <xslo:template mode="index_heading" match="marc:datafield[@tag='511']"> >- <z:index name="Meeting-name-see-also-from:w Meeting-name-see-also-from:p Meeting-name-see-also-from:s See-also-from:w See-also-from:p See-also-from:s"> >+ <z:index name="Meeting-name-see-also-from:w Meeting-name-see-also-from:p Meeting-name-see-also-from:s See-also-from:w See-also-from:p See-also-from:s Match:w Match:p"> > <xslo:variable name="raw_heading"> > <xslo:for-each select="marc:subfield"> >- <xslo:if test="contains('acdefghjklnpqstvxyz', @code)" name="Meeting-name-see-also-from:w Meeting-name-see-also-from:p Meeting-name-see-also-from:s See-also-from:w See-also-from:p See-also-from:s"> >+ <xslo:if test="contains('acdefghjklnpqstvxyz', @code)" name="Meeting-name-see-also-from:w Meeting-name-see-also-from:p Meeting-name-see-also-from:s See-also-from:w See-also-from:p See-also-from:s Match:w Match:p"> > <xslo:if test="position() > 1"> > <xslo:choose> > <xslo:when test="contains('vxyz', @code)"> >@@ -471,10 +471,10 @@ authority-zebra-indexdefs.xsl` (substituting the appropriate file names). > </z:index> > </xslo:template> > <xslo:template mode="index_heading" match="marc:datafield[@tag='530']"> >- <z:index name="Title-uniform-see-also-from:w Title-uniform-see-also-from:p Title-uniform-see-also-from:s See-also-from:w See-also-from:p See-also-from:s"> >+ <z:index name="Title-uniform-see-also-from:w Title-uniform-see-also-from:p Title-uniform-see-also-from:s See-also-from:w See-also-from:p See-also-from:s Match:w Match:p"> > <xslo:variable name="raw_heading"> > <xslo:for-each select="marc:subfield"> >- <xslo:if test="contains('adfghklmnoprstvxyz', @code)" name="Title-uniform-see-also-from:w Title-uniform-see-also-from:p Title-uniform-see-also-from:s See-also-from:w See-also-from:p See-also-from:s"> >+ <xslo:if test="contains('adfghklmnoprstvxyz', @code)" name="Title-uniform-see-also-from:w Title-uniform-see-also-from:p Title-uniform-see-also-from:s See-also-from:w See-also-from:p See-also-from:s Match:w Match:p"> > <xslo:if test="position() > 1"> > <xslo:choose> > <xslo:when test="contains('vxyz', @code)"> >@@ -557,10 +557,10 @@ authority-zebra-indexdefs.xsl` (substituting the appropriate file names). > </z:index> > </xslo:template> > <xslo:template mode="index_heading" match="marc:datafield[@tag='548']"> >- <z:index name="Chronological-term-see-also-from:w Chronological-term-see-also-from:p Chronological-term-see-also-from:s See-also-from:w See-also-from:p See-also-from:s"> >+ <z:index name="Chronological-term-see-also-from:w Chronological-term-see-also-from:p Chronological-term-see-also-from:s See-also-from:w See-also-from:p See-also-from:s Match:w Match:p"> > <xslo:variable name="raw_heading"> > <xslo:for-each select="marc:subfield"> >- <xslo:if test="contains('avxyz', @code)" name="Chronological-term-see-also-from:w Chronological-term-see-also-from:p Chronological-term-see-also-from:s See-also-from:w See-also-from:p See-also-from:s"> >+ <xslo:if test="contains('avxyz', @code)" name="Chronological-term-see-also-from:w Chronological-term-see-also-from:p Chronological-term-see-also-from:s See-also-from:w See-also-from:p See-also-from:s Match:w Match:p"> > <xslo:if test="position() > 1"> > <xslo:choose> > <xslo:when test="contains('vxyz', @code)"> >@@ -643,10 +643,10 @@ authority-zebra-indexdefs.xsl` (substituting the appropriate file names). > </z:index> > </xslo:template> > <xslo:template mode="index_heading" match="marc:datafield[@tag='550']"> >- <z:index name="Subject-topical-see-also-from:w Subject-topical-see-also-from:p Subject-topical-see-also-from:s See-also-from:w See-also-from:p See-also-from:s"> >+ <z:index name="Subject-topical-see-also-from:w Subject-topical-see-also-from:p Subject-topical-see-also-from:s See-also-from:w See-also-from:p See-also-from:s Match:w Match:p"> > <xslo:variable name="raw_heading"> > <xslo:for-each select="marc:subfield"> >- <xslo:if test="contains('abvxyz', @code)" name="Subject-topical-see-also-from:w Subject-topical-see-also-from:p Subject-topical-see-also-from:s See-also-from:w See-also-from:p See-also-from:s"> >+ <xslo:if test="contains('abvxyz', @code)" name="Subject-topical-see-also-from:w Subject-topical-see-also-from:p Subject-topical-see-also-from:s See-also-from:w See-also-from:p See-also-from:s Match:w Match:p"> > <xslo:if test="position() > 1"> > <xslo:choose> > <xslo:when test="contains('vxyz', @code)"> >@@ -729,10 +729,10 @@ authority-zebra-indexdefs.xsl` (substituting the appropriate file names). > </z:index> > </xslo:template> > <xslo:template mode="index_heading" match="marc:datafield[@tag='551']"> >- <z:index name="Name-geographic-see-also-from:w Name-geographic-see-also-from:p Name-geographic-see-also-from:s See-also-from:w See-also-from:p See-also-from:s"> >+ <z:index name="Name-geographic-see-also-from:w Name-geographic-see-also-from:p Name-geographic-see-also-from:s See-also-from:w See-also-from:p See-also-from:s Match:w Match:p"> > <xslo:variable name="raw_heading"> > <xslo:for-each select="marc:subfield"> >- <xslo:if test="contains('avxyz', @code)" name="Name-geographic-see-also-from:w Name-geographic-see-also-from:p Name-geographic-see-also-from:s See-also-from:w See-also-from:p See-also-from:s"> >+ <xslo:if test="contains('avxyz', @code)" name="Name-geographic-see-also-from:w Name-geographic-see-also-from:p Name-geographic-see-also-from:s See-also-from:w See-also-from:p See-also-from:s Match:w Match:p"> > <xslo:if test="position() > 1"> > <xslo:choose> > <xslo:when test="contains('vxyz', @code)"> >@@ -815,10 +815,10 @@ authority-zebra-indexdefs.xsl` (substituting the appropriate file names). > </z:index> > </xslo:template> > <xslo:template mode="index_heading" match="marc:datafield[@tag='555']"> >- <z:index name="Term-genre-form-see-also-from:w Term-genre-form-see-also-from:p Term-genre-form-see-also-from:s See-also-from:w See-also-from:p See-also-from:s"> >+ <z:index name="Term-genre-form-see-also-from:w Term-genre-form-see-also-from:p Term-genre-form-see-also-from:s See-also-from:w See-also-from:p See-also-from:s Match:w Match:p"> > <xslo:variable name="raw_heading"> > <xslo:for-each select="marc:subfield"> >- <xslo:if test="contains('avxyz', @code)" name="Term-genre-form-see-also-from:w Term-genre-form-see-also-from:p Term-genre-form-see-also-from:s See-also-from:w See-also-from:p See-also-from:s"> >+ <xslo:if test="contains('avxyz', @code)" name="Term-genre-form-see-also-from:w Term-genre-form-see-also-from:p Term-genre-form-see-also-from:s See-also-from:w See-also-from:p See-also-from:s Match:w Match:p"> > <xslo:if test="position() > 1"> > <xslo:choose> > <xslo:when test="contains('vxyz', @code)"> >@@ -1101,10 +1101,10 @@ authority-zebra-indexdefs.xsl` (substituting the appropriate file names). > </z:index> > </xslo:template> > <xslo:template mode="index_match_heading" match="marc:datafield[@tag='100']"> >- <z:index name="Match-heading:p Match-heading:s"> >+ <z:index name="Match:w Match:p Match-heading:p Match-heading:s"> > <xslo:variable name="raw_heading"> > <xslo:for-each select="marc:subfield"> >- <xslo:if test="contains('abcdefghjklmnopqrstvxyz', @code)" name="Match-heading:p Match-heading:s"> >+ <xslo:if test="contains('abcdefghjklmnopqrstvxyz', @code)" name="Match:w Match:p Match-heading:p Match-heading:s"> > <xslo:if test="position() > 1"> > <xslo:choose> > <xslo:when test="contains('vxyz', @code)"> >@@ -1136,10 +1136,10 @@ authority-zebra-indexdefs.xsl` (substituting the appropriate file names). > </z:index> > </xslo:template> > <xslo:template mode="index_match_heading" match="marc:datafield[@tag='400']"> >- <z:index name="Match-heading-see-from:p Match-heading-see-from:s"> >+ <z:index name="Match:w Match:p Match-heading-see-from:p Match-heading-see-from:s"> > <xslo:variable name="raw_heading"> > <xslo:for-each select="marc:subfield"> >- <xslo:if test="contains('abcdefghjklmnopqrstvxyz', @code)" name="Match-heading-see-from:p Match-heading-see-from:s"> >+ <xslo:if test="contains('abcdefghjklmnopqrstvxyz', @code)" name="Match:w Match:p Match-heading-see-from:p Match-heading-see-from:s"> > <xslo:if test="position() > 1"> > <xslo:choose> > <xslo:when test="contains('vxyz', @code)"> >@@ -1171,10 +1171,10 @@ authority-zebra-indexdefs.xsl` (substituting the appropriate file names). > </z:index> > </xslo:template> > <xslo:template mode="index_match_heading" match="marc:datafield[@tag='110']"> >- <z:index name="Match-heading:p Match-heading:s"> >+ <z:index name="Match:w Match:p Match-heading:p Match-heading:s"> > <xslo:variable name="raw_heading"> > <xslo:for-each select="marc:subfield"> >- <xslo:if test="contains('abcdefghklmnoprstvxyz', @code)" name="Match-heading:p Match-heading:s"> >+ <xslo:if test="contains('abcdefghklmnoprstvxyz', @code)" name="Match:w Match:p Match-heading:p Match-heading:s"> > <xslo:if test="position() > 1"> > <xslo:choose> > <xslo:when test="contains('vxyz', @code)"> >@@ -1206,10 +1206,10 @@ authority-zebra-indexdefs.xsl` (substituting the appropriate file names). > </z:index> > </xslo:template> > <xslo:template mode="index_match_heading" match="marc:datafield[@tag='410']"> >- <z:index name="Match-heading-see-from:p Match-heading-see-from:s"> >+ <z:index name="Match:w Match:p Match-heading-see-from:p Match-heading-see-from:s"> > <xslo:variable name="raw_heading"> > <xslo:for-each select="marc:subfield"> >- <xslo:if test="contains('abcdefghklmnoprstvxyz', @code)" name="Match-heading-see-from:p Match-heading-see-from:s"> >+ <xslo:if test="contains('abcdefghklmnoprstvxyz', @code)" name="Match:w Match:p Match-heading-see-from:p Match-heading-see-from:s"> > <xslo:if test="position() > 1"> > <xslo:choose> > <xslo:when test="contains('vxyz', @code)"> >@@ -1241,10 +1241,10 @@ authority-zebra-indexdefs.xsl` (substituting the appropriate file names). > </z:index> > </xslo:template> > <xslo:template mode="index_match_heading" match="marc:datafield[@tag='111']"> >- <z:index name="Match-heading:p Match-heading:s"> >+ <z:index name="Match:w Match:p Match-heading:p Match-heading:s"> > <xslo:variable name="raw_heading"> > <xslo:for-each select="marc:subfield"> >- <xslo:if test="contains('acdefghjklnpqstvxyz', @code)" name="Match-heading:p Match-heading:s"> >+ <xslo:if test="contains('acdefghjklnpqstvxyz', @code)" name="Match:w Match:p Match-heading:p Match-heading:s"> > <xslo:if test="position() > 1"> > <xslo:choose> > <xslo:when test="contains('vxyz', @code)"> >@@ -1276,10 +1276,10 @@ authority-zebra-indexdefs.xsl` (substituting the appropriate file names). > </z:index> > </xslo:template> > <xslo:template mode="index_match_heading" match="marc:datafield[@tag='411']"> >- <z:index name="Match-heading-see-from:p Match-heading-see-from:s"> >+ <z:index name="Match:w Match:p Match-heading-see-from:p Match-heading-see-from:s"> > <xslo:variable name="raw_heading"> > <xslo:for-each select="marc:subfield"> >- <xslo:if test="contains('acdefghjklnpqstvxyz', @code)" name="Match-heading-see-from:p Match-heading-see-from:s"> >+ <xslo:if test="contains('acdefghjklnpqstvxyz', @code)" name="Match:w Match:p Match-heading-see-from:p Match-heading-see-from:s"> > <xslo:if test="position() > 1"> > <xslo:choose> > <xslo:when test="contains('vxyz', @code)"> >@@ -1311,10 +1311,10 @@ authority-zebra-indexdefs.xsl` (substituting the appropriate file names). > </z:index> > </xslo:template> > <xslo:template mode="index_match_heading" match="marc:datafield[@tag='130']"> >- <z:index name="Match-heading:p Match-heading:s"> >+ <z:index name="Match:w Match:p Match-heading:p Match-heading:s"> > <xslo:variable name="raw_heading"> > <xslo:for-each select="marc:subfield"> >- <xslo:if test="contains('adfghklmnoprstvxyz', @code)" name="Match-heading:p Match-heading:s"> >+ <xslo:if test="contains('adfghklmnoprstvxyz', @code)" name="Match:w Match:p Match-heading:p Match-heading:s"> > <xslo:if test="position() > 1"> > <xslo:choose> > <xslo:when test="contains('vxyz', @code)"> >@@ -1346,10 +1346,10 @@ authority-zebra-indexdefs.xsl` (substituting the appropriate file names). > </z:index> > </xslo:template> > <xslo:template mode="index_match_heading" match="marc:datafield[@tag='430']"> >- <z:index name="Match-heading-see-from:p Match-heading-see-from:s"> >+ <z:index name="Match:w Match:p Match-heading-see-from:p Match-heading-see-from:s"> > <xslo:variable name="raw_heading"> > <xslo:for-each select="marc:subfield"> >- <xslo:if test="contains('adfghklmnoprstvxyz', @code)" name="Match-heading-see-from:p Match-heading-see-from:s"> >+ <xslo:if test="contains('adfghklmnoprstvxyz', @code)" name="Match:w Match:p Match-heading-see-from:p Match-heading-see-from:s"> > <xslo:if test="position() > 1"> > <xslo:choose> > <xslo:when test="contains('vxyz', @code)"> >@@ -1381,10 +1381,10 @@ authority-zebra-indexdefs.xsl` (substituting the appropriate file names). > </z:index> > </xslo:template> > <xslo:template mode="index_match_heading" match="marc:datafield[@tag='148']"> >- <z:index name="Match-heading:p Match-heading:s"> >+ <z:index name="Match:w Match:p Match-heading:p Match-heading:s"> > <xslo:variable name="raw_heading"> > <xslo:for-each select="marc:subfield"> >- <xslo:if test="contains('avxyz', @code)" name="Match-heading:p Match-heading:s"> >+ <xslo:if test="contains('avxyz', @code)" name="Match:w Match:p Match-heading:p Match-heading:s"> > <xslo:if test="position() > 1"> > <xslo:choose> > <xslo:when test="contains('vxyz', @code)"> >@@ -1416,10 +1416,10 @@ authority-zebra-indexdefs.xsl` (substituting the appropriate file names). > </z:index> > </xslo:template> > <xslo:template mode="index_match_heading" match="marc:datafield[@tag='448']"> >- <z:index name="Match-heading-see-from:p Match-heading-see-from:s"> >+ <z:index name="Match:w Match:p Match-heading-see-from:p Match-heading-see-from:s"> > <xslo:variable name="raw_heading"> > <xslo:for-each select="marc:subfield"> >- <xslo:if test="contains('avxyz', @code)" name="Match-heading-see-from:p Match-heading-see-from:s"> >+ <xslo:if test="contains('avxyz', @code)" name="Match:w Match:p Match-heading-see-from:p Match-heading-see-from:s"> > <xslo:if test="position() > 1"> > <xslo:choose> > <xslo:when test="contains('vxyz', @code)"> >@@ -1451,10 +1451,10 @@ authority-zebra-indexdefs.xsl` (substituting the appropriate file names). > </z:index> > </xslo:template> > <xslo:template mode="index_match_heading" match="marc:datafield[@tag='150']"> >- <z:index name="Match-heading:p Match-heading:s"> >+ <z:index name="Match:w Match:p Match-heading:p Match-heading:s"> > <xslo:variable name="raw_heading"> > <xslo:for-each select="marc:subfield"> >- <xslo:if test="contains('abvxyz', @code)" name="Match-heading:p Match-heading:s"> >+ <xslo:if test="contains('abvxyz', @code)" name="Match:w Match:p Match-heading:p Match-heading:s"> > <xslo:if test="position() > 1"> > <xslo:choose> > <xslo:when test="contains('vxyz', @code)"> >@@ -1486,10 +1486,10 @@ authority-zebra-indexdefs.xsl` (substituting the appropriate file names). > </z:index> > </xslo:template> > <xslo:template mode="index_match_heading" match="marc:datafield[@tag='450']"> >- <z:index name="Match-heading-see-from:p Match-heading-see-from:s"> >+ <z:index name="Match:w Match:p Match-heading-see-from:p Match-heading-see-from:s"> > <xslo:variable name="raw_heading"> > <xslo:for-each select="marc:subfield"> >- <xslo:if test="contains('abvxyz', @code)" name="Match-heading-see-from:p Match-heading-see-from:s"> >+ <xslo:if test="contains('abvxyz', @code)" name="Match:w Match:p Match-heading-see-from:p Match-heading-see-from:s"> > <xslo:if test="position() > 1"> > <xslo:choose> > <xslo:when test="contains('vxyz', @code)"> >@@ -1521,10 +1521,10 @@ authority-zebra-indexdefs.xsl` (substituting the appropriate file names). > </z:index> > </xslo:template> > <xslo:template mode="index_match_heading" match="marc:datafield[@tag='151']"> >- <z:index name="Match-heading:p Match-heading:s"> >+ <z:index name="Match:w Match:p Match-heading:p Match-heading:s"> > <xslo:variable name="raw_heading"> > <xslo:for-each select="marc:subfield"> >- <xslo:if test="contains('avxyz', @code)" name="Match-heading:p Match-heading:s"> >+ <xslo:if test="contains('avxyz', @code)" name="Match:w Match:p Match-heading:p Match-heading:s"> > <xslo:if test="position() > 1"> > <xslo:choose> > <xslo:when test="contains('vxyz', @code)"> >@@ -1556,10 +1556,10 @@ authority-zebra-indexdefs.xsl` (substituting the appropriate file names). > </z:index> > </xslo:template> > <xslo:template mode="index_match_heading" match="marc:datafield[@tag='451']"> >- <z:index name="Match-heading-see-from:p Match-heading-see-from:s"> >+ <z:index name="Match:w Match:p Match-heading-see-from:p Match-heading-see-from:s"> > <xslo:variable name="raw_heading"> > <xslo:for-each select="marc:subfield"> >- <xslo:if test="contains('avxyz', @code)" name="Match-heading-see-from:p Match-heading-see-from:s"> >+ <xslo:if test="contains('avxyz', @code)" name="Match:w Match:p Match-heading-see-from:p Match-heading-see-from:s"> > <xslo:if test="position() > 1"> > <xslo:choose> > <xslo:when test="contains('vxyz', @code)"> >@@ -1591,10 +1591,10 @@ authority-zebra-indexdefs.xsl` (substituting the appropriate file names). > </z:index> > </xslo:template> > <xslo:template mode="index_match_heading" match="marc:datafield[@tag='155']"> >- <z:index name="Match-heading:p Match-heading:s"> >+ <z:index name="Match:w Match:p Match-heading:p Match-heading:s"> > <xslo:variable name="raw_heading"> > <xslo:for-each select="marc:subfield"> >- <xslo:if test="contains('avxyz', @code)" name="Match-heading:p Match-heading:s"> >+ <xslo:if test="contains('avxyz', @code)" name="Match:w Match:p Match-heading:p Match-heading:s"> > <xslo:if test="position() > 1"> > <xslo:choose> > <xslo:when test="contains('vxyz', @code)"> >@@ -1626,10 +1626,10 @@ authority-zebra-indexdefs.xsl` (substituting the appropriate file names). > </z:index> > </xslo:template> > <xslo:template mode="index_match_heading" match="marc:datafield[@tag='455']"> >- <z:index name="Match-heading-see-from:p Match-heading-see-from:s"> >+ <z:index name="Match:w Match:p Match-heading-see-from:p Match-heading-see-from:s"> > <xslo:variable name="raw_heading"> > <xslo:for-each select="marc:subfield"> >- <xslo:if test="contains('avxyz', @code)" name="Match-heading-see-from:p Match-heading-see-from:s"> >+ <xslo:if test="contains('avxyz', @code)" name="Match:w Match:p Match-heading-see-from:p Match-heading-see-from:s"> > <xslo:if test="position() > 1"> > <xslo:choose> > <xslo:when test="contains('vxyz', @code)"> >diff --git a/etc/zebradb/marc_defs/unimarc/authorities/record.abs b/etc/zebradb/marc_defs/unimarc/authorities/record.abs >index 23ac408..0467c5e 100644 >--- a/etc/zebradb/marc_defs/unimarc/authorities/record.abs >+++ b/etc/zebradb/marc_defs/unimarc/authorities/record.abs >@@ -16,89 +16,89 @@ melm 942$a authtype > melm 152$b authtype:w,authtype:p > > # Personal Name >-melm 200$a Personal-name-heading:w,Personal-name-heading:p,Personal-name-heading:s,Personal-name:w,Personal-name:p,Heading:w,Heading:p,Heading:s,Heading-Main:w,Heading-Main:p,Heading-Main:s >-melm 200 Personal-name:w,Personal-name:p,Heading:w,Heading:p >-melm 400 Personal-name-see:w,Personal-name-see:p,See:w,See:p >-melm 500 Personal-name-see-also:w,Personal-name-see-also:p,See-also:w,See-also:p >-melm 700$a Personal-name-parallel:w,Personal-name-parallel:p,Parallel:w,Parallel:p >+melm 200$a Personal-name-heading:w,Personal-name-heading:p,Personal-name-heading:s,Personal-name:w,Personal-name:p,Heading:w,Heading:p,Heading:s,Heading-Main:w,Heading-Main:p,Heading-Main:s,Match:w,Match:p >+melm 200 Personal-name:w,Personal-name:p,Heading:w,Heading:p,Match:w,Match:p >+melm 400 Personal-name-see:w,Personal-name-see:p,See:w,See:p,Match:w,Match:p >+melm 500 Personal-name-see-also:w,Personal-name-see-also:p,See-also:w,See-also:p,Match:w,Match:p >+melm 700$a Personal-name-parallel:w,Personal-name-parallel:p,Parallel:w,Parallel:p,Match:w,Match:p > > # Corporate Name >-melm 210$a Corporate-name-heading:w,Corporate-name-heading:p,Corporate-name-heading:s,Corporate-name:w,Corporate-name:p,Conference-name-heading:w,Conference-name-heading:p,Conference-name-heading:s,Conference-name:w,Conference-name:p,Heading:w,Heading:p,Heading:s,Heading-Main:w,Heading-Main:p,Heading-Main:s >-melm 210 Corporate-name:w,Corporate-name:p,Conference-name:w,Conference-name:p,Heading:w,Heading:p >-melm 410 Corporate-name-see:w,Corporate-name-see:p,Conference-name-see:w,Conference-name-see:p,See:w,See:p >-melm 510 Corporate-name-see-also:w,Corporate-name-see-also:p,Conference-name-see-also:w,Conference-name-see-also:p,See-also:w,See-also:p >-melm 710 Corporate-name-parallel:w,Corporate-name-parallel:p,Parallel:w,Parallel:p >+melm 210$a Corporate-name-heading:w,Corporate-name-heading:p,Corporate-name-heading:s,Corporate-name:w,Corporate-name:p,Conference-name-heading:w,Conference-name-heading:p,Conference-name-heading:s,Conference-name:w,Conference-name:p,Heading:w,Heading:p,Heading:s,Heading-Main:w,Heading-Main:p,Heading-Main:s,Match:w,Match:p >+melm 210 Corporate-name:w,Corporate-name:p,Conference-name:w,Conference-name:p,Heading:w,Heading:p,Match:w,Match:p >+melm 410 Corporate-name-see:w,Corporate-name-see:p,Conference-name-see:w,Conference-name-see:p,See:w,See:p,Match:w,Match:p >+melm 510 Corporate-name-see-also:w,Corporate-name-see-also:p,Conference-name-see-also:w,Conference-name-see-also:p,See-also:w,See-also:p,Match:w,Match:p >+melm 710 Corporate-name-parallel:w,Corporate-name-parallel:p,Parallel:w,Parallel:p,Match:w,Match:p > > > # Geographic & Geographic Name >-melm 215$a Name-geographic-heading:w,Name-geographic-heading:w,Name-geographic-heading:s,Name-geographic:w,Name-geographic:p,Term-geographic-heading:w,Term-geographic-heading:p,Term-geographic-heading:s,Term-geographic:w,Term-geographic:p,Heading:w,Heading:p,Heading:s,Heading-Main:w,Heading-Main:p,Heading-Main:s >-melm 215 Name-geographic-heading:w,Name-geographic-heading:w,Name-geographic-heading:s,Name-geographic:w,Name-geographic:p,Term-geographic:w,Term-geographic:p,Term-geographic:s,Heading:w,Heading:p,Heading:s >-melm 415 Name-geographic-see:w,Name-geographic-see:p,Term-geographic-see:w,Term-geographic-see:p,Term-geographic-see:s,See:w,See:p,See:s >-melm 515 Name-geographic-see-also:w,Name-geographic-see-also:p,Term-geographic-see-also:w,Term-geographic-see-also:p,Term-geographic-see-also:s,See-also:w,See-also:p,See-also:s >-melm 715 Name-geographic-parallel:w,Name-geographic-parallel:p,Term-geographic-parallel:w,Term-geographic-parallel:p,Term-geographic-parallel:s,Parallel:w,Parallel:p,Parallel:s >+melm 215$a Name-geographic-heading:w,Name-geographic-heading:w,Name-geographic-heading:s,Name-geographic:w,Name-geographic:p,Term-geographic-heading:w,Term-geographic-heading:p,Term-geographic-heading:s,Term-geographic:w,Term-geographic:p,Heading:w,Heading:p,Heading:s,Heading-Main:w,Heading-Main:p,Heading-Main:s,Match:w,Match:p >+melm 215 Name-geographic-heading:w,Name-geographic-heading:w,Name-geographic-heading:s,Name-geographic:w,Name-geographic:p,Term-geographic:w,Term-geographic:p,Term-geographic:s,Heading:w,Heading:p,Heading:s,Match:w,Match:p >+melm 415 Name-geographic-see:w,Name-geographic-see:p,Term-geographic-see:w,Term-geographic-see:p,Term-geographic-see:s,See:w,See:p,See:s,Match:w,Match:p >+melm 515 Name-geographic-see-also:w,Name-geographic-see-also:p,Term-geographic-see-also:w,Term-geographic-see-also:p,Term-geographic-see-also:s,See-also:w,See-also:p,See-also:s,Match:w,Match:p >+melm 715 Name-geographic-parallel:w,Name-geographic-parallel:p,Term-geographic-parallel:w,Term-geographic-parallel:p,Term-geographic-parallel:s,Parallel:w,Parallel:p,Parallel:s,Match:w,Match:p > > # Trademark >-melm 216$a Trademark-heading:w,Trademark-heading:p,Trademark-heading:s,Trademark:w,Trademark:p,Conference-name-heading:w,Conference-name-heading:p,Conference-name-heading:s,Conference-name:w,Conference-name:p,Heading:w,Heading:p,Heading:s,Heading-Main:w,Heading-Main:p,Heading-Main:s >-melm 216 Trademark:w,Trademark:p,Conference-name:w,Conference-name:p,Heading:w,Heading:p >-melm 416 Trademark-see:w,Trademark-see:p,Conference-name-see:w,Conference-name-see:p,See:w,See:p >-melm 516 Trademark-see-also:w,Trademark-see-also:p,Conference-name-see-also:w,Conference-name-see-also:p,See-also:w,See-also:p >-melm 716 Trademark-parallel:w,Trademark-parallel:p,Parallel:w,Parallel:p >+melm 216$a Trademark-heading:w,Trademark-heading:p,Trademark-heading:s,Trademark:w,Trademark:p,Conference-name-heading:w,Conference-name-heading:p,Conference-name-heading:s,Conference-name:w,Conference-name:p,Heading:w,Heading:p,Heading:s,Heading-Main:w,Heading-Main:p,Heading-Main:s,Match:w,Match:p >+melm 216 Trademark:w,Trademark:p,Conference-name:w,Conference-name:p,Heading:w,Heading:p,Match:w,Match:p >+melm 416 Trademark-see:w,Trademark-see:p,Conference-name-see:w,Conference-name-see:p,See:w,See:p,Match:w,Match:p >+melm 516 Trademark-see-also:w,Trademark-see-also:p,Conference-name-see-also:w,Conference-name-see-also:p,See-also:w,See-also:p,Match:w,Match:p >+melm 716 Trademark-parallel:w,Trademark-parallel:p,Parallel:w,Parallel:p,Match:w,Match:p > > # Family Name >-melm 220$a Name-heading:w,Name-heading:p,Name-heading:s,Name:w,Name:p,Heading:w,Heading:p,Heading:s,Heading-Main:w,Heading-Main:p,Heading-Main:s >-melm 220 Name:w,Name:p,Name:s,Heading:w,Heading:p,Heading:s >-melm 420 Name-see:w,Name-see:p,Name-see:s,See:w,See:p,See:s >-melm 520 Name-see-also:w,Name-see-also:p,Name-see-also:s,See-also:w,See-also:p,See-also:s >-melm 720 Name-parallel:w,Name-parallel:p,Name-parallel:s,Parallel:w,Parallel:p,Parallel:s >+melm 220$a Name-heading:w,Name-heading:p,Name-heading:s,Name:w,Name:p,Heading:w,Heading:p,Heading:s,Heading-Main:w,Heading-Main:p,Heading-Main:s,Match:w,Match:p >+melm 220 Name:w,Name:p,Name:s,Heading:w,Heading:p,Heading:s,Match:w,Match:p >+melm 420 Name-see:w,Name-see:p,Name-see:s,See:w,See:p,See:s,Match:w,Match:p >+melm 520 Name-see-also:w,Name-see-also:p,Name-see-also:s,See-also:w,See-also:p,See-also:s,Match:w,Match:p >+melm 720 Name-parallel:w,Name-parallel:p,Name-parallel:s,Parallel:w,Parallel:p,Parallel:s,Match:w,Match:p > > # Uniform Title >-melm 230$a Title-uniform-heading:w,Title-uniform-heading:p,Title-uniform-heading:s,Title-uniform:w,Title-uniform:p,Heading:w,Heading:p,Heading:s,Heading-Main:w,Heading-Main:p,Heading-Main:s >-melm 230 Title-uniform:w,Title-uniform:p,Heading:w,Heading:p >-melm 430 Title-uniform-see:w,Title-uniform-see:p,See:w,See:p >-melm 530 Title-uniform-see-also:w,Title-uniform-see-also:p,See-also:w,See-also:p >-melm 730$a Title-uniform-parallel:w,Title-uniform-parallel:p,Parallel:w,Parallel:p >+melm 230$a Title-uniform-heading:w,Title-uniform-heading:p,Title-uniform-heading:s,Title-uniform:w,Title-uniform:p,Heading:w,Heading:p,Heading:s,Heading-Main:w,Heading-Main:p,Heading-Main:s,Match:w,Match:p >+melm 230 Title-uniform:w,Title-uniform:p,Heading:w,Heading:p,Match:w,Match:p >+melm 430 Title-uniform-see:w,Title-uniform-see:p,See:w,See:p,Match:w,Match:p >+melm 530 Title-uniform-see-also:w,Title-uniform-see-also:p,See-also:w,See-also:p,Match:w,Match:p >+melm 730$a Title-uniform-parallel:w,Title-uniform-parallel:p,Parallel:w,Parallel:p,Match:w,Match:p > > # Second area for uniform titles in UNIMARC? >-melm 235$a Title-uniform-heading:w,Title-uniform-heading:p,Title-uniform-heading:s,Title-uniform:w,Title-uniform:p,Heading:w,Heading:p,Heading:s,Heading-Main:w,Heading-Main:p,Heading-Main:s >-melm 235 Title-uniform:w,Title-uniform:p,Heading:w,Heading:p >-melm 435 Title-uniform-see:w,Title-uniform-see:p,See:w,See:p >-melm 535 Title-uniform-see-also:w,Title-uniform-see-also:p,See-also:w,See-also:p >-melm 735$a Title-uniform-parallel:w,Title-uniform-parallel:p,Parallel:w,Parallel:p >+melm 235$a Title-uniform-heading:w,Title-uniform-heading:p,Title-uniform-heading:s,Title-uniform:w,Title-uniform:p,Heading:w,Heading:p,Heading:s,Heading-Main:w,Heading-Main:p,Heading-Main:s,Match:w,Match:p >+melm 235 Title-uniform:w,Title-uniform:p,Heading:w,Heading:p,Match:w,Match:p >+melm 435 Title-uniform-see:w,Title-uniform-see:p,See:w,See:p,Match:w,Match:p >+melm 535 Title-uniform-see-also:w,Title-uniform-see-also:p,See-also:w,See-also:p,Match:w,Match:p >+melm 735$a Title-uniform-parallel:w,Title-uniform-parallel:p,Parallel:w,Parallel:p,Match:w,Match:p > > # Uniform Title >-melm 240$a Name-Title-heading:w,Name-Title-heading:p,Name-Title-heading:s,Name-Title:w,Name-Title:p,Heading:w,Heading:p,Heading:s,Heading-Main:w,Heading-Main:p,Heading-Main:s >-melm 240 Name-Title:w,Name-Title:p,Heading:w,Heading:p >-melm 440 Name-Title-see:w,Name-Title-see:p,See:w,See:p >-melm 540 Name-Title-see-also:w,Name-Title-see-also:p,See-also:w,See-also:p >-melm 740$a Name-Title-parallel:w,Name-Title-parallel:p,Parallel:w,Parallel:p >+melm 240$a Name-Title-heading:w,Name-Title-heading:p,Name-Title-heading:s,Name-Title:w,Name-Title:p,Heading:w,Heading:p,Heading:s,Heading-Main:w,Heading-Main:p,Heading-Main:s,Match:w,Match:p >+melm 240 Name-Title:w,Name-Title:p,Heading:w,Heading:p,Match:w,Match:p >+melm 440 Name-Title-see:w,Name-Title-see:p,See:w,See:p,Match:w,Match:p >+melm 540 Name-Title-see-also:w,Name-Title-see-also:p,See-also:w,See-also:p,Match:w,Match:p >+melm 740$a Name-Title-parallel:w,Name-Title-parallel:p,Parallel:w,Parallel:p,Match:w,Match:p > > # Second area for uniform titles in UNIMARC? >-melm 245$a Title-uniform-heading:w,Title-uniform-heading:p,Title-uniform-heading:s,Title-uniform:w,Title-uniform:p,Heading:w,Heading:p,Heading:s,Heading-Main:w,Heading-Main:p,Heading-Main:s >-melm 245 Title-uniform:w,Title-uniform:p,Heading:w,Heading:p >-melm 445 Title-uniform-see:w,Title-uniform-see:p,See:w,See:p >-melm 545 Title-uniform-see-also:w,Title-uniform-see-also:p,See-also:w,See-also:p >-melm 745$a Title-uniform-parallel:w,Title-uniform-parallel:p,Parallel:w,Parallel:p >+melm 245$a Title-uniform-heading:w,Title-uniform-heading:p,Title-uniform-heading:s,Title-uniform:w,Title-uniform:p,Heading:w,Heading:p,Heading:s,Heading-Main:w,Heading-Main:p,Heading-Main:s,Match:w,Match:p >+melm 245 Title-uniform:w,Title-uniform:p,Heading:w,Heading:p,Match:w,Match:p >+melm 445 Title-uniform-see:w,Title-uniform-see:p,See:w,See:p,Match:w,Match:p >+melm 545 Title-uniform-see-also:w,Title-uniform-see-also:p,See-also:w,See-also:p,Match:w,Match:p >+melm 745$a Title-uniform-parallel:w,Title-uniform-parallel:p,Parallel:w,Parallel:p,Match:w,Match:p > > # Topical Term >-melm 250$a Subject-heading:w,Subject-heading:p,Subject-heading:s,Subject:w,Subject:p,Heading:w,Heading:p,Heading:s,Heading-Main:w,Heading-Main:p,Heading-Main:s >-melm 250 Subject:w,Subject:p,Heading:w,Heading:p,Subject-heading:w,Subject-heading:p,Subject-heading:s >-melm 450 Subject-see:w,Subject-see:p,See:w,See:p >-melm 550 Subject-see-also:w,Subject-see-also:p,See-also:w,See-also:p >-melm 750$a Subject-parallel:w,Subject-parallel:p,Parallel:w,Parallel:p >+melm 250$a Subject-heading:w,Subject-heading:p,Subject-heading:s,Subject:w,Subject:p,Heading:w,Heading:p,Heading:s,Heading-Main:w,Heading-Main:p,Heading-Main:s,Match:w,Match:p >+melm 250 Subject:w,Subject:p,Heading:w,Heading:p,Subject-heading:w,Subject-heading:p,Subject-heading:s,Match:w,Match:p >+melm 450 Subject-see:w,Subject-see:p,See:w,See:p,Match:w,Match:p >+melm 550 Subject-see-also:w,Subject-see-also:p,See-also:w,See-also:p,Match:w,Match:p >+melm 750$a Subject-parallel:w,Subject-parallel:p,Parallel:w,Parallel:p,Match:w,Match:p > > # Place Access >-melm 260$a Place-heading:w,Place-heading:p,Place-heading:s,Place:w,Place:p,Heading:w,Heading:p,Heading:s,Heading-Main:w,Heading-Main:p,Heading-Main:s >-melm 260 Place:w,Place:p,Heading:w,Heading:p,Place-heading:w,Place-heading:p,Place-heading:s >-melm 460 Place-see:w,Place-see:p,See:w,See:p >-melm 560 Place-see-also:w,Place-see-also:p,See-also:w,See-also:p >-melm 760$a Place-parallel:w,Place-parallel:p,Parallel:w,Parallel:p >+melm 260$a Place-heading:w,Place-heading:p,Place-heading:s,Place:w,Place:p,Heading:w,Heading:p,Heading:s,Heading-Main:w,Heading-Main:p,Heading-Main:s,Match:w,Match:p >+melm 260 Place:w,Place:p,Heading:w,Heading:p,Place-heading:w,Place-heading:p,Place-heading:s,Match:w,Match:p >+melm 460 Place-see:w,Place-see:p,See:w,See:p,Match:w,Match:p >+melm 560 Place-see-also:w,Place-see-also:p,See-also:w,See-also:p,Match:w,Match:p >+melm 760$a Place-parallel:w,Place-parallel:p,Parallel:w,Parallel:p,Match:w,Match:p > > # Form Genre >-melm 280$a Form-heading:w,Form-heading:p,Form-heading:s,Form:w,Form:p,Heading:w,Heading:p,Heading:s,Heading-Main:w,Heading-Main:p,Heading-Main:s >-melm 280 Form:w,Form:p,Heading:w,Heading:p,Form-heading:w,Form-heading:p,Form-heading:s >-melm 480 Form-see:w,Form-see:p,See:w,See:p >-melm 580 Form-see-also:w,Form-see-also:p,See-also:w,See-also:p >-melm 780$a Form-parallel:w,Form-parallel:p,Parallel:w,Parallel:p >+melm 280$a Form-heading:w,Form-heading:p,Form-heading:s,Form:w,Form:p,Heading:w,Heading:p,Heading:s,Heading-Main:w,Heading-Main:p,Heading-Main:s,Match:w,Match:p >+melm 280 Form:w,Form:p,Heading:w,Heading:p,Form-heading:w,Form-heading:p,Form-heading:s,Match:w,Match:p >+melm 480 Form-see:w,Form-see:p,See:w,See:p,Match:w,Match:p >+melm 580 Form-see-also:w,Form-see-also:p,See-also:w,See-also:p,Match:w,Match:p >+melm 780$a Form-parallel:w,Form-parallel:p,Parallel:w,Parallel:p,Match:w,Match:p > > > # NOTE: subdivisions management missing from Koha >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/auth-finder-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/auth-finder-search.inc >index 895658a..3c7fd41 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/auth-finder-search.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/auth-finder-search.inc >@@ -33,7 +33,7 @@ > </li> > <li> > <label for="marclist">Anywhere</label> >- <input type="hidden" name="marclist" value="" /> >+ <input type="hidden" name="marclist" value="any" /> > <input type="hidden" name="and_or" value="and" /> > <input type="hidden" name="excluding" value="" /> > <select name="operator" id="marclist"> >@@ -43,6 +43,18 @@ > </select> > <input type="text" name="value_any" value="[% value_any |html %]" /> > </li> >+ <li> >+ <label for="marclist">Heading match</label> >+ <input type="hidden" name="marclist" value="match" /> >+ <input type="hidden" name="and_or" value="and" /> >+ <input type="hidden" name="excluding" value="" /> >+ <select name="operator" id="marclist"> >+ <option value="contains">contains</option> >+ <option value="start">starts with</option> >+ <option value="is">is exactly</option> >+ </select> >+ <input type="text" name="value_match" value="[% value_match |html %]" /> >+ </li> > <li> > <label for="orderby">Sort by </label> > <select name="orderby" id="orderby"> >-- >1.7.2.5
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 7284
:
7083
|
7084
|
7085
|
7086
|
7087
|
7091
|
7266
|
7323
|
7457
|
7548
|
7688
|
7714
|
7788
|
7829
|
7938
|
8060
|
8066
|
8137
|
8862
|
8864