materio-base-legacy/sites/all/modules/contrib/search/search_api/boosts-and-queryconditon.patch
2015-04-19 16:01:08 +02:00

40 lines
2.1 KiB
Diff

diff --git a/search_api.admin.inc b/search_api.admin.inc
index 5fbc8d8..9a5122e 100644
--- a/search_api.admin.inc
+++ b/search_api.admin.inc
@@ -1480,8 +1480,8 @@ function search_api_admin_index_fields(array $form, array &$form_state, SearchAp
$fulltext_type = array(0 => 'text');
$entity_types = entity_get_info();
$default_types = search_api_default_field_types();
- $boosts = drupal_map_assoc(array('0.1', '0.2', '0.3', '0.5', '0.8', '1.0', '2.0', '3.0', '5.0', '8.0', '13.0', '21.0'));
-
+ // $boosts = drupal_map_assoc(array('0.1', '0.2', '0.3', '0.5', '0.8', '1.0', '2.0', '3.0', '5.0', '8.0', '13.0', '21.0', '5000', '10000', '20000', '40000', '80000', '160000', '320000'));
+ $boosts = drupal_map_assoc(array('0.1', '0.2', '0.3', '0.5', '0.8', '1.0', '2.0', '3.0', '5.0', '8.0', '13.0', '21.0', '100', '1000', '1010', '1020', '1030', '1040', '1050', '1060'));
$form_state['index'] = $index;
$form['#theme'] = 'search_api_admin_fields_table';
$form['#tree'] = TRUE;
diff --git a/search_api.module b/search_api.module
index bba0681..ba27465 100644
--- a/search_api.module
+++ b/search_api.module
@@ -1444,7 +1444,7 @@ function _search_api_query_add_node_access($account, SearchApiQueryInterface $qu
$query->filter($filter);
}
else {
- $query->condition('status', NODE_PUBLISHED);
+ // $query->condition('status', NODE_PUBLISHED);
}
// Filter by node access grants.
$filter = $query->createFilter('OR');
@@ -1636,6 +1636,10 @@ function search_api_extract_fields(EntityMetadataWrapper $wrapper, array $fields
foreach ($nested as $prefix => $nested_fields) {
if (isset($wrapper->$prefix)) {
$nested_fields = search_api_extract_fields($wrapper->$prefix, $nested_fields, $value_options);
+ # http://drupal.org/node/1873910#comment-6876200
+ // $subwrapper = $wrapper->$prefix;
+ // $subwrapper->language( $wrapper->language->value() );
+ // $nested_fields = search_api_extract_fields($subwrapper, $nested_fields, $value_options);
foreach ($nested_fields as $field => $info) {
$fields["$prefix:$field"] = $info;
}