improvements to marc21 framework

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

diff --git a/installer/data/en/mandatory/marc21_framework_DEFAULT.sql b/installer/data/en/mandatory/marc21_framework_DEFAULT.sql
index 71e3254..295cf73 100644 (file)
--- a/installer/data/en/mandatory/marc21_framework_DEFAULT.sql
+++ b/installer/data/en/mandatory/marc21_framework_DEFAULT.sql
@@ -1,7 +1,7 @@
 -- *************************************************************
 --  KOHA 3.0 MARC 21 STANDARD DEFAULT BIBLIOGRAPHIC FRAMEWORK
 --
---                     PRETEST VERSION 0.1.0
+--                     PRETEST VERSION 0.1.1
 --                          2007-10-06
 --
 --                            edited
@@ -167,19 +167,19 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
 -- INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `kohafield`, `tab`, `authorised_value`, `authtypecode`, `value_builder`, `isurl`, `hidden`, `frameworkcode`, `seealso`, `link`, `defaultvalue`) VALUES
 -- ('95k', '0', 'Item status (withdrawn) (similar to 876-8 $j)', 'Item status (withdrawn)', 0, 0, 'items.withdrawn', 10, '', '', '', 0, 0, '', '', '', NULL),
 -- ('95k', '1', 'Item status (lost) (similar to 876-8 $j)', 'Item status (lost)', 0, 0, 'items.itemlost', 10, '', '', '', 0, 0, '', '', '', NULL),
--- ('95k', '2', 'Source of classification or shelving scheme (similar to 852 $2)', 'Source of classification or shelving scheme', 0, 0, '', 10, '', '', '', NULL, 0, '', '', '', NULL),
--- ('95k', '3', 'Materials specified (bound volume) (similar to 852, 876-8 $3)', 'Materials specified (bound volume)', 0, 0, '', 10, '', '', '', NULL, -1, '', '', '', NULL),
--- ('95k', '4', 'Use restrictions (similar to 506 $a, 876-8 $h)', 'Use restrictions', 0, 0, 'items.restricted', 10, '', '', '', 0, 0, '', '', '', NULL),
--- ('95k', '5', 'Koha item type', 'Koha item type', 1, 0, 'items.itype', 10, 'itemtypes', '', '', NULL, -5, '', '', '', NULL),
+-- ('95k', '2', 'Source of classification or shelving scheme (similar to 852 $2)', 'Source of classification or shelving scheme', 0, 0, '', 10, '', '', 'marc21_classcodes.pl', NULL, 0, '', '', '', NULL),
+-- ('95k', '3', 'Materials specified (bound volume or other part) (similar to 852, 876-8 $3)', 'Materials specified (bound volume)', 0, 0, '', 10, '', '', '', NULL, -1, '', '', '', NULL),
+-- ('95k', '4', 'Item status (damaged) (similar to 876-8 $j)', 'Item status (damaged)', 0, 0, 'items.damaged', 10, 'DAMAGED', '', '', NULL, 0, '', '', '', NULL),
+-- ('95k', '5', 'Use restrictions (similar to 506 $a, 876-8 $h)', 'Use restrictions', 0, 0, 'items.restricted', 10, '', '', '', 0, 0, '', '', '', NULL),
 -- ('95k', '6', 'Linkage (similar to 852, 876-8 $6)', 'Linkage', 0, 0, '', 10, '', '', '', NULL, -6, '', '', '', NULL),
--- ('95k', '7', 'Cost, normal purchase price (similar to 541 $h, 876-8 $c)', 'Cost, normal purchase price', 0, 0, 'items.price', 10, '', '', '', 0, 0, '', '', '', NULL),
+-- ('95k', '7', 'Use restrictions (not for loan) (similar to 506 $a, 876-8 $h)', 'Use restrictions (not for loan)', 0, 0, 'items.notforloan', 10, '', '', '', 0, 0, '', '', '', NULL),
 -- ('95k', '8', 'Sequence number (similar to 852, 876-8 $8)', 'Sequence number', 1, 0, '', 10, '', '', '', NULL, 0, '', '', '', NULL),
 -- ('95k', '9', 'Koha itemnumber (autogenerated similar to 852, 876-8 $3 $8 $t combined)', 'Koha itemnumber', 0, 0, 'items.itemnumber', -1, '', '', '', 0, -5, '', '', '', NULL),
