Fixing issue 2192625.

Author: bec

modules/elasticsearch_connector_search_api/elasticsearch_connector_search_api.install

@@ -30,3 +30,37 @@ function elasticsearch_connector_search_api_uninstall() {
       ->execute();
   }
 }
+
+/**
+ * Update Search API servers and indexes that use ElasticSearch.
+ */
+function elasticsearch_connector_search_api_update_7001() {
+  if (!function_exists('search_api_server_load_multiple')) {
+    return t('No Search API servers to update.');
+  }
+
+  $servers = search_api_server_load_multiple(FALSE);
+  $indexes = search_api_index_load_multiple(FALSE);
+
+  foreach ($indexes as $index) {
+    // If the index uses a server with our service class, then the server
+    // configuration needs to be updated.
+    if ($index->server && $servers[$index->server]->class == 'search_api_elasticsearch_connector') {
+      // Duplicate the old method of setting the ElasticSearch index name:
+      // concatenate the database name and the index machine name with a set
+      // prefix.
+      global $databases;
+      $site_database = $databases['default']['default']['database'];
+      $cluster_index_name = preg_replace('/[^A-Za-z0-9_]+/', '', 'elasticsearch_index_' . $site_database . '_' . $index->machine_name);
+
+      // If the server's cluster index name isn't set yet, update it.
+      if (empty($index->options['index_name'])) {
+        $server->options['cluster_index_name'] = $cluster_index_name;
+        $index->options['index_name'] = $cluster_index_name;
+        $index->save();
+      }
+    }
+  }
+
+  return t('Updated Search API servers and indexes that use ElasticSearch. You may need to re-export Search API configuration features.');
+}

modules/elasticsearch_connector_search_api/elasticsearch_connector_search_api.module

@@ -151,9 +151,12 @@ function elasticsearch_connector_search_api_get_server_id_by_name($server_machin
  * @param array $default_values
  */
 function elasticsearch_connector_search_api_return_form_options(&$form, &$form_state, $default_values = array(), $flag) {
+  global $databases;
+
   $default_options = $default_values + array(
     'number_of_shards' => 1,
     'number_of_replicas' => 0,
+    'index_name' => $databases['default']['default']['database']
   );
 
   $form['options']['number_of_shards'] = array(
@@ -169,6 +172,22 @@ function elasticsearch_connector_search_api_return_form_options(&$form, &$form_s
     '#size' => 4,
     '#title' => t('Number of replicas'),
   );
+
+  $form['options']['index_name'] = array(
+    '#type' => 'textfield',
+    '#title' => t('Index name'),
+    '#required' => TRUE,
+    '#element_validate' => array('elasticsearch_connector_search_api_index_name_validate'),
+    '#default_value' => $default_options['index_name'],
+    '#description' => t('The name of the ElasticSearch index to use. If this index does not already exist, it will be created.'),
+  );
+}
+
+function elasticsearch_connector_search_api_index_name_validate($element, &$form_state, $form) {
+  // Make sure the index name contains appropriate characters.
+  if (!preg_match('/^[a-z][a-z0-9_]*$/i', $element['#value'])) {
+    form_error($element, t('Enter an index name that begins with a letter and contains only letters, numbers, and underscores.'));
+  }
 }
 
 /**

modules/elasticsearch_connector_search_api/service.inc

@@ -726,21 +726,8 @@ class SearchApiElasticsearchConnector extends SearchApiAbstractService {
    */
   public function getIndexName(SearchApiIndex $index) {
     global $databases;
-
     $site_database = $databases['default']['default']['database'];
-
-    $index_machine_name = is_string($index) ? $index : $index->machine_name;
-
-    return self::escapeName('elasticsearch_index_' . $site_database . '_' . $index_machine_name);
-  }
-
-  /**
-   * Helper function. Escape a field or index name.
-   *
-   * Force names to be strictly alphanumeric-plus-underscore.
-   */
-  public static function escapeName($name) {
-    return preg_replace('/[^A-Za-z0-9_]+/', '', $name);
+    return !empty($index->options['index_name']) ? $index->options['index_name'] : $site_database;
   }
 
   /**