Merge branch 'national_coverage' into 'master'

National coverage to master

See merge request !2

ckanext/dcatdonl/resources/solr/5.3/schema.xml

@@ -186,6 +186,7 @@
         <field name="high_value" type="boolean" indexed="true" stored="true"/>
         <field name="referentie_data" type="boolean" indexed="true" stored="true"/>
         <field name="basis_register" type="boolean" indexed="true" stored="true"/>
+        <field name="national_coverage" type="boolean" indexed="true" stored="true"/>
 
         <!-- DCAT Distribution -->
         <field name="res_metadata_language" type="string" indexed="true" stored="true" multiValued="true"/>
@@ -285,6 +286,7 @@
         <field name="facet_high_value" type="string" indexed="true" stored="true"/>
         <field name="facet_referentie_data" type="string" indexed="true" stored="true"/>
         <field name="facet_basis_register" type="string" indexed="true" stored="true"/>
+        <field name="facet_national_coverage" type="string" indexed="true" stored="true"/>
 
         <!-- Dynamic -->
         <dynamicField name="*_date" type="date" indexed="true" stored="true"/>
@@ -364,5 +366,6 @@
     <copyField source="referentie_data" dest="facet_referentie_data"/>
     <copyField source="high_value" dest="facet_high_value"/>
     <copyField source="basis_register" dest="facet_basis_register"/>
+    <copyField source="national_coverage" dest="facet_national_coverage"/>
 
 </schema>

ckanext/dcatdonl/resources/solr/5.3/solrconfig.xml

@@ -82,6 +82,7 @@
             <str name="facet.field">facet_referentie_data</str>
             <str name="facet.field">facet_high_value</str>
             <str name="facet.field">facet_basis_register</str>
+            <str name="facet.field">facet_national_coverage</str>
         </lst>
     </requestHandler>
 

ckanext/dcatdonl/resources/solr/7.4/schema.xml

@@ -186,6 +186,7 @@
         <field name="high_value" type="boolean" indexed="true" stored="true"/>
         <field name="referentie_data" type="boolean" indexed="true" stored="true"/>
         <field name="basis_register" type="boolean" indexed="true" stored="true"/>
+        <field name="national_coverage" type="boolean" indexed="true" stored="true"/>
 
         <!-- DCAT Distribution -->
         <field name="res_metadata_language" type="string" indexed="true" stored="true" multiValued="true"/>
@@ -285,6 +286,7 @@
         <field name="facet_high_value" type="string" indexed="true" stored="true"/>
         <field name="facet_referentie_data" type="string" indexed="true" stored="true"/>
         <field name="facet_basis_register" type="string" indexed="true" stored="true"/>
+        <field name="facet_national_coverage" type="string" indexed="true" stored="true"/>
 
         <!-- Dynamic -->
         <dynamicField name="*_date" type="date" indexed="true" stored="true"/>
@@ -364,5 +366,6 @@
     <copyField source="referentie_data" dest="facet_referentie_data"/>
     <copyField source="high_value" dest="facet_high_value"/>
     <copyField source="basis_register" dest="facet_basis_register"/>
+    <copyField source="national_coverage" dest="facet_national_coverage"/>
 
 </schema>

ckanext/dcatdonl/resources/solr/7.4/solrconfig.xml

@@ -83,6 +83,7 @@
             <str name="facet.field">facet_referentie_data</str>
             <str name="facet.field">facet_high_value</str>
             <str name="facet.field">facet_basis_register</str>
+            <str name="facet.field">facet_national_coverage</str>
         </lst>
     </requestHandler>
 

ckanext/dcatdonl/schema/dcat_ap_donl_schema.py

@@ -92,6 +92,8 @@ def create_schema(original_schema):
         'referentie_data':          [default(False), recommended, single_value, boolean, to_extras],
         'basis_register':           [default(False), recommended, single_value, boolean, to_extras],
 
+        'national_coverage':        [default(False), single_value, boolean, to_extras],
+
         '__after':                  [multi_field_validation]
     })
 
@@ -213,6 +215,8 @@ def update_schema(original_schema):
         'referentie_data':          [default(False), recommended, single_value, boolean, to_extras],
         'basis_register':           [default(False), recommended, single_value, boolean, to_extras],
 
+        'national_coverage':        [default(False), single_value, boolean, to_extras],
+
         '__after':                  [multi_field_validation]
     })
 
@@ -322,6 +326,8 @@ def show_schema(original_schema):
         'referentie_data':          [from_extras, recommended, single_value],
         'basis_register':           [from_extras, recommended, single_value],
 
+        'national_coverage':        [from_extras, recommended, single_value],
+
         'changetype':               [from_extras, recommended, single_value]
     })