--- ('95k', 'a', 'Location (homebranch) (similar to 852 $a)', 'Location (homebranch)', 0, 0, 'items.homebranch', 10, 'branches', '', '', 0, 0, '', '', '', NULL),
--- ('95k', 'b', 'Sublocation or collection (holdingbranch) (similar to 852 $b)', 'Sublocation or collection (holdingbranch)', 1, 0, 'items.holdingbranch', 10, 'branches', '', '', 0, 0, '', '', '', NULL),
--- ('95k', 'c', 'Shelving location (similar to 852 $c, 876-8 $l)', 'Shelving location', 1, 0, 'items.location', 10, '', '', '', 0, 0, '', '', '', NULL),
--- ('95k', 'd', 'Date acquired (similar to 541, 876-8 $d)', 'Date acquired', 0, 0, 'items.dateaccessioned', 10, 'usmarc_field_952v.pl', '', '', 0, 0, '', '', '', NULL),
--- ('95k', 'e', 'Source of acquisition (similar to 541 $a, 876-8 $e)', 'Source of acquisition', 1, 0, 'items.booksellerid', 10, '', '', '', 0, 0, '', '', '', NULL),
+-- ('95k', 'a', 'Location (home branch) (similar to 852 $a)', 'Location (home branch)', 0, 0, 'items.homebranch', 10, 'branches', '', '', 0, 0, '', '', '', NULL),
+-- ('95k', 'b', 'Sublocation or collection (holding branch) (similar to 852 $b)', 'Sublocation or collection (holding branch)', 1, 0, 'items.holdingbranch', 10, 'branches', '', '', 0, 0, '', '', '', NULL),
+-- ('95k', 'c', 'Shelving location (similar to 852 $c, 876-8 $l)', 'Shelving location', 1, 0, 'items.location', 10, 'SHELF_LOC', '', '', 0, 0, '', '', '', NULL),
+-- ('95k', 'd', 'Date acquired (similar to 541, 876-8 $d)', 'Date acquired', 0, 0, 'items.dateaccessioned', 10, '', '', '', 0, 0, '', '', 'dateaccessioned.pl', NULL),
+-- ('95k', 'e', 'Source of acquisition (similar to 541 $a, 876-8 $e)', 'Source of acquisition', 1, 0, 'items.booksellerid', 10, '', '', 'bookseller.pl', 0, 0, '', '', '', NULL),
 -- ('95k', 'f', 'Coded location qualifier (similar to 852 $f)', 'Coded location qualifier', 1, 0, '', 10, '', '', '', NULL, 0, '', '', '', NULL),
 -- ('95k', 'g', 'Non-coded location qualifier (similar to 852 $g)', 'Non-coded location qualifier', 1, 0, '', 10, '', '', '', NULL, 0, '', '', '', NULL),
 -- ('95k', 'h', 'Classification part (similar to 852 $h)', 'Classification part', 0, 0, '', 10, '', '', '', NULL, 0, '', '', '', NULL),
@@ -187,9 +187,9 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
 -- ('95k', 'j', 'Shelving control number (similar to 852 $j)', 'Shelving control number', 0, 0, 'items.stack', 10, 'STACK', '', '', NULL, 0, '', '', '', NULL),
 -- ('95k', 'k', 'Call number prefix (similar to 852 $k)', 'Call number prefix', 0, 0, '', 10, '', '', '', NULL, 0, '', '', '', NULL),
 -- ('95k', 'l', 'Shelving form of title (similar to 852 $l)', 'Shelving form of title', 0, 0, '', 10, '', '', '', NULL, 0, '', '', '', NULL),
--- ('95k', 'm', 'Call number suffix (similar to 852 $m)', 'Call number suffix', 0, 0, '', 10, '', '', '', NULL, 0, '', '', '', NULL),
+-- ('95k', 'm', 'Cost, normal purchase price (similar to 541 $h, 876-8 $c)', 'Cost, normal purchase price', 0, 0, 'items.price', 10, '', '', '', 0, 0, '', '', '', NULL),
 -- ('95k', 'n', 'Country code (similar to 852 $n)', 'Country code', 0, 0, '', 10, '', '', '', NULL, 0, '', '', '', NULL),
