Merge branch 'master' of git.evergreen-ils.org:Evergreen into collab/berick/z39-batch...

Conflicts:
	Open-ILS/src/sql/Pg/950.data.seed-values.sql

Signed-off-by: Bill Erickson <berick@esilibrary.com>

diff --cc Open-ILS/examples/fm_IDL.xml
Simple merge

diff --cc Open-ILS/src/sql/Pg/950.data.seed-values.sql
index 43b1661,9beb73e..295d780
--- 1/Open-ILS/src/sql/Pg/950.data.seed-values.sql
--- 2/Open-ILS/src/sql/Pg/950.data.seed-values.sql
+++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
@@@ -12364,61 -12364,33 +12364,91 @@@ VALUES 
  );
  
  
 +INSERT INTO config.z3950_index_field_map 
 +    (id, label, metabib_field, z3950_attr_type) VALUES 
 +(1, oils_i18n_gettext(1, 'Title',   'czifm', 'label'), 5,  'title'),
 +(2, oils_i18n_gettext(2, 'Author',  'czifm', 'label'), 8,  'author'),
 +(3, oils_i18n_gettext(3, 'ISBN',    'czifm', 'label'), 18, 'isbn'),
 +(4, oils_i18n_gettext(4, 'ISSN',    'czifm', 'label'), 19, 'issn'),
 +(5, oils_i18n_gettext(5, 'LCCN',    'czifm', 'label'), 30, 'lccn');
 +
 +INSERT INTO config.z3950_index_field_map 
 +    (id, label, record_attr, z3950_attr_type) VALUES 
 +(6, oils_i18n_gettext(6, 'Pubdate',  'czifm', 'label'),'pubdate', 'pubdate'),
 +(7, oils_i18n_gettext(7, 'Item Type', 'czifm', 'label'),'item_type', 'item_type');
 +
 +
 +-- let's leave room for more stock mappings
 +SELECT SETVAL('config.z3950_index_field_map_id_seq'::TEXT, 1000);
 +
 +INSERT INTO config.org_unit_setting_type
 +    (name, grp, label, description, datatype)
 +    VALUES (
 +        'cat.z3950.batch.max_parallel',
 +        'cat',
 +        oils_i18n_gettext(
 +            'cat.z3950.batch.max_parallel',
 +            'Maximum Parallel Z39.50 Batch Searches',
 +            'coust',
 +            'label'
 +        ),
 +        oils_i18n_gettext(
 +            'cat.z3950.batch.max_parallel',
 +            'The maximum number of Z39.50 searches that can be in-flight at any given time when performing batch Z39.50 searches',
 +            'coust',
 +            'description'
 +        ),
 +        'integer'
 +    );
 +
 +INSERT INTO config.org_unit_setting_type
 +    (name, grp, label, description, datatype)
 +    VALUES (
 +        'cat.z3950.batch.max_results',
 +        'cat',
 +        oils_i18n_gettext(
 +            'cat.z3950.batch.max_results',
 +            'Maximum Z39.50 Batch Search Results',
 +            'coust',
 +            'label'
 +        ),
 +        oils_i18n_gettext(
 +            'cat.z3950.batch.max_results',
 +            'The maximum number of search results to retrieve and queue for each record + Z39 source during batch Z39.50 searches',
 +            'coust',
 +            'description'
 +        ),
 +        'integer'
 +    );
 +
 +
+ INSERT INTO config.ts_config_list(id, name) VALUES
+     ('simple','Non-Stemmed Simple'),
+     ('danish_nostop','Danish Stemmed'),
+     ('dutch_nostop','Dutch Stemmed'),
+     ('english_nostop','English Stemmed'),
+     ('finnish_nostop','Finnish Stemmed'),
+     ('french_nostop','French Stemmed'),
+     ('german_nostop','German Stemmed'),
+     ('hungarian_nostop','Hungarian Stemmed'),
+     ('italian_nostop','Italian Stemmed'),
+     ('norwegian_nostop','Norwegian Stemmed'),
+     ('portuguese_nostop','Portuguese Stemmed'),
+     ('romanian_nostop','Romanian Stemmed'),
+     ('russian_nostop','Russian Stemmed'),
+     ('spanish_nostop','Spanish Stemmed'),
+     ('swedish_nostop','Swedish Stemmed'),
+     ('turkish_nostop','Turkish Stemmed');
+ 
+ INSERT INTO config.metabib_class_ts_map(field_class, ts_config, index_weight, always) VALUES
+     ('keyword','simple','A',true),
+     ('keyword','english_nostop','C',true),
+     ('title','simple','A',true),
+     ('title','english_nostop','C',true),
+     ('author','simple','A',true),
+     ('author','english_nostop','C',true),
+     ('series','simple','A',true),
+     ('series','english_nostop','C',true),
+     ('subject','simple','A',true),
+     ('subject','english_nostop','C',true),
+     ('identifier','simple','A',true);