Fix Genre-form and Subject-topical for MARC21

Signed-off-by: Joshua Ferraro <jmf@liblime.com>

diff --git a/etc/zebradb/authorities/etc/bib1.att b/etc/zebradb/authorities/etc/bib1.att
index c6777dc..c0a5248 100644 (file)
--- a/etc/zebradb/authorities/etc/bib1.att
+++ b/etc/zebradb/authorities/etc/bib1.att
@@ -44,13 +44,7 @@ att 17      NLM-call-number
 att 18      NAL-call-number
 att 19      MOS-call-number
 att 20      Local-classification
-
-# Topical Term
 att 21      Subject
-att 9013    Subject-heading
-att 9014    Subject-see
-att 9015    Subject-seealso
-
 att 22      Subject-Rameau
 att 23      BDI-index-subject
 att 24      INSPEC-subject
@@ -94,25 +88,6 @@ att 9016    Name-geographic-heading
 att 9017    Name-geographic-see
 att 9018    Name-geographic-seealso
 
-# Geographic Term
-# non-standard bib1
-att 9019    Term-geographic
-att 9020    Term-geographic-heading
-att 9021    Term-geographic-see
-att 9022    Term-geographic-seealso
-
-# General Subdivision (defined in att 47)
-# att 9023    Subject-subdivision
-
-# Geographic Subdivision
-att 9024    Geographic-subdivision
-
-# Chronological Subdivision
-att 9025    Chronological-subdivision
-
-# Form Subdivision
-att 9026    Form-subdivision
-
 # Place-publication, reduced to two chars because limited line length for leader indexing
 att 59      pl
 att 60      CODEN
@@ -158,7 +133,39 @@ 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
+
+# Topical Term
+att 1079    Subject-topical
+att 9013    Subject-topical-heading
+att 9014    Subject-topical-see
+att 9015    Subject-topical-seealso
+
 # 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
+
+# General Subdivision (defined in att 47)
+# att 9023    Subject-subdivision
+
+# Geographic Subdivision
+att 9024    Geographic-subdivision
+
+# Chronological Subdivision
+att 9025    Chronological-subdivision
+
+# Form Subdivision
+att 9026    Form-subdivision
+

diff --git a/etc/zebradb/ccl.properties b/etc/zebradb/ccl.properties
index d76e71d..36660f1 100644 (file)
--- a/etc/zebradb/ccl.properties
+++ b/etc/zebradb/ccl.properties
@@ -519,11 +519,11 @@ Name-geographic-heading 1=Name-geographic-heading
 Name-geographic-see 1=Name-geographic-see
 Name-geographic-seealso 1=Name-geographic-seealso
 
-# Term-geographic       9019 Geographic Term
-Term-geographic 1=Term-geographic
-Term-geographic-heading 1=Term-geographic-heading
-Term-geographic-see 1=Term-geographic-see
-Term-geographic-seealso 1=Term-geographic-seealso
+# Genre/Form Term       9019 Geographic Term
+Term-genre-form 1=Term-genre-form
+Term-genre-form-heading 1=Term-genre-form-heading
+Term-genre-form-see 1=Term-genre-form-see
+Term-genre-form-seealso 1=Term-genre-form-seealso
 
 #Name-geographic-place- 59  City or town where an item      008/15-17, 260$a
 #publication                was published.

diff --git a/etc/zebradb/marc_defs/marc21/authorities/record.abs b/etc/zebradb/marc_defs/marc21/authorities/record.abs
index 05bc564..4377122 100644 (file)
--- a/etc/zebradb/marc_defs/marc21/authorities/record.abs
+++ b/etc/zebradb/marc_defs/marc21/authorities/record.abs
@@ -51,11 +51,11 @@ melm 151 Name-geographic:w,Name-geographic:p,Name-geographic:s,Heading:w,Heading
 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
 
-# Geographic Term
-melm 155$a Term-geographic-heading:w,Term-geographic-heading:p,Term-geographic-heading:s,Term-geographic:w,Term-geographic:p,Heading:w,Heading:p,Heading:s
-melm 155 Term-geographic:w,Term-geographic:p,Term-geographic:s,Heading:w,Heading:p,Heading:s
-melm 455 Term-geographic-see:w,Term-geographic-see:p,Term-geographic-see:s,See:w,See:p,See:s
-melm 555 Term-geographic-see-also:w,Term-geographic-see-also:p,Term-geographic-see-also:s,See-also:w,See-also:p,See-also: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
 
 # NOTE: subdivisions management missing from Koha
 # General Subdivision