--- ('95k', 'o', 'Call number (similar to 852 $k $h $i $m combined)', 'Call number', 0, 0, 'items.itemcallnumber', 10, '', '', NULL, 0, 0, '', '', '', NULL),
+-- ('95k', 'o', 'Koha full call number (similar to 852 $k $h $i $m $t combined)', 'Koha full call number', 0, 0, 'items.itemcallnumber', 10, '', '', NULL, 0, 0, '', '', '', NULL),
 -- ('95k', 'p', 'Piece designation (barcode) (similar to 852, 876-8 $p)', 'Piece designation (barcode)', 0, 1, 'items.barcode', 10, '', '', 'barcode.pl', 0, 0, '', '', '', NULL),
 -- ('95k', 'q', 'Piece physical condition (similar to 562 $a, 852 $q)', 'Piece physical condition', 0, 0, '', 10, '', '', '', NULL, 0, '', '', '', NULL),
 -- ('95k', 'r', 'Invalid or canceled piece designation (canceled barcode) (similar to 876-8 $r)', 'Invalid or canceled piece designation (canceled barcode)', 1, 0, '', 10, '', '', '', NULL, -1, '', '', '', NULL),
@@ -199,7 +199,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
 -- ('95k', 'v', 'Cost, replacement price (similar to 365 $b, 876-8 $c)', 'Cost, replacement price', 0, 0, 'items.replacementprice', 10, '', '', '', 0, 0, '', '', '', NULL),
 -- ('95k', 'w', 'Price effective from (similar to 365 $f)', 'Price effective from', 0, 0, 'items.replacementpricedate', 10, '', '', '', 0, 0, '', '', '', NULL),
 -- ('95k', 'x', 'Nonpublic note (similar to 852, 876-8 $x)', 'Nonpublic note', 1, 0, '', 10, '', '', '', NULL, 6, '', '', '', NULL),
--- ('95k', 'y', 'Use restrictions (not for loan) (similar to 506 $a, 876-8 $h)', 'Use restrictions (not for loan)', 0, 0, 'items.notforloan', 10, '', '', '', 0, 0, '', '', '', NULL),
+-- ('95k', 'y', 'Koha item type', 'Koha item type', 1, 0, 'items.itype', 10, 'itemtypes', '', '', NULL, -5, '', '', '', NULL),
 -- ('95k', 'z', 'Public note (similar to 852, 876-8 $z)', 'Public note', 0, 0, 'items.itemnotes', 10, '', '', '', 1, 0, '', '', '', NULL);
 
 
