diff --git a/etc/zebradb/authorities/etc/bib1.att b/etc/zebradb/authorities/etc/bib1.att index c0a524878e..c41a5e68f0 100644 --- a/etc/zebradb/authorities/etc/bib1.att +++ b/etc/zebradb/authorities/etc/bib1.att @@ -3,169 +3,93 @@ name bib1 reference Bib-1 att 9000 authtype +att 12 Local-Number +att 9038 Descriptive-cataloging-rules +att 9039 Encoding-level +att 9040 Heading-use-main-or-added-entry +att 9041 Heading-use-series-added-entry +att 9042 Heading-use-subject-added-entry +att 9043 Kind-of-record +att 9046 Record-status +att 9050 Subject-heading-thesaurus + # Personal Name att 1 Personal-name att 9001 Personal-name-heading -att 9002 Personal-name-see -att 9003 Personal-name-seealso +att 9002 Personal-name-see-from +att 9003 Personal-name-see-also-from # Corporate Name att 2 Corporate-name att 9004 Corporate-name-heading -att 9005 Corporate-name-see -att 9006 Corporate-name-seealso +att 9005 Corporate-name-see-from +att 9006 Corporate-name-see-also-from # Meeting Name -att 3 Conference-name -att 9007 Conference-name-heading -att 9008 Conference-name-see -att 9009 Conference-name-seealso - -att 4 Title -att 5 Title-series +att 3 Meeting-name +att 9007 Meeting-name-heading +att 9008 Meeting-name-see-from +att 9009 Meeting-name-see-also-from # Uniform Title att 6 Title-uniform att 9010 Title-uniform-heading -att 9011 Title-uniform-see -att 9012 Title-uniform-seealso +att 9011 Title-uniform-see-from +att 9012 Title-uniform-see-also-from -att 7 ISBN -att 8 ISSN -att 9 LC-card-number -att 10 BNB-card-number -att 11 BGF-number -att 12 Local-number -att 13 Dewey-classification -att 14 UDC-classification -att 15 Bliss-classification -att 16 LC-call-number -att 17 NLM-call-number -att 18 NAL-call-number -att 19 MOS-call-number -att 20 Local-classification -att 21 Subject -att 22 Subject-Rameau -att 23 BDI-index-subject -att 24 INSPEC-subject -att 25 MESH-subject -att 26 PA-subject -att 27 LC-subject-heading -att 28 RVM-subject-heading -att 29 Local-subject-index -att 30 Date -att 31 pubdate -att 32 Date-of-acquisition -att 33 Title-key -att 34 Title-collective -att 35 Title-parallel -att 36 Title-cover -att 37 Title-added-title-page -att 38 Title-caption -att 39 Title-running -att 40 Title-spine -att 41 Title-other-variant -att 42 Title-former -att 43 Title-abbreviated -att 44 Title-expanded -att 45 Subject-precis -att 46 Subject-rswk -att 47 Subject-subdivision -att 48 Number-natl-biblio -att 49 Number-legal-deposit -att 50 Number-govt-pub -att 51 Number-music-publisher -att 52 Number-db -att 53 Number-local-call -att 54 ln -att 55 Code-geographic -att 56 Code-institution -att 57 Name-and-title - -# Geographic Name -att 58 Name-geographic -att 9016 Name-geographic-heading -att 9017 Name-geographic-see -att 9018 Name-geographic-seealso - -# Place-publication, reduced to two chars because limited line length for leader indexing -att 59 pl -att 60 CODEN -att 61 Microform-generation -att 62 Abstract -att 63 Note -att 1000 Author-title - -# Record type, reduced to two chars because limited line length for leader indexing -att 1001 rtype -att 1002 Name -att 1003 Author -att 1004 Author-name-personal -att 1005 Author-name-corporate -att 1006 Author-name-conference -att 1007 Identifier-standard -att 1008 Subject-LC-childrens -att 1009 Subject-name-personal -att 1010 Body-of-text -att 1011 date-entered-on-file -att 1012 Date/time-last-modified -att 1013 Authority/format-id -att 1014 Concept-text -att 1015 Concept-reference -att 1016 Any -att 1017 Server-choice -att 1018 Publisher -att 1019 Record-source -att 1020 Editor -att 1021 Bib-level -att 1022 Geographic-class -att 1023 Indexed-by -att 1024 Map-scale -att 1025 Music-key -att 1026 Related-periodical -att 1027 Report-number -att 1028 Stock-number -att 1030 Thematic-number -att 1031 Material-type -att 1032 Doc-id -att 1033 Host-item -att 1034 ctype -att 1035 Anywhere -att 1036 Author-Title-Subject - -# Genre form -att 1075 Term-genre-form -att 9027 Term-genre-form-heading -att 9028 Term-genre-form-see -att 9029 Term-genre-form-seealso +# Chronological Term +att 9038 Chronological-term +att 9019 Chronological-term-heading +att 9020 Chronological-term-see-from +att 9021 Chronological-term-see-also-from # Topical Term att 1079 Subject-topical att 9013 Subject-topical-heading -att 9014 Subject-topical-see -att 9015 Subject-topical-seealso +att 9014 Subject-topical-see-from +att 9015 Subject-topical-see-also-from + +# Geographic Name +att 58 Name-geographic +att 9016 Name-geographic-heading +att 9017 Name-geographic-see-from +att 9018 Name-geographic-see-also-from + +# Genre form +att 1075 Term-genre-form +att 9027 Term-genre-form-heading +att 9028 Term-genre-form-see-from +att 9029 Term-genre-form-see-also-from # Koha Local-Use Authority Indexes att 8001 Heading -att 8002 See -att 8003 See-also - -# Geographic Term -# non-standard bib1 -att 9019 Term-geographic -att 9020 Term-geographic-heading -att 9021 Term-geographic-see -att 9022 Term-geographic-seealso +att 8002 See-from +att 8003 See-also-from +att 8804 Match-heading +att 8805 Match-subdivision +att 8806 Subdivision +att 8807 Subdivision-see-also-from +att 8808 Subdivision-see-from +att 8809 Match-heading-see-from +att 8810 Match-subdivision-see-from # General Subdivision (defined in att 47) -# att 9023 Subject-subdivision +att 9023 General-subdivision +att 9030 General-subdivision-see-from +att 9031 General-subdivision-see-also-from # Geographic Subdivision att 9024 Geographic-subdivision +att 9032 Geographic-subdivision-see-from +att 9033 Geographic-subdivision-see-also-from # Chronological Subdivision att 9025 Chronological-subdivision +att 9034 Chronological-subdivision-see-from +att 9035 Chronological-subdivision-see-also-from # Form Subdivision att 9026 Form-subdivision +att 9036 Form-subdivision-see-from +att 9037 Form-subdivision-see-also-from diff --git a/etc/zebradb/authorities/etc/dom-config.xml b/etc/zebradb/authorities/etc/dom-config.xml index 8691616e30..0364cd8428 100644 --- a/etc/zebradb/authorities/etc/dom-config.xml +++ b/etc/zebradb/authorities/etc/dom-config.xml @@ -38,6 +38,9 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA + + + 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 6ba802840d..14c9ed362a 100644 --- a/etc/zebradb/marc_defs/marc21/authorities/authority-koha-indexdefs.xml +++ b/etc/zebradb/marc_defs/marc21/authorities/authority-koha-indexdefs.xml @@ -1,5 +1,11 @@ + + v + x + y + z + Record-status @@ -47,6 +53,10 @@ Heading:p Heading:s + + Match-heading:p + Match-heading:s + Personal-name-see-from:w @@ -56,6 +66,10 @@ See-from:p See-from:s + + Match-heading-see-from:p + Match-heading-see-from:s + Personal-name-see-also-from:w @@ -79,6 +93,10 @@ Heading:p Heading:s + + Match-heading:p + Match-heading:s + Corporate-name-see-from:w @@ -88,6 +106,10 @@ See-from:p See-from:s + + Match-heading-see-from:p + Match-heading-see-from:s + Corporate-name-see-also-from:w @@ -111,6 +133,10 @@ Heading:p Heading:s + + Match-heading:p + Match-heading:s + Meeting-name-see-from:w @@ -120,6 +146,10 @@ See-from:p See-from:s + + Match-heading-see-from:p + Match-heading-see-from:s + Meeting-name-see-also-from:w @@ -143,6 +173,10 @@ Heading:p Heading:s + + Match-heading:p + Match-heading:s + Title-uniform-see-from:w @@ -152,6 +186,10 @@ See-from:p See-from:s + + Match-heading-see-from:p + Match-heading-see-from:s + Title-uniform-see-also-from:w @@ -175,6 +213,10 @@ Heading:p Heading:s + + Match-heading:p + Match-heading:s + Chronological-term-see-from:w @@ -184,6 +226,10 @@ See-from:p See-from:s + + Match-heading-see-from:p + Match-heading-see-from:s + Chronological-term-see-also-from:w @@ -208,6 +254,10 @@ Heading:p Heading:s + + Match-heading:p + Match-heading:s + Subject-topical-see-from:w @@ -217,6 +267,10 @@ See-from:p See-from:s + + Match-heading-see-from:p + Match-heading-see-from:s + Subject-topical-see-also-from:w @@ -240,6 +294,10 @@ Heading:p Heading:s + + Match-heading:p + Match-heading:s + Name-geographic-see-from:w @@ -249,6 +307,10 @@ See-from:p See-from:s + + Match-heading-see-from:p + Match-heading-see-from:s + Name-geographic-see-also-from:w @@ -272,6 +334,10 @@ Heading:p Heading:s + + Match-heading:p + Match-heading:s + Term-genre-form-see-from:w @@ -281,6 +347,10 @@ See-from:p See-from:s + + Match-heading-see-from:p + Match-heading-see-from:s + Term-genre-form-see-also-from:w @@ -300,6 +370,10 @@ Subdivision:p Subdivision:s + + Match-subdivision:p + Match-subdivision:s + General-subdivision-see-from:w @@ -309,6 +383,10 @@ Subdivision-see-from:p Subdivision-see-from:s + + Match-subdivision-see-from:p + Match-subdivision-see-from:s + General-subdivision-see-also-from:w @@ -328,6 +406,10 @@ Subdivision:p Subdivision:s + + Match-subdivision:p + Match-subdivision:s + Geographic-subdivision-see-from:w @@ -337,6 +419,10 @@ Subdivision-see-from:p Subdivision-see-from:s + + Match-subdivision-see-from:p + Match-subdivision-see-from:s + Geographic-subdivision-see-also-from:w @@ -356,6 +442,10 @@ Subdivision:p Subdivision:s + + Match-subdivision:p + Match-subdivision:s + Chronological-subdivision-see-from:w @@ -365,6 +455,10 @@ Subdivision-see-from:p Subdivision-see-from:s + + Match-subdivision-see-from:p + Match-subdivision-see-from:s + Chronological-subdivision-see-also-from:w @@ -384,6 +478,10 @@ Subdivision:p Subdivision:s + + Match-subdivision:p + Match-subdivision:s + Form-subdivision-see-from:w @@ -393,6 +491,10 @@ Subdivision-see-from:p Subdivision-see-from:s + + Match-subdivision-see-from:p + Match-subdivision-see-from:s + Form-subdivision-see-also-from:w 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 f1c4dc75eb..a0622799bb 100644 --- a/etc/zebradb/marc_defs/marc21/authorities/authority-zebra-indexdefs.xsl +++ b/etc/zebradb/marc_defs/marc21/authorities/authority-zebra-indexdefs.xsl @@ -4,6 +4,7 @@ + @@ -24,6 +25,7 @@ + @@ -930,6 +932,850 @@ + + + + + + + + + + + generalsubdiv + + + formsubdiv + + + chronologicalsubdiv + + + geographicsubdiv + + + + + + + + + + + + + + + + + + + + + + + + + + generalsubdiv + + + formsubdiv + + + chronologicalsubdiv + + + geographicsubdiv + + + + + + + + + + + + + + + + + + + + + + + + + + generalsubdiv + + + formsubdiv + + + chronologicalsubdiv + + + geographicsubdiv + + + + + + + + + + + + + + + + + + + + + + + + + + generalsubdiv + + + formsubdiv + + + chronologicalsubdiv + + + geographicsubdiv + + + + + + + + + + + + + + + + + + + + + + + + + + generalsubdiv + + + formsubdiv + + + chronologicalsubdiv + + + geographicsubdiv + + + + + + + + + + + + + + + + + + + + + + + + + + generalsubdiv + + + formsubdiv + + + chronologicalsubdiv + + + geographicsubdiv + + + + + + + + + + + + + + + + + + + + + + + + + + generalsubdiv + + + formsubdiv + + + chronologicalsubdiv + + + geographicsubdiv + + + + + + + + + + + + + + + + + + + + + + + + + + generalsubdiv + + + formsubdiv + + + chronologicalsubdiv + + + geographicsubdiv + + + + + + + + + + + + + + + + + + + + + + + + + + generalsubdiv + + + formsubdiv + + + chronologicalsubdiv + + + geographicsubdiv + + + + + + + + + + + + + + + + + + + + + + + + + + generalsubdiv + + + formsubdiv + + + chronologicalsubdiv + + + geographicsubdiv + + + + + + + + + + + + + + + + + + + + + + + + + + generalsubdiv + + + formsubdiv + + + chronologicalsubdiv + + + geographicsubdiv + + + + + + + + + + + + + + + + + + + + + + + + + + generalsubdiv + + + formsubdiv + + + chronologicalsubdiv + + + geographicsubdiv + + + + + + + + + + + + + + + + + + + + + + + + + + generalsubdiv + + + formsubdiv + + + chronologicalsubdiv + + + geographicsubdiv + + + + + + + + + + + + + + + + + + + + + + + + + + generalsubdiv + + + formsubdiv + + + chronologicalsubdiv + + + geographicsubdiv + + + + + + + + + + + + + + + + + + + + + + + + + + generalsubdiv + + + formsubdiv + + + chronologicalsubdiv + + + geographicsubdiv + + + + + + + + + + + + + + + + + + + + + + + + + + generalsubdiv + + + formsubdiv + + + chronologicalsubdiv + + + geographicsubdiv + + + + + + + + + + + + + + + + + + + + + + + + + + generalsubdiv + + + formsubdiv + + + chronologicalsubdiv + + + geographicsubdiv + + + + + + + + + + + + + + + + + + + + + + + + + + generalsubdiv + + + formsubdiv + + + chronologicalsubdiv + + + geographicsubdiv + + + + + + + + + + + + + + + + + + + + + + + + + + generalsubdiv + + + formsubdiv + + + chronologicalsubdiv + + + geographicsubdiv + + + + + + + + + + + + + + + + + + + + + + + + + + generalsubdiv + + + formsubdiv + + + chronologicalsubdiv + + + geographicsubdiv + + + + + + + + + + + + + + + + + + + + + + + + + + generalsubdiv + + + formsubdiv + + + chronologicalsubdiv + + + geographicsubdiv + + + + + + + + + + + + + + + + + + + + + + + + + + generalsubdiv + + + formsubdiv + + + chronologicalsubdiv + + + geographicsubdiv + + + + + + + + + + + + + + + + + + + + + + + + + + generalsubdiv + + + formsubdiv + + + chronologicalsubdiv + + + geographicsubdiv + + + + + + + + + + + + + + + + + + + + + + + + + + generalsubdiv + + + formsubdiv + + + chronologicalsubdiv + + + geographicsubdiv + + + + + + + + + + + + + + + + v + x + y + z diff --git a/etc/zebradb/marc_defs/marc21/authorities/koha-indexdefs-to-zebra.xsl b/etc/zebradb/marc_defs/marc21/authorities/koha-indexdefs-to-zebra.xsl index f1b16d28bc..198b0c3768 100644 --- a/etc/zebradb/marc_defs/marc21/authorities/koha-indexdefs-to-zebra.xsl +++ b/etc/zebradb/marc_defs/marc21/authorities/koha-indexdefs-to-zebra.xsl @@ -15,6 +15,7 @@ + @@ -22,6 +23,7 @@ + @@ -41,6 +43,7 @@ + @@ -49,10 +52,19 @@ + + + + + + + + + @@ -273,6 +285,84 @@ + + + + + marc:datafield[@tag=' + + '] + + + + + + + + + + + + + + + + + + + contains(' + + ', @code) + + + + + + + contains(' + + ', @code) + + + + + @code = $general_subdivision_subfield + + generalsubdiv + + + + @code = $form_subdivision_subfield + + formsubdiv + + + + @code = $chronological_subdivision_subfield + + chronologicalsubdiv + + + + @code = $geographic_subdivision_subfield + + geographicsubdiv + + + + + + + + + + + + + + + + diff --git a/etc/zebradb/marc_defs/marc21/authorities/record.abs b/etc/zebradb/marc_defs/marc21/authorities/record.abs index 9e048eb706..e4895fa890 100644 --- a/etc/zebradb/marc_defs/marc21/authorities/record.abs +++ b/etc/zebradb/marc_defs/marc21/authorities/record.abs @@ -17,48 +17,48 @@ melm 942$a authtype # Personal Name melm 100 Personal-name:w,Personal-name:p,Personal-name:s,Heading:w,Heading:p,Heading:s melm 100$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 -melm 400 Personal-name-see:w,Personal-name-see:p,Personal-name-see:s,See:w,See:p,See:s -melm 500 Personal-name-see-also:w,Personal-name-see-also:p,Personal-name-see-also:s,See-also:w,See-also:p,See-also:s +melm 400 Personal-name-see-from:w,Personal-name-see-from:p,Personal-name-see-from:s,See-from:w,See-from:p,See-from:s +melm 500 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 # Corporate Name melm 110$a Corporate-name-heading:w,Corporate-name-heading:p,Corporate-name-heading:s,Corporate-name:w,Corporate-name:p,Heading:w,Heading:p,Heading:s melm 110 Corporate-name:w,Corporate-name:p,Corporate-name:s,Heading:w,Heading:p,Heading:s -melm 410 Corporate-name-see:w,Corporate-name-see:p,Corporate-name-see:s,See:w,See:p,See:s -melm 510 Corporate-name-see-also:w,Corporate-name-see-also:p,Corporate-name-see-also:s,See-also:w,See-also:p,See-also:s +melm 410 Corporate-name-see-from:w,Corporate-name-see-from:p,Corporate-name-see-from:s,See-from:w,See-from:p,See-from:s +melm 510 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 # Meeting Name -melm 111$a Conference-name-heading:w,Conference-name-heading:p,Conference-name-heading:s,Conference-name:w,Conference-name:p,Heading:w,Heading:p,Heading:s -melm 111 Conference-name:w,Conference-name:p,Conference-name:s,Heading:w,Heading:p,Heading:s -melm 411 Conference-name-see:w,Conference-name-see:p,Conference-name-see:s,See:w,See:p,See:s -melm 511 Conference-name-see-also:w,Conference-name-see-also:p,Conference-name-see-also:s,See-also:w,See-also:p,See-also:s +melm 111$a Meeting-name-heading:w,Meeting-name-heading:p,Meeting-name-heading:s,Meeting-name:w,Meeting-name:p,Heading:w,Heading:p,Heading:s +melm 111 Meeting-name:w,Meeting-name:p,Meeting-name:s,Heading:w,Heading:p,Heading:s +melm 411 Meeting-name-see-from:w,Meeting-name-see-from:p,Meeting-name-see-from:s,See-from:w,See-from:p,See-from:s +melm 511 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 # Uniform Title melm 130$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 melm 130 Title-uniform:w,Title-uniform:p,Title-uniform:s,Heading:w,Heading:p,Heading:s -melm 431 Title-uniform-see:w,Title-uniform-see:p,Title-uniform-see:s,See:w,See:p,See:s -melm 531 Title-uniform-see-also:w,Title-uniform-see-also:p,Title-uniform-see-also:s,See-also:w,See-also:p,See-also:s +melm 431 Title-uniform-see-from:w,Title-uniform-see-from:p,Title-uniform-see-from:s,See-from:w,See-from:p,See-from:s +melm 531 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 # Topical Term melm 150$a Subject-topical-heading:w,Subject-topical-heading:p,Subject-topical-heading:s,Subject-topical:w,Subject-topical:p,Heading:w,Heading:p,Heading:s melm 150 Subject-topical:w,Subject-topical:p,Subject-topical:s,Heading:w,Heading:p,Heading:s -melm 450 Subject-topical-see:w,Subject-topical-see:p,Subject-topical-see:s,See:w,See:p,See:s -melm 550 Subject-topical-see-also:w,Subject-topical-see-also:p,Subject-topical-see-also:s,See-also:w,See-also:p,See-also:s +melm 450 Subject-topical-see-from:w,Subject-topical-see-from:p,Subject-topical-see-from:s,See-from:w,See-from:p,See-from:s +melm 550 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 # Geographic Name melm 151$a Name-geographic-heading:w,Name-geographic-heading:w,Name-geographic-heading:s,Name-geographic:w,Name-geographic:p,Heading:w,Heading:p,Heading:s melm 151 Name-geographic:w,Name-geographic:p,Name-geographic:s,Heading:w,Heading:p,Heading:s -melm 451 Name-geographic-see:w,Name-geographic-see:p,Name-geographic-see:s,See:w,See:p,See:s -melm 551 Name-geographic-see-also:w,Name-geographic-see-also:p,Name-geographic-see-also:s,See-also:w,See-also:p,See-also:s +melm 451 Name-geographic-see-from:w,Name-geographic-see-from:p,Name-geographic-see-from:s,See-from:w,See-from:p,See-from:s +melm 551 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 # Genre/Form Term melm 155$a Term-genre-form-heading:w,Term-genre-form-heading:p,Term-genre-form-heading:s,Term-genre-form:w,Term-genre-form:p,Heading:w,Heading:p,Heading:s melm 155 Term-genre-form:w,Term-genre-form:p,Term-genre-form:s,Heading:w,Heading:p,Heading:s -melm 455 Term-genre-form-see:w,Term-genre-form-see:p,Term-genre-form-see:s,See:w,See:p,See:s -melm 555 Term-genre-form-see-also:w,Term-genre-form-see-also:p,Term-genre-form-see-also:s,See-also:w,See-also:p,See-also:s +melm 455 Term-genre-form-see-from:w,Term-genre-form-see-from:p,Term-genre-form-see-from:s,See-from:w,See-from:p,See-from:s +melm 555 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 # NOTE: subdivisions management missing from Koha # General Subdivision -melm 180 Subject-topical-subdivision,Heading:w,Heading:p,Heading:s +melm 180 General-subdivision,Heading:w,Heading:p,Heading:s # Geographic Subdivision melm 181 Geographic-subdivision,Heading:w,Heading:p,Heading:s # Chronological Subdivision diff --git a/etc/zebradb/retrieval-info-auth-dom.xml b/etc/zebradb/retrieval-info-auth-dom.xml index 3fe4547f2f..f571d96c02 100644 --- a/etc/zebradb/retrieval-info-auth-dom.xml +++ b/etc/zebradb/retrieval-info-auth-dom.xml @@ -14,6 +14,7 @@ outputcharset="utf-8"/> - +