diff --git a/ckanext/odsh/plugin.py b/ckanext/odsh/plugin.py index 500edc636882997ab4775ffdac97149fb0effd33..d782ba3921447243e09636329fc6e0c27ad70b54 100644 --- a/ckanext/odsh/plugin.py +++ b/ckanext/odsh/plugin.py @@ -300,6 +300,12 @@ class OdshPlugin(plugins.SingletonPlugin, DefaultTranslation, DefaultDatasetForm self.map_qa_score(dict_pkg) return dict_pkg + + # Add the custom parameters to Solr's facet queries + # use several daterange queries agains temporal_start and temporal_end field + # TODO: use field of type date_range in solr index instead + def before_dataset_search(self, search_params): + return search.before_dataset_search(search_params) # ITemplateHelpers @@ -309,38 +315,38 @@ class OdshPlugin(plugins.SingletonPlugin, DefaultTranslation, DefaultDatasetForm # other extensions. return { 'odsh_main_groups': helpers_odsh.odsh_main_groups, - 'odsh_now': helpers_odsh.odsh_now, - 'odsh_group_id_selected': helpers_odsh.odsh_group_id_selected, - 'odsh_get_facet_items_dict': helpers_odsh.odsh_get_facet_items_dict, - 'odsh_openness_score_dataset_html': helpers_odsh.odsh_openness_score_dataset_html, - 'odsh_get_resource_details': helpers_odsh.odsh_get_resource_details, - 'odsh_get_resource_views': helpers_odsh.odsh_get_resource_views, - 'odsh_get_bounding_box': helpers_odsh.odsh_get_bounding_box, - 'odsh_get_spatial_text': helpers_odsh.odsh_get_spatial_text, - 'odsh_render_datetime': helpers_odsh.odsh_render_datetime, - 'odsh_resource_formats': helpers_odsh.odsh_resource_formats, - 'odsh_encodeurl': helpers_odsh.odsh_encodeurl, - 'odsh_extract_error': helpers_odsh.odsh_extract_error, - 'odsh_extract_error_new': helpers_odsh.odsh_extract_error_new, - 'odsh_extract_value_from_extras': helpers_odsh.odsh_extract_value_from_extras, - 'odsh_create_checksum': helpers_odsh.odsh_create_checksum, - 'presorted_license_options': helpers_odsh.presorted_license_options, - 'odsh_has_more_facets': helpers_odsh.odsh_has_more_facets, - 'odsh_public_url': helpers_odsh.odsh_public_url, - 'odsh_spatial_extends_available': helpers_odsh.spatial_extends_available, - 'odsh_public_resource_url': helpers_odsh.odsh_public_resource_url, - 'odsh_show_testbanner': helpers_odsh.odsh_show_testbanner, - 'get_daterange_prettified': helper_pkg_dict.get_daterange_prettified, - 'get_language_of_package': helpers_odsh.get_language_of_package, - 'get_language_icon': helpers_odsh.get_language_icon, - 'short_name_for_category': helpers_odsh.short_name_for_category, - 'get_spatial_for_selection': helpers_odsh.get_spatial_for_selection, - 'get_language_for_selection': helpers_odsh.get_language_for_selection, - 'get_resource_size': helpers_odsh.get_resource_size, - 'get_address_org':helpers_odsh.get_address_org, - 'get_body_mail':helpers_odsh.get_body_mail, - 'odsh_load_mdk_sample_dataset': helpers_odsh.odsh_load_mdk_sample_dataset, - 'odsh_load_raw_mdk_sample_dataset': helpers_odsh.odsh_load_raw_mdk_sample_dataset, + 'odsh_now': helpers_odsh.odsh_now, + 'odsh_group_id_selected': helpers_odsh.odsh_group_id_selected, + 'odsh_get_facet_items_dict': helpers_odsh.odsh_get_facet_items_dict, + 'odsh_openness_score_dataset_html': helpers_odsh.odsh_openness_score_dataset_html, + 'odsh_get_resource_details': helpers_odsh.odsh_get_resource_details, + 'odsh_get_resource_views': helpers_odsh.odsh_get_resource_views, + 'odsh_get_bounding_box': helpers_odsh.odsh_get_bounding_box, + 'odsh_get_spatial_text': helpers_odsh.odsh_get_spatial_text, + 'odsh_render_datetime': helpers_odsh.odsh_render_datetime, + 'odsh_resource_formats': helpers_odsh.odsh_resource_formats, + 'odsh_encodeurl': helpers_odsh.odsh_encodeurl, + 'odsh_extract_error': helpers_odsh.odsh_extract_error, + 'odsh_extract_error_new': helpers_odsh.odsh_extract_error_new, + 'odsh_extract_value_from_extras': helpers_odsh.odsh_extract_value_from_extras, + 'odsh_create_checksum': helpers_odsh.odsh_create_checksum, + 'presorted_license_options': helpers_odsh.presorted_license_options, + 'odsh_has_more_facets': helpers_odsh.odsh_has_more_facets, + 'odsh_public_url': helpers_odsh.odsh_public_url, + 'odsh_spatial_extends_available': helpers_odsh.spatial_extends_available, + 'odsh_public_resource_url': helpers_odsh.odsh_public_resource_url, + 'odsh_show_testbanner': helpers_odsh.odsh_show_testbanner, + 'get_daterange_prettified': helper_pkg_dict.get_daterange_prettified, + 'get_language_of_package': helpers_odsh.get_language_of_package, + 'get_language_icon': helpers_odsh.get_language_icon, + 'short_name_for_category': helpers_odsh.short_name_for_category, + 'get_spatial_for_selection': helpers_odsh.get_spatial_for_selection, + 'get_language_for_selection': helpers_odsh.get_language_for_selection, + 'get_resource_size': helpers_odsh.get_resource_size, + 'get_address_org':helpers_odsh.get_address_org, + 'get_body_mail':helpers_odsh.get_body_mail, + 'odsh_load_mdk_sample_dataset': helpers_odsh.odsh_load_mdk_sample_dataset, + 'odsh_load_raw_mdk_sample_dataset': helpers_odsh.odsh_load_raw_mdk_sample_dataset, } @@ -349,12 +355,6 @@ class OdshPlugin(plugins.SingletonPlugin, DefaultTranslation, DefaultDatasetForm def get_validators(self): return validation.get_validators() - # Add the custom parameters to Solr's facet queries - # use several daterange queries agains temporal_start and temporal_end field - # TODO: use field of type date_range in solr index instead - def before_search(self, search_params): - return search.before_search(search_params) - scores = [['0OL'], ['0OL', '1RE'], ['0OL', '1RE', '2OF'], [ '0OL', '1RE', '2OF', '3URI'], ['0OL', '1RE', '2OF', '3URI', '4LD']]