@@ -211,41 +211,41 @@ INSERT INTO `marc_tag_structure` (`tagfield`, `liblibrarian`, `libopac`, `repeat
 ('952', 'LOCATION AND ITEM INFORMATION (KOHA)', 'LOCATION AND ITEM INFORMATION (KOHA)', 1, 0, '', '');
 
 INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `kohafield`, `tab`, `authorised_value`, `authtypecode`, `value_builder`, `isurl`, `hidden`, `frameworkcode`, `seealso`, `link`, `defaultvalue`) VALUES
-('952', '0', 'Item status (withdrawn)', 'Item status (withdrawn)', 0, 0, 'items.withdrawn', 10, '', '', '', 0, 0, '', '', '', NULL),
-('952', '1', 'Item status (lost)', 'Item status (lost)', 0, 0, 'items.itemlost', 10, '', '', '', 0, 0, '', '', '', NULL),
-('952', '2', 'Source of classification or shelving scheme', 'Source of classification or shelving scheme', 0, 0, '', 10, '', '', '', NULL, 0, '', '', '', NULL),
-('952', '3', 'Materials specified', 'Materials specified', 0, 0, '', 10, '', '', '', NULL, -1, '', '', '', NULL),
-('952', '4', 'Use restrictions', 'Use restrictions', 0, 0, 'items.restricted', 10, '', '', '', 0, 0, '', '', '', NULL),
-('952', '5', 'Koha item type', 'Koha item type', 1, 0, 'items.itype', 10, 'itemtypes', '', '', NULL, -5, '', '', '', NULL),
+('952', '0', 'Withdrawn status', 'Withdrawn status', 0, 0, 'items.withdrawn', 10, 'WITHDRAWN', '', '', 0, 0, '', '', '', NULL),
+('952', '1', 'Lost status', 'Lost status', 0, 0, 'items.itemlost', 10, 'LOST', '', '', 0, 0, '', '', '', NULL),
+('952', '2', 'Source of classification or shelving scheme', 'Source of classification or shelving scheme', 0, 0, '', 10, '', '', 'marc21_classcodes.pl', NULL, 0, '', '', '', NULL),
+('952', '3', 'Materials specified (bound volume or other part)', 'Materials specified (bound volume or other part)', 0, 0, '', 10, '', '', '', NULL, -1, '', '', '', NULL),
+('952', '4', 'Damaged status', 'Damaged status', 0, 0, 'items.damaged', 10, 'DAMAGED', '', '', NULL, 0, '', '', '', NULL),
+('952', '5', 'Use restrictions', 'Use restrictions', 0, 0, 'items.restricted', 10, 'RESTRICTED', '', '', 0, 0, '', '', '', NULL),
 ('952', '6', 'Linkage', 'Linkage', 0, 0, '', 10, '', '', '', NULL, -6, '', '', '', NULL),
-('952', '7', 'Cost, normal purchase price', 'Cost, normal purchase price', 0, 0, 'items.price', 10, '', '', '', 0, 0, '', '', '', NULL),
+('952', '7', 'Not for loan', 'Not for loan', 0, 0, 'items.notforloan', 10, 'NOT_LOAN', '', '', 0, 0, '', '', '', NULL),
 ('952', '8', 'Sequence number', 'Sequence number', 1, 0, '', 10, '', '', '', NULL, 0, '', '', '', NULL),
 ('952', '9', 'Koha itemnumber', 'Koha itemnumber', 0, 0, 'items.itemnumber', -1, '', '', '', 0, -5, '', '', '', NULL),
-('952', 'a', 'Location (homebranch)', 'Location (homebranch)', 0, 0, 'items.homebranch', 10, 'branches', '', '', 0, 0, '', '', '', NULL),
-('952', 'b', 'Sublocation or collection (holdingbranch)', 'Sublocation or collection (holdingbranch)', 1, 0, 'items.holdingbranch', 10, 'branches', '', '', 0, 0, '', '', '', NULL),
-('952', 'c', 'Shelving location', 'Shelving location', 1, 0, 'items.location', 10, '', '', '', 0, 0, '', '', '', NULL),
-('952', 'd', 'Date acquired', 'Date acquired', 0, 0, 'items.dateaccessioned', 10, 'dateaccessioned.pl', '', '', 0, 0, '', '', '', NULL),
-('952', 'e', 'Source of acquisition', 'Source of acquisition', 1, 0, 'items.booksellerid', 10, '', '', '', 0, 0, '', '', '', NULL),
-('952', 'f', 'Coded location qualifier', 'Coded location qualifier', 1, 0, '', 10, '', '', '', NULL, 0, '', '', '', NULL),
-('952', 'g', 'Koha issues (borrowed)', 'Koha issues (borrowed)', 0, 0, 'items.issues', 10, '', '', '', NULL, -5, '', '', '', NULL),
+('952', 'a', 'Location (home branch)', 'Location (home branch)', 0, 0, 'items.homebranch', 10, 'branches', '', '', 0, 0, '', '', '', NULL),
+('952', 'b', 'Sublocation or collection (holding branch)', 'Sublocation or collection (holding branch)', 1, 0, 'items.holdingbranch', 10, 'branches', '', '', 0, 0, '', '', '', NULL),
+('952', 'c', 'Shelving location', 'Shelving location', 1, 0, 'items.location', 10, 'SHELF_LOC', '', '', 0, 0, '', '', '', NULL),
+('952', 'd', 'Date acquired', 'Date acquired', 0, 0, 'items.dateaccessioned', 10, '', '', 'dateaccessioned.pl', 0, 0, '', '', '', NULL),
+('952', 'e', 'Source of acquisition', 'Source of acquisition', 1, 0, 'items.booksellerid', 10, '', '', 'bookseller.pl', 0, 0, '', '', '', NULL),
+('952', 'f', 'Coded location qualifier', 'Coded location qualifier', 1, 0, '', 10, '', '', 'marc21_locationqualifier.pl', NULL, 0, '', '', '', NULL),
+('952', 'g', 'Cost, normal purchase price', 'Cost, normal purchase price', 0, 0, 'items.price', 10, '', '', '', 0, 0, '', '', '', NULL),
 ('952', 'h', 'Classification part', 'Classification part', 0, 0, '', 10, '', '', '', NULL, 0, '', '', '', NULL),
 ('952', 'i', 'Item part', 'Item part', 1, 0, '', 10, '', '', '', NULL, 0, '', '', '', NULL),
 ('952', 'j', 'Shelving control number', 'Shelving control number', 0, 0, 'items.stack', 10, 'STACK', '', '', NULL, -1, '', '', '', NULL),
 ('952', 'k', 'Call number prefix', 'Call number prefix', 0, 0, '', 10, '', '', '', NULL, 0, '', '', '', NULL),
-('952', 'l', 'Koha renewals', 'Koha renewals', 0, 0, 'items.renewals', 10, '', '', '', NULL, -5, '', '', '', NULL),
-('952', 'm', 'Call number suffix', 'Call number suffix', 0, 0, '', 10, '', '', '', NULL, 0, '', '', '', NULL),
+('952', 'l', 'Koha issues (borrowed)', 'Koha issues (borrowed)', 0, 0, 'items.issues', 10, '', '', '', NULL, -5, '', '', '', NULL),
+('952', 'm', 'Koha renewals', 'Koha renewals', 0, 0, 'items.renewals', 10, '', '', '', NULL, -5, '', '', '', NULL),
 ('952', 'n', 'Koha reserves (requests)', 'Koha reserves (requests)', 0, 0, 'items.reserves', 10, '', '', '', NULL, -5, '', '', '', NULL),
-('952', 'o', 'Call number', 'Call number', 0, 0, 'items.itemcallnumber', 10, '', '', NULL, 0, 0, '', '', '', NULL),
+('952', 'o', 'Koha full call number', 'Koha full call number', 0, 0, 'items.itemcallnumber', 10, '', '', NULL, 0, 0, '', '', '', NULL),
 ('952', 'p', 'Piece designation (barcode)', 'Piece designation (barcode)', 0, 0, 'items.barcode', 10, '', '', 'barcode.pl', 0, 0, '', '', '', NULL),
-('952', 'q', 'Koha onloan', 'Koha onloan', 1, 0, 'items.onloan', 10, '', '', '', NULL, -5, '', '', '', NULL),
-('952', 'r', 'Koha datelastseen', 'Koha datelastseen', 1, 0, 'items.datelastseen', 10, '', '', '', NULL, -5, '', '', '', NULL),
-('952', 's', 'Koha datelastborrowed', 'Koha datelastborrowed', 1, 0, 'items.datelastborrowed', 10, '', '', '', NULL, -5, '', '', '', NULL),
+('952', 'q', 'Koha on loan', 'Koha on loan', 1, 0, 'items.onloan', 10, '', '', '', NULL, -5, '', '', '', NULL),
+('952', 'r', 'Koha date last seen', 'Koha date last seen', 1, 0, 'items.datelastseen', 10, '', '', '', NULL, -5, '', '', '', NULL),
+('952', 's', 'Koha date last borrowed', 'Koha date last borrowed', 1, 0, 'items.datelastborrowed', 10, '', '', '', NULL, -5, '', '', '', NULL),
 ('952', 't', 'Copy number', 'Copy number', 0, 0, '', 10, '', '', '', NULL, 0, '', '', '', NULL),
 ('952', 'u', 'Uniform Resource Identifier', 'Uniform Resource Identifier', 1, 0, '', 10, '', '', '', 1, 0, '', '', '', NULL),
 ('952', 'v', 'Cost, replacement price', 'Cost, replacement price', 0, 0, 'items.replacementprice', 10, '', '', '', 0, 0, '', '', '', NULL),
 ('952', 'w', 'Price effective from', 'Price effective from', 0, 0, 'items.replacementpricedate', 10, '', '', '', 0, 0, '', '', '', NULL),
 ('952', 'x', 'Nonpublic note (lost item payment)', 'Nonpublic note (lost item payment)', 1, 0, 'items.paidfor', 10, '', '', '', NULL, 7, '', '', '', NULL),
-('952', 'y', 'Use restrictions (not for loan)', 'Use restrictions (not for loan)', 0, 0, 'items.notforloan', 10, '', '', '', 0, 0, '', '', '', NULL),
+('952', 'y', 'Koha item type', 'Koha item type', 1, 0, 'items.itype', 10, 'itemtypes', '', '', NULL, -5, '', '', '', NULL),
 ('952', 'z', 'Public note', 'Public note', 0, 0, 'items.itemnotes', 10, '', '', '', 1, 0, '', '', '', NULL);