From 0b6e0c10cbe621def83330722c3be02bfa4127f6 Mon Sep 17 00:00:00 2001 From: Bachir Soussi Chiadmi Date: Wed, 2 Mar 2016 10:15:50 +0100 Subject: [PATCH] updated search feature --- PATCH_LIST.txt | 5 +- .../materio_search.features.inc | 354 ++++++------------ .../materio_search/materio_search.info | 2 - 3 files changed, 111 insertions(+), 250 deletions(-) diff --git a/PATCH_LIST.txt b/PATCH_LIST.txt index 8e4ef0f1..826fc9ef 100644 --- a/PATCH_LIST.txt +++ b/PATCH_LIST.txt @@ -17,9 +17,9 @@ feedback filter_path_alias flag_lists //nodeformcols -search_api +//search_api search_api_page -search_api_solr +//search_api_solr termreferencetree views wysiwyg @@ -27,4 +27,3 @@ views_rss_media node_export : - https://www.drupal.org/node/1869918 - https://www.drupal.org/node/1911638 - diff --git a/sites/all/modules/features/materio_search/materio_search.features.inc b/sites/all/modules/features/materio_search/materio_search.features.inc index 7aba96b0..02408de1 100644 --- a/sites/all/modules/features/materio_search/materio_search.features.inc +++ b/sites/all/modules/features/materio_search/materio_search.features.inc @@ -29,18 +29,18 @@ function materio_search_default_search_api_index() { "cron_limit" : "50", "entity_translation_language" : "en", "fields" : { - "type" : { "type" : "string" }, - "title" : { "type" : "text" }, - "status" : { "type" : "boolean" }, "author" : { "type" : "integer", "entity_type" : "user" }, - "title_field" : { "type" : "text" }, - "search_api_language" : { "type" : "string" }, - "search_api_access_node" : { "type" : "list\\u003Cstring\\u003E" }, "body:value" : { "type" : "text" }, - "field_tags_libres:synonyms_synonym" : { "type" : "list\\u003Clist\\u003Ctext\\u003E\\u003E", "boost" : "5000" }, - "field_tags_libres:name_field" : { "type" : "list\\u003Ctext\\u003E", "boost" : "5000" }, - "field_onthologie:synonyms_synonym" : { "type" : "list\\u003Clist\\u003Ctext\\u003E\\u003E", "boost" : "10000" }, - "field_onthologie:name_field" : { "type" : "list\\u003Ctext\\u003E", "boost" : "10000" } + "field_onthologie:name_field" : { "type" : "list\\u003Ctext\\u003E", "boost" : "0.0" }, + "field_onthologie:synonyms_synonym" : { "type" : "list\\u003Clist\\u003Ctext\\u003E\\u003E", "boost" : "0.0" }, + "field_tags_libres:name_field" : { "type" : "list\\u003Ctext\\u003E", "boost" : "0.0" }, + "field_tags_libres:synonyms_synonym" : { "type" : "list\\u003Clist\\u003Ctext\\u003E\\u003E", "boost" : "0.0" }, + "search_api_access_node" : { "type" : "list\\u003Cstring\\u003E" }, + "search_api_language" : { "type" : "string" }, + "status" : { "type" : "boolean" }, + "title" : { "type" : "text" }, + "title_field" : { "type" : "text" }, + "type" : { "type" : "string" } }, "data_alter_callbacks" : { "search_api_alter_bundle_filter" : { @@ -110,18 +110,18 @@ function materio_search_default_search_api_index() { "cron_limit" : "50", "entity_translation_language" : "fr", "fields" : { - "type" : { "type" : "string" }, - "title" : { "type" : "text" }, - "status" : { "type" : "boolean" }, "author" : { "type" : "integer", "entity_type" : "user" }, - "title_field" : { "type" : "text" }, - "search_api_language" : { "type" : "string" }, - "search_api_access_node" : { "type" : "list\\u003Cstring\\u003E" }, "body:value" : { "type" : "text" }, - "field_tags_libres:synonyms_synonym" : { "type" : "list\\u003Clist\\u003Ctext\\u003E\\u003E", "boost" : "5000" }, - "field_tags_libres:name_field" : { "type" : "list\\u003Ctext\\u003E", "boost" : "5000" }, - "field_onthologie:synonyms_synonym" : { "type" : "list\\u003Clist\\u003Ctext\\u003E\\u003E", "boost" : "10000" }, - "field_onthologie:name_field" : { "type" : "list\\u003Ctext\\u003E", "boost" : "10000" } + "field_onthologie:name_field" : { "type" : "list\\u003Ctext\\u003E", "boost" : "0.0" }, + "field_onthologie:synonyms_synonym" : { "type" : "list\\u003Clist\\u003Ctext\\u003E\\u003E", "boost" : "0.0" }, + "field_tags_libres:name_field" : { "type" : "list\\u003Ctext\\u003E", "boost" : "0.0" }, + "field_tags_libres:synonyms_synonym" : { "type" : "list\\u003Clist\\u003Ctext\\u003E\\u003E", "boost" : "0.0" }, + "search_api_access_node" : { "type" : "list\\u003Cstring\\u003E" }, + "search_api_language" : { "type" : "string" }, + "status" : { "type" : "boolean" }, + "title" : { "type" : "text" }, + "title_field" : { "type" : "text" }, + "type" : { "type" : "string" } }, "data_alter_callbacks" : { "search_api_alter_bundle_filter" : { @@ -180,126 +180,6 @@ function materio_search_default_search_api_index() { "enabled" : "1", "read_only" : "0" }'); - $items['materiaux_breves'] = entity_import('search_api_index', '{ - "name" : "Materiaux Breves", - "machine_name" : "materiaux_breves", - "description" : null, - "server" : null, - "item_type" : "node", - "options" : { - "index_directly" : 0, - "cron_limit" : "25", - "fields" : { - "type" : { "type" : "text", "boost" : "0.3" }, - "title" : { "type" : "text" }, - "status" : { "type" : "boolean" }, - "author" : { "type" : "integer", "entity_type" : "user" }, - "field_nature_titre" : { "type" : "text" }, - "title_field" : { "type" : "text" }, - "field_reference_materio" : { "type" : "text" }, - "search_api_language" : { "type" : "string" }, - "search_api_access_node" : { "type" : "list\\u003Cstring\\u003E" }, - "field_description:value" : { "type" : "text", "boost" : "0.3" }, - "field_tags_libres:name" : { "type" : "list\\u003Ctext\\u003E", "boost" : "2.0" }, - "field_tags_libres:description" : { "type" : "list\\u003Ctext\\u003E", "boost" : "2.0" }, - "field_tags_libres:synonyms_synonym" : { "type" : "list\\u003Clist\\u003Ctext\\u003E\\u003E", "boost" : "2.0" }, - "field_onthologie:name" : { "type" : "list\\u003Ctext\\u003E", "boost" : "2.0" }, - "field_onthologie:description" : { "type" : "list\\u003Ctext\\u003E", "boost" : "2.0" }, - "field_onthologie:synonyms_synonym" : { "type" : "list\\u003Clist\\u003Ctext\\u003E\\u003E", "boost" : "2.0" }, - "field_company_fab:name" : { "type" : "list\\u003Ctext\\u003E", "boost" : "0.3" }, - "field_company_fab:description" : { "type" : "list\\u003Ctext\\u003E", "boost" : "0.3" }, - "field_company_fab:synonyms_synonym" : { "type" : "list\\u003Clist\\u003Ctext\\u003E\\u003E", "boost" : "3.0" }, - "field_company_distrib:name" : { "type" : "list\\u003Ctext\\u003E", "boost" : "0.3" }, - "field_company_distrib:description" : { "type" : "list\\u003Ctext\\u003E", "boost" : "0.3" }, - "field_company_distrib:synonyms_synonym" : { "type" : "list\\u003Clist\\u003Ctext\\u003E\\u003E", "boost" : "0.3" }, - "field_materiau_ref:title" : { "type" : "list\\u003Ctext\\u003E", "boost" : "0.3" }, - "field_materiau_ref:status" : { "type" : "list\\u003Cinteger\\u003E" }, - "field_materiau_ref:field_tags_libres" : { - "type" : "list\\u003Clist\\u003Cinteger\\u003E\\u003E", - "entity_type" : "taxonomy_term" - }, - "field_materiau_ref:field_onthologie" : { - "type" : "list\\u003Clist\\u003Cinteger\\u003E\\u003E", - "entity_type" : "taxonomy_term" - }, - "field_infos_from_company:value" : { "type" : "text", "boost" : "0.3" } - }, - "data_alter_callbacks" : { - "search_api_alter_bundle_filter" : { - "status" : 1, - "weight" : "-50", - "settings" : { - "default" : "0", - "bundles" : { "breve" : "breve", "materiau" : "materiau" } - } - }, - "search_api_alter_node_access" : { "status" : 1, "weight" : "-49", "settings" : [] }, - "search_api_alter_language_control" : { - "status" : 0, - "weight" : "-48", - "settings" : { "lang_field" : "", "languages" : [] } - }, - "search_api_alter_add_hierarchy" : { "status" : 0, "weight" : "-47", "settings" : { "fields" : [] } }, - "search_api_alter_add_viewed_entity" : { "status" : 0, "weight" : "-46", "settings" : { "mode" : "full" } }, - "search_api_alter_add_url" : { "status" : 0, "weight" : "-45", "settings" : [] }, - "search_api_alter_add_aggregation" : { "status" : 0, "weight" : "-44", "settings" : [] }, - "search_api_alter_node_status" : { "status" : 0, "weight" : "-43", "settings" : [] } - }, - "processors" : { - "search_api_case_ignore" : { - "status" : 1, - "weight" : "0", - "settings" : { "fields" : { - "title" : true, - "title_field" : true, - "field_reference_materio" : true, - "field_tags_libres:name" : true - } - } - }, - "search_api_html_filter" : { - "status" : 1, - "weight" : "10", - "settings" : { - "fields" : { "title" : true, "title_field" : true, "field_reference_materio" : true }, - "title" : 0, - "alt" : 1, - "tags" : "h1 = 5\\r\\nh2 = 3\\r\\nh3 = 2\\r\\nstrong = 2\\r\\nb = 2\\r\\nem = 1.5\\r\\nu = 1.5" - } - }, - "search_api_tokenizer" : { - "status" : 0, - "weight" : "20", - "settings" : { - "fields" : { - "title" : true, - "title_field" : true, - "field_reference_materio" : true, - "field_tags_libres:name" : true - }, - "spaces" : "[^[:alnum:]]", - "ignorable" : "[\\u0027]" - } - }, - "search_api_stopwords" : { - "status" : 0, - "weight" : "30", - "settings" : { - "fields" : { - "title" : true, - "title_field" : true, - "field_reference_materio" : true, - "field_tags_libres:name" : true - }, - "file" : "", - "stopwords" : "but\\r\\ndid\\r\\nthe this that those\\r\\netc" - } - } - } - }, - "enabled" : "0", - "read_only" : "0" - }'); $items['materiaux_breves_en'] = entity_import('search_api_index', '{ "name" : "Materiaux Breves EN", "machine_name" : "materiaux_breves_en", @@ -311,25 +191,25 @@ function materio_search_default_search_api_index() { "cron_limit" : "50", "entity_translation_language" : "en", "fields" : { - "nid" : { "type" : "integer" }, - "type" : { "type" : "string" }, - "status" : { "type" : "boolean" }, "author" : { "type" : "integer", "entity_type" : "user" }, + "body:value" : { "type" : "text" }, + "field_description:value" : { "type" : "text" }, + "field_nature_titre" : { "type" : "text", "boost" : "0.3" }, + "field_reference_materio" : { "type" : "text", "boost" : "0.3" }, + "materio_search_api_node_propertie_companie" : { "type" : "list\\u003Ctext\\u003E" }, "materio_search_api_onthologie_term_1_text" : { "type" : "text", "boost" : "13.0" }, "materio_search_api_onthologie_term_2_text" : { "type" : "text", "boost" : "8.0" }, "materio_search_api_onthologie_term_3_text" : { "type" : "text", "boost" : "5.0" }, "materio_search_api_onthologie_term_4_text" : { "type" : "text", "boost" : "3.0" }, "materio_search_api_onthologie_term_5_text" : { "type" : "text", "boost" : "2.0" }, "materio_search_api_onthologie_term_others_text" : { "type" : "list\\u003Ctext\\u003E" }, - "materio_search_api_taglibres_text" : { "type" : "list\\u003Ctext\\u003E", "boost" : "100" }, - "title_field" : { "type" : "text", "boost" : "3.0" }, - "field_nature_titre" : { "type" : "text", "boost" : "0.3" }, - "field_reference_materio" : { "type" : "text", "boost" : "0.3" }, - "materio_search_api_node_propertie_companie" : { "type" : "list\\u003Ctext\\u003E" }, - "search_api_language" : { "type" : "string" }, + "materio_search_api_taglibres_text" : { "type" : "list\\u003Ctext\\u003E", "boost" : "0.0" }, + "nid" : { "type" : "integer" }, "search_api_access_node" : { "type" : "list\\u003Cstring\\u003E" }, - "body:value" : { "type" : "text" }, - "field_description:value" : { "type" : "text" } + "search_api_language" : { "type" : "string" }, + "status" : { "type" : "boolean" }, + "title_field" : { "type" : "text", "boost" : "3.0" }, + "type" : { "type" : "string" } }, "data_alter_callbacks" : { "search_api_alter_bundle_filter" : { @@ -474,81 +354,8 @@ function materio_search_default_search_api_index() { "enabled" : "1", "read_only" : "0" }'); - $items['referencement'] = entity_import('search_api_index', '{ - "name" : "R\\u00e9f\\u00e9rencement", - "machine_name" : "referencement", - "description" : null, - "server" : null, - "item_type" : "taxonomy_term", - "options" : { - "index_directly" : 0, - "cron_limit" : "1000", - "fields" : { - "description" : { "type" : "text" }, - "synonyms_synonym" : { "type" : "list\\u003Ctext\\u003E" }, - "name_field" : { "type" : "text" }, - "search_api_language" : { "type" : "string" } - }, - "data_alter_callbacks" : { - "search_api_alter_bundle_filter" : { - "status" : 1, - "weight" : "-10", - "settings" : { - "default" : "0", - "bundles" : { "onthologie" : "onthologie", "tag_libres" : "tag_libres" } - } - }, - "search_api_alter_language_control" : { - "status" : 0, - "weight" : "0", - "settings" : { "lang_field" : "", "languages" : [] } - }, - "search_api_alter_add_hierarchy" : { "status" : 0, "weight" : "0", "settings" : { "fields" : [] } }, - "search_api_alter_add_aggregation" : { "status" : 1, "weight" : "0", "settings" : [] }, - "search_api_alter_add_url" : { "status" : 0, "weight" : "0", "settings" : [] }, - "search_api_alter_add_viewed_entity" : { "status" : 0, "weight" : "0", "settings" : { "mode" : "full" } } - }, - "processors" : { - "search_api_case_ignore" : { - "status" : 1, - "weight" : "0", - "settings" : { "fields" : { "name" : true, "parent" : true, "synonyms_synonym" : true } } - }, - "search_api_html_filter" : { - "status" : 0, - "weight" : "10", - "settings" : { - "fields" : { "name" : true, "synonyms_synonym" : true, "vocabulary:name" : true }, - "title" : 0, - "alt" : 1, - "tags" : "h1 = 5\\r\\nh2 = 3\\r\\nh3 = 2\\r\\nstrong = 2\\r\\nb = 2\\r\\nem = 1.5\\r\\nu = 1.5" - } - }, - "search_api_tokenizer" : { - "status" : 0, - "weight" : "20", - "settings" : { - "fields" : { "name" : true, "synonyms_synonym" : true, "vocabulary:name" : true }, - "spaces" : "[^[:alnum:]]", - "ignorable" : "[\\u0027]" - } - }, - "search_api_stopwords" : { - "status" : 0, - "weight" : "30", - "settings" : { - "fields" : { "name" : true, "synonyms_synonym" : true, "vocabulary:name" : true }, - "file" : "", - "stopwords" : "but\\r\\ndid\\r\\nthe this that those\\r\\netc" - } - } - } - }, - "enabled" : "0", - "read_only" : "0" - }'); $items['referencement_en'] = entity_import('search_api_index', '{ - "name" : "r\\u00e9f\\u00e9rencement en", + "name" : "Autocomplet EN", "machine_name" : "referencement_en", "description" : null, "server" : "materio_solr3_en", @@ -558,13 +365,18 @@ function materio_search_default_search_api_index() { "cron_limit" : "50", "entity_translation_language" : "en", "fields" : { - "description" : { "type" : "text", "boost" : "0.3" }, - "synonyms_synonym" : { + "materio_search_api_term_property_dup_name" : { "type" : "text", "real_type" : "edge_n2_kw_text" }, + "name" : { "type" : "text", "real_type" : "edge_n2_kw_text" }, + "name_field" : { "type" : "text", "real_type" : "edge_n2_kw_text" }, + "search_api_language" : { "type" : "string" }, + "synonyms" : { "type" : "list\\u003Ctext\\u003E", "real_type" : "list\\u003Cedge_n2_kw_text\\u003E" }, - "name_field" : { "type" : "text", "real_type" : "edge_n2_kw_text" }, - "search_api_language" : { "type" : "string" } + "synonyms_synonym" : { + "type" : "list\\u003Ctext\\u003E", + "real_type" : "list\\u003Cedge_n2_kw_text\\u003E" + } }, "data_alter_callbacks" : { "search_api_alter_bundle_filter" : { @@ -572,7 +384,7 @@ function materio_search_default_search_api_index() { "weight" : "-10", "settings" : { "default" : "0", - "bundles" : { "onthologie" : "onthologie", "tag_libres" : "tag_libres" } + "bundles" : { "tag_libres" : "tag_libres", "onthologie" : "onthologie" } } }, "search_api_alter_language_control" : { @@ -586,38 +398,59 @@ function materio_search_default_search_api_index() { "search_api_alter_add_viewed_entity" : { "status" : 0, "weight" : "0", "settings" : { "mode" : "full" } } }, "processors" : { + "content_taxonomy_autocomplete_moderated_terms" : { "status" : 0, "weight" : "0", "settings" : { "fields" : [] } }, "search_api_case_ignore" : { "status" : 1, "weight" : "0", - "settings" : { "fields" : { "description" : true, "synonyms_synonym" : true, "name_field" : true } } + "settings" : { "fields" : { "synonyms_synonym" : true, "name_field" : true } } }, "search_api_html_filter" : { "status" : 0, "weight" : "10", "settings" : { - "fields" : { "description" : true, "synonyms_synonym" : true, "name_field" : true }, + "fields" : { "synonyms_synonym" : true, "name_field" : true }, "title" : 0, "alt" : 1, "tags" : "h1 = 5\\r\\nh2 = 3\\r\\nh3 = 2\\r\\nstrong = 2\\r\\nb = 2\\r\\nem = 1.5\\r\\nu = 1.5" } }, + "search_api_transliteration" : { + "status" : 0, + "weight" : "15", + "settings" : { "fields" : { + "name" : true, + "synonyms" : true, + "materio_search_api_term_property_dup_name" : true, + "synonyms_synonym" : true, + "name_field" : true + } + } + }, "search_api_tokenizer" : { "status" : 0, "weight" : "20", - "settings" : { - "fields" : { "description" : true, "synonyms_synonym" : true, "name_field" : true }, - "spaces" : "[^[:alnum:]]", - "ignorable" : "[\\u0027]" - } + "settings" : { "fields" : [], "spaces" : "[^[:alnum:]]", "ignorable" : "[\\u0027]" } }, "search_api_stopwords" : { "status" : 0, "weight" : "30", "settings" : { - "fields" : { "description" : true, "synonyms_synonym" : true, "name_field" : true }, + "fields" : { "synonyms_synonym" : true, "name_field" : true }, "file" : "", "stopwords" : "but\\r\\ndid\\r\\nthe this that those\\r\\netc" } + }, + "search_api_highlighting" : { + "status" : 0, + "weight" : "35", + "settings" : { + "prefix" : "\\u003Cstrong\\u003E", + "suffix" : "\\u003C\\/strong\\u003E", + "excerpt" : 1, + "excerpt_length" : "256", + "exclude_fields" : [], + "highlight" : "always" + } } } }, @@ -625,7 +458,7 @@ function materio_search_default_search_api_index() { "read_only" : "0" }'); $items['referencement_fr'] = entity_import('search_api_index', '{ - "name" : "r\\u00e9f\\u00e9rencement fr", + "name" : "Autocomplet FR", "machine_name" : "referencement_fr", "description" : null, "server" : "materio_solr3_fr", @@ -637,12 +470,13 @@ function materio_search_default_search_api_index() { "fields" : { "description" : { "type" : "text", "boost" : "0.3" }, "materio_search_api_term_property_dup_name" : { "type" : "text", "real_type" : "edge_n2_kw_mapped_text" }, + "name" : { "type" : "text" }, + "name_field" : { "type" : "text", "real_type" : "edge_n2_kw_text" }, + "search_api_language" : { "type" : "string" }, "synonyms_synonym" : { "type" : "list\\u003Ctext\\u003E", "real_type" : "list\\u003Cedge_n2_kw_text\\u003E" - }, - "name_field" : { "type" : "text", "real_type" : "edge_n2_kw_text" }, - "search_api_language" : { "type" : "string" } + } }, "data_alter_callbacks" : { "search_api_alter_bundle_filter" : { @@ -650,7 +484,7 @@ function materio_search_default_search_api_index() { "weight" : "-10", "settings" : { "default" : "0", - "bundles" : { "onthologie" : "onthologie", "tag_libres" : "tag_libres" } + "bundles" : { "tag_libres" : "tag_libres", "onthologie" : "onthologie" } } }, "search_api_alter_language_control" : { @@ -664,10 +498,17 @@ function materio_search_default_search_api_index() { "search_api_alter_add_viewed_entity" : { "status" : 0, "weight" : "0", "settings" : { "mode" : "full" } } }, "processors" : { + "content_taxonomy_autocomplete_moderated_terms" : { "status" : 0, "weight" : "0", "settings" : { "fields" : [] } }, "search_api_case_ignore" : { "status" : 1, "weight" : "0", - "settings" : { "fields" : { "description" : true, "synonyms_synonym" : true, "name_field" : true } } + "settings" : { "fields" : { + "description" : true, + "materio_search_api_term_property_dup_name" : true, + "synonyms_synonym" : true, + "name_field" : true + } + } }, "search_api_html_filter" : { "status" : 0, @@ -679,11 +520,22 @@ function materio_search_default_search_api_index() { "tags" : "h1 = 5\\r\\nh2 = 3\\r\\nh3 = 2\\r\\nstrong = 2\\r\\nb = 2\\r\\nem = 1.5\\r\\nu = 1.5" } }, + "search_api_transliteration" : { + "status" : 0, + "weight" : "15", + "settings" : { "fields" : { + "description" : true, + "materio_search_api_term_property_dup_name" : true, + "synonyms_synonym" : true, + "name_field" : true + } + } + }, "search_api_tokenizer" : { "status" : 0, "weight" : "20", "settings" : { - "fields" : { "description" : true, "synonyms_synonym" : true, "name_field" : true }, + "fields" : { "description" : true }, "spaces" : "[^[:alnum:]]", "ignorable" : "[\\u0027]" } @@ -696,6 +548,18 @@ function materio_search_default_search_api_index() { "file" : "", "stopwords" : "but\\r\\ndid\\r\\nthe this that those\\r\\netc" } + }, + "search_api_highlighting" : { + "status" : 0, + "weight" : "35", + "settings" : { + "prefix" : "\\u003Cstrong\\u003E", + "suffix" : "\\u003C\\/strong\\u003E", + "excerpt" : 1, + "excerpt_length" : "256", + "exclude_fields" : [], + "highlight" : "always" + } } } }, diff --git a/sites/all/modules/features/materio_search/materio_search.info b/sites/all/modules/features/materio_search/materio_search.info index d98b2025..82906c28 100644 --- a/sites/all/modules/features/materio_search/materio_search.info +++ b/sites/all/modules/features/materio_search/materio_search.info @@ -19,10 +19,8 @@ features[features_api][] = api:2 features[rules_config][] = rules_update_node_on_term_save features[search_api_index][] = breves_en features[search_api_index][] = breves_fr -features[search_api_index][] = materiaux_breves features[search_api_index][] = materiaux_breves_en features[search_api_index][] = materiaux_breves_fr -features[search_api_index][] = referencement features[search_api_index][] = referencement_en features[search_api_index][] = referencement_fr features[user_permission][] = access to materio database