Bugzilla – Attachment 60080 Details for
Bug 18039
Move the mandatory and optional files for non-english languages into 'default' directory so bug 17855 permits use of other languages
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 18039: en
Bug-18039-en.patch (text/plain), 29.63 KB, created by
Jonathan Druart
on 2017-02-09 16:27:49 UTC
(
hide
)
Description:
Bug 18039: en
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2017-02-09 16:27:49 UTC
Size:
29.63 KB
patch
obsolete
>From f5dc27308092c06ce3172443f20000affd511391 Mon Sep 17 00:00:00 2001 >From: Alex Buckley <alexbuckley@catalyst.net.nz> >Date: Thu, 9 Feb 2017 14:58:37 +0100 >Subject: [PATCH] Bug 18039: en > >This patches comes from bug 17855. >--- > .../data/mysql/en/{optional => default}/auth_val.sql | 0 > .../data/mysql/en/{optional => default}/auth_val.txt | 0 > .../mysql/en/{mandatory => default}/auth_values.sql | 0 > .../mysql/en/{mandatory => default}/auth_values.txt | 0 > .../mysql/en/{mandatory => default}/class_sources.sql | 6 +++--- > .../mysql/en/{mandatory => default}/class_sources.txt | 0 > .../mysql/en/{optional => default}/csv_profiles.sql | 2 +- > .../mysql/en/{optional => default}/csv_profiles.txt | 2 -- > .../{mandatory => default}/message_transport_types.sql | 0 > .../{mandatory => default}/message_transport_types.txt | 1 - > .../data/mysql/en/{optional => default}/parameters.sql | 0 > .../data/mysql/en/{optional => default}/parameters.txt | 0 > .../en/{mandatory => default}/patron_attributes.sql | 0 > installer/data/mysql/en/default/patron_attributes.txt | 1 + > .../en/{mandatory => default}/sample_frequencies.sql | 0 > .../en/{mandatory => default}/sample_frequencies.txt | 0 > .../mysql/en/{mandatory => default}/sample_notices.sql | 0 > .../mysql/en/{mandatory => default}/sample_notices.txt | 0 > .../sample_notices_message_attributes.sql | 1 - > .../sample_notices_message_attributes.txt | 0 > .../sample_notices_message_transports.sql | 0 > .../sample_notices_message_transports.txt | 0 > .../{mandatory => default}/sample_numberpatterns.sql | 0 > .../{mandatory => default}/sample_numberpatterns.txt | 0 > .../data/mysql/en/mandatory/patron_attributes.txt | 0 > .../authorities_normal_marc21.sql | 0 > .../marc21/default/authorities_normal_marc21.txt | 9 +++++++++ > .../marc21_default_matching_rules.sql | 18 +++++++++--------- > .../marc21_default_matching_rules.txt | 5 +---- > .../marc21_framework_DEFAULT.sql | 0 > .../marc21_framework_DEFAULT.txt | 0 > .../marc21_sample_fastadd_framework.sql | 0 > .../marc21_sample_fastadd_framework.txt | 0 > .../marc21_simple_bib_frameworks.sql | 0 > .../marc21_simple_bib_frameworks.txt | 1 - > .../marc21/mandatory/authorities_normal_marc21.txt | 11 ----------- > .../authorities_normal_unimarc.sql | 2 -- > .../unimarc/default/authorities_normal_unimarc.txt | 1 + > .../unimarc_framework_DEFAULT.sql | 10 +++++----- > .../unimarc_framework_DEFAULT.txt | 0 > .../unimarc/mandatory/authorities_normal_unimarc.txt | 1 - > 41 files changed, 30 insertions(+), 41 deletions(-) > rename installer/data/mysql/en/{optional => default}/auth_val.sql (100%) > rename installer/data/mysql/en/{optional => default}/auth_val.txt (100%) > rename installer/data/mysql/en/{mandatory => default}/auth_values.sql (100%) > rename installer/data/mysql/en/{mandatory => default}/auth_values.txt (100%) > rename installer/data/mysql/en/{mandatory => default}/class_sources.sql (99%) > rename installer/data/mysql/en/{mandatory => default}/class_sources.txt (100%) > rename installer/data/mysql/en/{optional => default}/csv_profiles.sql (91%) > rename installer/data/mysql/en/{optional => default}/csv_profiles.txt (83%) > rename installer/data/mysql/en/{mandatory => default}/message_transport_types.sql (100%) > rename installer/data/mysql/en/{mandatory => default}/message_transport_types.txt (98%) > rename installer/data/mysql/en/{optional => default}/parameters.sql (100%) > rename installer/data/mysql/en/{optional => default}/parameters.txt (100%) > rename installer/data/mysql/en/{mandatory => default}/patron_attributes.sql (100%) > create mode 100644 installer/data/mysql/en/default/patron_attributes.txt > rename installer/data/mysql/en/{mandatory => default}/sample_frequencies.sql (100%) > rename installer/data/mysql/en/{mandatory => default}/sample_frequencies.txt (100%) > rename installer/data/mysql/en/{mandatory => default}/sample_notices.sql (100%) > rename installer/data/mysql/en/{mandatory => default}/sample_notices.txt (100%) > rename installer/data/mysql/en/{mandatory => default}/sample_notices_message_attributes.sql (99%) > rename installer/data/mysql/en/{mandatory => default}/sample_notices_message_attributes.txt (100%) > rename installer/data/mysql/en/{mandatory => default}/sample_notices_message_transports.sql (100%) > rename installer/data/mysql/en/{mandatory => default}/sample_notices_message_transports.txt (100%) > rename installer/data/mysql/en/{mandatory => default}/sample_numberpatterns.sql (100%) > rename installer/data/mysql/en/{mandatory => default}/sample_numberpatterns.txt (100%) > delete mode 100644 installer/data/mysql/en/mandatory/patron_attributes.txt > rename installer/data/mysql/en/marcflavour/marc21/{mandatory => default}/authorities_normal_marc21.sql (100%) > create mode 100644 installer/data/mysql/en/marcflavour/marc21/default/authorities_normal_marc21.txt > rename installer/data/mysql/en/marcflavour/marc21/{optional => default}/marc21_default_matching_rules.sql (96%) > rename installer/data/mysql/en/marcflavour/marc21/{optional => default}/marc21_default_matching_rules.txt (61%) > rename installer/data/mysql/en/marcflavour/marc21/{mandatory => default}/marc21_framework_DEFAULT.sql (100%) > rename installer/data/mysql/en/marcflavour/marc21/{mandatory => default}/marc21_framework_DEFAULT.txt (100%) > rename installer/data/mysql/en/marcflavour/marc21/{optional => default}/marc21_sample_fastadd_framework.sql (100%) > rename installer/data/mysql/en/marcflavour/marc21/{optional => default}/marc21_sample_fastadd_framework.txt (100%) > rename installer/data/mysql/en/marcflavour/marc21/{optional => default}/marc21_simple_bib_frameworks.sql (100%) > rename installer/data/mysql/en/marcflavour/marc21/{optional => default}/marc21_simple_bib_frameworks.txt (99%) > delete mode 100644 installer/data/mysql/en/marcflavour/marc21/mandatory/authorities_normal_marc21.txt > rename installer/data/mysql/en/marcflavour/unimarc/{mandatory => default}/authorities_normal_unimarc.sql (99%) > create mode 100644 installer/data/mysql/en/marcflavour/unimarc/default/authorities_normal_unimarc.txt > rename installer/data/mysql/en/marcflavour/unimarc/{mandatory => default}/unimarc_framework_DEFAULT.sql (99%) > rename installer/data/mysql/en/marcflavour/unimarc/{mandatory => default}/unimarc_framework_DEFAULT.txt (100%) > delete mode 100644 installer/data/mysql/en/marcflavour/unimarc/mandatory/authorities_normal_unimarc.txt > >diff --git a/installer/data/mysql/en/optional/auth_val.sql b/installer/data/mysql/en/default/auth_val.sql >similarity index 100% >rename from installer/data/mysql/en/optional/auth_val.sql >rename to installer/data/mysql/en/default/auth_val.sql >diff --git a/installer/data/mysql/en/optional/auth_val.txt b/installer/data/mysql/en/default/auth_val.txt >similarity index 100% >rename from installer/data/mysql/en/optional/auth_val.txt >rename to installer/data/mysql/en/default/auth_val.txt >diff --git a/installer/data/mysql/en/mandatory/auth_values.sql b/installer/data/mysql/en/default/auth_values.sql >similarity index 100% >rename from installer/data/mysql/en/mandatory/auth_values.sql >rename to installer/data/mysql/en/default/auth_values.sql >diff --git a/installer/data/mysql/en/mandatory/auth_values.txt b/installer/data/mysql/en/default/auth_values.txt >similarity index 100% >rename from installer/data/mysql/en/mandatory/auth_values.txt >rename to installer/data/mysql/en/default/auth_values.txt >diff --git a/installer/data/mysql/en/mandatory/class_sources.sql b/installer/data/mysql/en/default/class_sources.sql >similarity index 99% >rename from installer/data/mysql/en/mandatory/class_sources.sql >rename to installer/data/mysql/en/default/class_sources.sql >index 589ea7a..bad1ad4 100644 >--- a/installer/data/mysql/en/mandatory/class_sources.sql >+++ b/installer/data/mysql/en/default/class_sources.sql >@@ -1,4 +1,4 @@ >--- >+-- > -- Default classification sources and filing rules > -- for Koha. > -- >@@ -10,11 +10,11 @@ > -- terms of the GNU General Public License as published by the Free Software > -- Foundation; either version 2 of the License, or (at your option) any later > -- version. >--- >+-- > -- Koha is distributed in the hope that it will be useful, but WITHOUT ANY > -- WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR > -- A PARTICULAR PURPOSE. See the GNU General Public License for more details. >--- >+-- > -- You should have received a copy of the GNU General Public License along > -- with Koha; if not, write to the Free Software Foundation, Inc., > -- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. >diff --git a/installer/data/mysql/en/mandatory/class_sources.txt b/installer/data/mysql/en/default/class_sources.txt >similarity index 100% >rename from installer/data/mysql/en/mandatory/class_sources.txt >rename to installer/data/mysql/en/default/class_sources.txt >diff --git a/installer/data/mysql/en/optional/csv_profiles.sql b/installer/data/mysql/en/default/csv_profiles.sql >similarity index 91% >rename from installer/data/mysql/en/optional/csv_profiles.sql >rename to installer/data/mysql/en/default/csv_profiles.sql >index ebf599c..f7c5e22 100644 >--- a/installer/data/mysql/en/optional/csv_profiles.sql >+++ b/installer/data/mysql/en/default/csv_profiles.sql >@@ -1,2 +1,2 @@ >-INSERT IGNORE INTO export_format( profile, description, content, csv_separator, type ) >+INSERT IGNORE INTO export_format( profile, description, content, csv_separator, type ) > VALUES ( "issues to claim", "default CSV export for serial issue claims", "SUPPLIER=aqbooksellers.name|TITLE=subscription.title|ISSUE NUMBER=serial.serialseq|LATE SINCE=serial.planneddate", ",", "sql" ); >diff --git a/installer/data/mysql/en/optional/csv_profiles.txt b/installer/data/mysql/en/default/csv_profiles.txt >similarity index 83% >rename from installer/data/mysql/en/optional/csv_profiles.txt >rename to installer/data/mysql/en/default/csv_profiles.txt >index 9dcff5d..2bca64f 100644 >--- a/installer/data/mysql/en/optional/csv_profiles.txt >+++ b/installer/data/mysql/en/default/csv_profiles.txt >@@ -1,3 +1 @@ >-CSV profiles >- > Default CSV export profiles; including one for exporting serial claims. >diff --git a/installer/data/mysql/en/mandatory/message_transport_types.sql b/installer/data/mysql/en/default/message_transport_types.sql >similarity index 100% >rename from installer/data/mysql/en/mandatory/message_transport_types.sql >rename to installer/data/mysql/en/default/message_transport_types.sql >diff --git a/installer/data/mysql/en/mandatory/message_transport_types.txt b/installer/data/mysql/en/default/message_transport_types.txt >similarity index 98% >rename from installer/data/mysql/en/mandatory/message_transport_types.txt >rename to installer/data/mysql/en/default/message_transport_types.txt >index 054d914..9665f67 100644 >--- a/installer/data/mysql/en/mandatory/message_transport_types.txt >+++ b/installer/data/mysql/en/default/message_transport_types.txt >@@ -1,2 +1 @@ > Defines default message transports for email and sms. >- >diff --git a/installer/data/mysql/en/optional/parameters.sql b/installer/data/mysql/en/default/parameters.sql >similarity index 100% >rename from installer/data/mysql/en/optional/parameters.sql >rename to installer/data/mysql/en/default/parameters.sql >diff --git a/installer/data/mysql/en/optional/parameters.txt b/installer/data/mysql/en/default/parameters.txt >similarity index 100% >rename from installer/data/mysql/en/optional/parameters.txt >rename to installer/data/mysql/en/default/parameters.txt >diff --git a/installer/data/mysql/en/mandatory/patron_attributes.sql b/installer/data/mysql/en/default/patron_attributes.sql >similarity index 100% >rename from installer/data/mysql/en/mandatory/patron_attributes.sql >rename to installer/data/mysql/en/default/patron_attributes.sql >diff --git a/installer/data/mysql/en/default/patron_attributes.txt b/installer/data/mysql/en/default/patron_attributes.txt >new file mode 100644 >index 0000000..fa912e3 >--- /dev/null >+++ b/installer/data/mysql/en/default/patron_attributes.txt >@@ -0,0 +1 @@ >+Patron attributes >diff --git a/installer/data/mysql/en/mandatory/sample_frequencies.sql b/installer/data/mysql/en/default/sample_frequencies.sql >similarity index 100% >rename from installer/data/mysql/en/mandatory/sample_frequencies.sql >rename to installer/data/mysql/en/default/sample_frequencies.sql >diff --git a/installer/data/mysql/en/mandatory/sample_frequencies.txt b/installer/data/mysql/en/default/sample_frequencies.txt >similarity index 100% >rename from installer/data/mysql/en/mandatory/sample_frequencies.txt >rename to installer/data/mysql/en/default/sample_frequencies.txt >diff --git a/installer/data/mysql/en/mandatory/sample_notices.sql b/installer/data/mysql/en/default/sample_notices.sql >similarity index 100% >rename from installer/data/mysql/en/mandatory/sample_notices.sql >rename to installer/data/mysql/en/default/sample_notices.sql >diff --git a/installer/data/mysql/en/mandatory/sample_notices.txt b/installer/data/mysql/en/default/sample_notices.txt >similarity index 100% >rename from installer/data/mysql/en/mandatory/sample_notices.txt >rename to installer/data/mysql/en/default/sample_notices.txt >diff --git a/installer/data/mysql/en/mandatory/sample_notices_message_attributes.sql b/installer/data/mysql/en/default/sample_notices_message_attributes.sql >similarity index 99% >rename from installer/data/mysql/en/mandatory/sample_notices_message_attributes.sql >rename to installer/data/mysql/en/default/sample_notices_message_attributes.sql >index a7a6032..8499d3d 100644 >--- a/installer/data/mysql/en/mandatory/sample_notices_message_attributes.sql >+++ b/installer/data/mysql/en/default/sample_notices_message_attributes.sql >@@ -6,4 +6,3 @@ values > (4, 'Hold_Filled', 0), > (5, 'Item_Check_in', 0), > (6, 'Item_Checkout', 0); >- >diff --git a/installer/data/mysql/en/mandatory/sample_notices_message_attributes.txt b/installer/data/mysql/en/default/sample_notices_message_attributes.txt >similarity index 100% >rename from installer/data/mysql/en/mandatory/sample_notices_message_attributes.txt >rename to installer/data/mysql/en/default/sample_notices_message_attributes.txt >diff --git a/installer/data/mysql/en/mandatory/sample_notices_message_transports.sql b/installer/data/mysql/en/default/sample_notices_message_transports.sql >similarity index 100% >rename from installer/data/mysql/en/mandatory/sample_notices_message_transports.sql >rename to installer/data/mysql/en/default/sample_notices_message_transports.sql >diff --git a/installer/data/mysql/en/mandatory/sample_notices_message_transports.txt b/installer/data/mysql/en/default/sample_notices_message_transports.txt >similarity index 100% >rename from installer/data/mysql/en/mandatory/sample_notices_message_transports.txt >rename to installer/data/mysql/en/default/sample_notices_message_transports.txt >diff --git a/installer/data/mysql/en/mandatory/sample_numberpatterns.sql b/installer/data/mysql/en/default/sample_numberpatterns.sql >similarity index 100% >rename from installer/data/mysql/en/mandatory/sample_numberpatterns.sql >rename to installer/data/mysql/en/default/sample_numberpatterns.sql >diff --git a/installer/data/mysql/en/mandatory/sample_numberpatterns.txt b/installer/data/mysql/en/default/sample_numberpatterns.txt >similarity index 100% >rename from installer/data/mysql/en/mandatory/sample_numberpatterns.txt >rename to installer/data/mysql/en/default/sample_numberpatterns.txt >diff --git a/installer/data/mysql/en/mandatory/patron_attributes.txt b/installer/data/mysql/en/mandatory/patron_attributes.txt >deleted file mode 100644 >index e69de29..0000000 >diff --git a/installer/data/mysql/en/marcflavour/marc21/mandatory/authorities_normal_marc21.sql b/installer/data/mysql/en/marcflavour/marc21/default/authorities_normal_marc21.sql >similarity index 100% >rename from installer/data/mysql/en/marcflavour/marc21/mandatory/authorities_normal_marc21.sql >rename to installer/data/mysql/en/marcflavour/marc21/default/authorities_normal_marc21.sql >diff --git a/installer/data/mysql/en/marcflavour/marc21/default/authorities_normal_marc21.txt b/installer/data/mysql/en/marcflavour/marc21/default/authorities_normal_marc21.txt >new file mode 100644 >index 0000000..076918f >--- /dev/null >+++ b/installer/data/mysql/en/marcflavour/marc21/default/authorities_normal_marc21.txt >@@ -0,0 +1,9 @@ >+Default MARC21 Standard Authority types: >+ Personal Name >+ Corporate Name >+ Meeting Name >+ Uniform Title >+ Chronological Term >+ Topical Term >+ Geographic Name >+ Genre/Form Term >diff --git a/installer/data/mysql/en/marcflavour/marc21/optional/marc21_default_matching_rules.sql b/installer/data/mysql/en/marcflavour/marc21/default/marc21_default_matching_rules.sql >similarity index 96% >rename from installer/data/mysql/en/marcflavour/marc21/optional/marc21_default_matching_rules.sql >rename to installer/data/mysql/en/marcflavour/marc21/default/marc21_default_matching_rules.sql >index 2e538a4..5192044 100644 >--- a/installer/data/mysql/en/marcflavour/marc21/optional/marc21_default_matching_rules.sql >+++ b/installer/data/mysql/en/marcflavour/marc21/default/marc21_default_matching_rules.sql >@@ -1,4 +1,4 @@ >--- >+-- > -- Default MARC matching rules for Koha > -- > -- Copyright (C) 2007 LiblimeA >@@ -9,31 +9,31 @@ > -- terms of the GNU General Public License as published by the Free Software > -- Foundation; either version 2 of the License, or (at your option) any later > -- version. >--- >+-- > -- Koha is distributed in the hope that it will be useful, but WITHOUT ANY > -- WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR > -- A PARTICULAR PURPOSE. See the GNU General Public License for more details. >--- >+-- > -- You should have received a copy of the GNU General Public License along > -- with Koha; if not, write to the Free Software Foundation, Inc., > -- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. > >-INSERT INTO marc_matchers (code, description, record_type, threshold) >+INSERT INTO marc_matchers (code, description, record_type, threshold) > VALUES ('ISBN', '020$a', 'biblio', 1000); > INSERT INTO matchpoints (matcher_id, search_index, score) SELECT MAX(matcher_id), 'isbn', 1000 FROM marc_matchers; > INSERT INTO matcher_matchpoints SELECT MAX(matcher_id), MAX(matchpoint_id) FROM matchpoints; >-INSERT INTO matchpoint_components (matchpoint_id, sequence, tag, subfields) >+INSERT INTO matchpoint_components (matchpoint_id, sequence, tag, subfields) > SELECT MAX(matchpoint_id), 1, '020', 'a' FROM matchpoints; >-INSERT INTO matchpoint_component_norms (matchpoint_component_id, sequence, norm_routine) >+INSERT INTO matchpoint_component_norms (matchpoint_component_id, sequence, norm_routine) > SELECT MAX(matchpoint_component_id), 1, 'ISBN' FROM matchpoint_components; > >-INSERT INTO marc_matchers (code, description, record_type, threshold) >+INSERT INTO marc_matchers (code, description, record_type, threshold) > VALUES ('ISSN', '022$a', 'biblio', 1000); > INSERT INTO matchpoints (matcher_id, search_index, score) SELECT MAX(matcher_id), 'issn', 1000 FROM marc_matchers; > INSERT INTO matcher_matchpoints SELECT MAX(matcher_id), MAX(matchpoint_id) FROM matchpoints; >-INSERT INTO matchpoint_components (matchpoint_id, sequence, tag, subfields) >+INSERT INTO matchpoint_components (matchpoint_id, sequence, tag, subfields) > SELECT MAX(matchpoint_id), 1, '022', 'a' FROM matchpoints; >-INSERT INTO matchpoint_component_norms (matchpoint_component_id, sequence, norm_routine) >+INSERT INTO matchpoint_component_norms (matchpoint_component_id, sequence, norm_routine) > SELECT MAX(matchpoint_component_id), 1, 'ISSN' FROM matchpoint_components; > > INSERT INTO marc_matchers (code, description, record_type, threshold) >diff --git a/installer/data/mysql/en/marcflavour/marc21/optional/marc21_default_matching_rules.txt b/installer/data/mysql/en/marcflavour/marc21/default/marc21_default_matching_rules.txt >similarity index 61% >rename from installer/data/mysql/en/marcflavour/marc21/optional/marc21_default_matching_rules.txt >rename to installer/data/mysql/en/marcflavour/marc21/default/marc21_default_matching_rules.txt >index 471db24..7cbd6f4 100644 >--- a/installer/data/mysql/en/marcflavour/marc21/optional/marc21_default_matching_rules.txt >+++ b/installer/data/mysql/en/marcflavour/marc21/default/marc21_default_matching_rules.txt >@@ -1,5 +1,2 @@ > Selected matching rules for MARC 21 bibliographic >-records, including: >- >-ISBN >-ISSN >+records, including: ISBN, ISSN >diff --git a/installer/data/mysql/en/marcflavour/marc21/mandatory/marc21_framework_DEFAULT.sql b/installer/data/mysql/en/marcflavour/marc21/default/marc21_framework_DEFAULT.sql >similarity index 100% >rename from installer/data/mysql/en/marcflavour/marc21/mandatory/marc21_framework_DEFAULT.sql >rename to installer/data/mysql/en/marcflavour/marc21/default/marc21_framework_DEFAULT.sql >diff --git a/installer/data/mysql/en/marcflavour/marc21/mandatory/marc21_framework_DEFAULT.txt b/installer/data/mysql/en/marcflavour/marc21/default/marc21_framework_DEFAULT.txt >similarity index 100% >rename from installer/data/mysql/en/marcflavour/marc21/mandatory/marc21_framework_DEFAULT.txt >rename to installer/data/mysql/en/marcflavour/marc21/default/marc21_framework_DEFAULT.txt >diff --git a/installer/data/mysql/en/marcflavour/marc21/optional/marc21_sample_fastadd_framework.sql b/installer/data/mysql/en/marcflavour/marc21/default/marc21_sample_fastadd_framework.sql >similarity index 100% >rename from installer/data/mysql/en/marcflavour/marc21/optional/marc21_sample_fastadd_framework.sql >rename to installer/data/mysql/en/marcflavour/marc21/default/marc21_sample_fastadd_framework.sql >diff --git a/installer/data/mysql/en/marcflavour/marc21/optional/marc21_sample_fastadd_framework.txt b/installer/data/mysql/en/marcflavour/marc21/default/marc21_sample_fastadd_framework.txt >similarity index 100% >rename from installer/data/mysql/en/marcflavour/marc21/optional/marc21_sample_fastadd_framework.txt >rename to installer/data/mysql/en/marcflavour/marc21/default/marc21_sample_fastadd_framework.txt >diff --git a/installer/data/mysql/en/marcflavour/marc21/optional/marc21_simple_bib_frameworks.sql b/installer/data/mysql/en/marcflavour/marc21/default/marc21_simple_bib_frameworks.sql >similarity index 100% >rename from installer/data/mysql/en/marcflavour/marc21/optional/marc21_simple_bib_frameworks.sql >rename to installer/data/mysql/en/marcflavour/marc21/default/marc21_simple_bib_frameworks.sql >diff --git a/installer/data/mysql/en/marcflavour/marc21/optional/marc21_simple_bib_frameworks.txt b/installer/data/mysql/en/marcflavour/marc21/default/marc21_simple_bib_frameworks.txt >similarity index 99% >rename from installer/data/mysql/en/marcflavour/marc21/optional/marc21_simple_bib_frameworks.txt >rename to installer/data/mysql/en/marcflavour/marc21/default/marc21_simple_bib_frameworks.txt >index cf49dc3..7bfd5d6 100644 >--- a/installer/data/mysql/en/marcflavour/marc21/optional/marc21_simple_bib_frameworks.txt >+++ b/installer/data/mysql/en/marcflavour/marc21/default/marc21_simple_bib_frameworks.txt >@@ -1,5 +1,4 @@ > Simple MARC 21 bibliographic frameworks for some common types of bibliographic material. Frameworks are used to define the structure of your MARC records and the behavior of the integrated MARC editor. You can change these at any time after installation. The frameworks in this optional default setting include: >- > BKS Books, Booklets, Workbooks > CF CD-ROMs, DVD-ROMs, General Online Resources > SR Audio Cassettes, CDs >diff --git a/installer/data/mysql/en/marcflavour/marc21/mandatory/authorities_normal_marc21.txt b/installer/data/mysql/en/marcflavour/marc21/mandatory/authorities_normal_marc21.txt >deleted file mode 100644 >index b14f98b..0000000 >--- a/installer/data/mysql/en/marcflavour/marc21/mandatory/authorities_normal_marc21.txt >+++ /dev/null >@@ -1,11 +0,0 @@ >-Default MARC21 Standard Authority types: >- >- Personal Name >- Corporate Name >- Meeting Name >- Uniform Title >- Chronological Term >- Topical Term >- Geographic Name >- Genre/Form Term >- >diff --git a/installer/data/mysql/en/marcflavour/unimarc/mandatory/authorities_normal_unimarc.sql b/installer/data/mysql/en/marcflavour/unimarc/default/authorities_normal_unimarc.sql >similarity index 99% >rename from installer/data/mysql/en/marcflavour/unimarc/mandatory/authorities_normal_unimarc.sql >rename to installer/data/mysql/en/marcflavour/unimarc/default/authorities_normal_unimarc.sql >index 52267c7..c9f5456 100644 >--- a/installer/data/mysql/en/marcflavour/unimarc/mandatory/authorities_normal_unimarc.sql >+++ b/installer/data/mysql/en/marcflavour/unimarc/default/authorities_normal_unimarc.sql >@@ -819,5 +819,3 @@ INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield` > ('', '886', '2', 'System Code', 'System Code', 0, 0, 8, '', '', '', 0, -5, 0, '', ''), > ('', '886', 'a', 'Tag of the Source Format Field', 'Tag of the Source Format Field', 1, 0, 8, '', '', '', 0, -5, 0, '', ''), > ('', '886', 'b', 'Indicators and Subfields of the Source Format Field', 'Indicators and Subfields of the Source Format Field', 1, 0, 8, '', '', '', 0, -5, 0, '', ''); >- >- >diff --git a/installer/data/mysql/en/marcflavour/unimarc/default/authorities_normal_unimarc.txt b/installer/data/mysql/en/marcflavour/unimarc/default/authorities_normal_unimarc.txt >new file mode 100644 >index 0000000..202a9cc >--- /dev/null >+++ b/installer/data/mysql/en/marcflavour/unimarc/default/authorities_normal_unimarc.txt >@@ -0,0 +1 @@ >+ Authority structure for UNIMARC in English. >diff --git a/installer/data/mysql/en/marcflavour/unimarc/mandatory/unimarc_framework_DEFAULT.sql b/installer/data/mysql/en/marcflavour/unimarc/default/unimarc_framework_DEFAULT.sql >similarity index 99% >rename from installer/data/mysql/en/marcflavour/unimarc/mandatory/unimarc_framework_DEFAULT.sql >rename to installer/data/mysql/en/marcflavour/unimarc/default/unimarc_framework_DEFAULT.sql >index 94ccaa9..0d65c11 100644 >--- a/installer/data/mysql/en/marcflavour/unimarc/mandatory/unimarc_framework_DEFAULT.sql >+++ b/installer/data/mysql/en/marcflavour/unimarc/default/unimarc_framework_DEFAULT.sql >@@ -23,7 +23,7 @@ > > -- From Zeno Tajoli (2010-08-12): > -- >--- Improved default id Koha field (090) and koha date field (099). >+-- Improved default id Koha field (090) and koha date field (099). > -- Insert link to sql coloum biblio.biblionumber in tag 001 > -- Insert the use of 942, local data > -- Insert a standard minimun on 995 (holding field) >@@ -72,7 +72,7 @@ > insert into `marc_tag_structure`(`tagfield`,`liblibrarian`,`libopac`,`repeatable`,`mandatory`,`authorised_value`,`frameworkcode`) values > ('090','System Control Numbers (Koha)','System Control Numbers (Koha)',0,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 >+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 > ('090','a','Koha biblioitem number (autogenerated)','Koha biblioitem number (autogenerated)',0,0,'biblioitems.biblioitemnumber',9,'','','',0,-5,'',NULL,'',''); > > -- Local date field/Subfields (099) >@@ -80,9 +80,9 @@ insert into `marc_subfield_structure`(`tagfield`,`tagsubfield`,`liblibrarian`,` > insert into `marc_tag_structure`(`tagfield`,`liblibrarian`,`libopac`,`repeatable`,`mandatory`,`authorised_value`,`frameworkcode`) values > ('099','local dates','',0,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 >+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 > ('099','c','Date of creation (bib. record)','Date of creation (bib. record)',0,0,'biblio.datecreated',0,'','','',0,-5,'',NULL,'',''); >- >+ > 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 > ('099','d','Last modified date (bib. record)','Last modified data (bib. record)',0,0,'biblio.timestamp',0,'','','',0,-5,'',NULL,'',''); > >@@ -151,7 +151,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` > ('995', 'r', 'Type of item and material', 'Type of item and material', 0, 1, 'items.itype', 10, 'itemtypes', '', '', 0, 0, '', '', '', NULL), > ('995', 'u', 'Copy note', 'Copy note', 0, 0, 'items.itemnotes', 10, '', '', '', 0, 0, '', '', '', NULL), > ('995', 'v', 'Serial Enumeration / chronology', 'Serial Enumeration / chronology', 0, 0, 'items.enumchron', 10, '', '', '', 0, -1, '', '', '', NULL); >- >+ > > > -- ******************************************************* >diff --git a/installer/data/mysql/en/marcflavour/unimarc/mandatory/unimarc_framework_DEFAULT.txt b/installer/data/mysql/en/marcflavour/unimarc/default/unimarc_framework_DEFAULT.txt >similarity index 100% >rename from installer/data/mysql/en/marcflavour/unimarc/mandatory/unimarc_framework_DEFAULT.txt >rename to installer/data/mysql/en/marcflavour/unimarc/default/unimarc_framework_DEFAULT.txt >diff --git a/installer/data/mysql/en/marcflavour/unimarc/mandatory/authorities_normal_unimarc.txt b/installer/data/mysql/en/marcflavour/unimarc/mandatory/authorities_normal_unimarc.txt >deleted file mode 100644 >index 6fba0ac..0000000 >--- a/installer/data/mysql/en/marcflavour/unimarc/mandatory/authorities_normal_unimarc.txt >+++ /dev/null >@@ -1 +0,0 @@ >-Authority structure for UNIMARC in English. >-- >2.1.4
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 18039
: 60080 |
60081
|
60082
|
60083
|
60084
|
60085
|
60086
|
60087
|
60088
|
60089
|
60090
|
60091
|
60666
|
60667
|
61380