palantirnet · froboy · Sep 19, 2018 · Aug 6, 2018 · Aug 6, 2018 · Aug 14, 2018
diff --git a/README.md b/README.md
@@ -4,9 +4,10 @@ This module facilitates indexing data from multiple Drupal sites into a single S
 
 On each site included in the federated search, you will need to:
 
-1. Install this module
-2. Configure a Search API server to connect to the shared Solr index
-3. Configure a Search API index according to the [recommended schema](docs/federated_schema.md)
+1. Install Fields Search API Module
+2. Install this module
+3. Configure a Search API server to connect to the shared Solr index
+4. Configure a Search API index according to the [recommended schema](docs/federated_schema.md)
 
 In order to display results from the Solr index:
 
@@ -26,7 +27,6 @@ When changes to [federated-search-react](https://github.com/palantirnet/federate
 
 ## More information
 
-* [How to use this module](docs/usage.md)
 * [How to configure a Search API Index for federated search](docs/federated_schema.md)
 * [How to theme the ReactJS search app](docs/theme.md)
 * [How to add the search form block](docs/block.md)
diff --git a/composer.json b/composer.json
@@ -9,11 +9,16 @@
     {
       "type": "composer",
       "url": "https://packages.drupal.org/8"
+    },
+    {
+      "type": "vcs",
+      "url": "https://github.com/palantirnet/search_api_field_map.git"
     }
   ],
   "require": {
     "drupal/core": "^8.0",
     "drupal/search_api_solr": "^1.2",
-    "drupal/token": "^1.1"
+    "drupal/token": "^1.1",
+    "palantirnet/search_api_field_map": "dev-master"
   }
 }
diff --git a/docs/images/add_federated_field.png b/docs/images/add_federated_field.png
diff --git a/docs/images/add_federated_field_save_settings_2.png b/docs/images/add_federated_field_save_settings_2.png
diff --git a/docs/images/add_federated_field_settings_save.png b/docs/images/add_federated_field_settings_save.png
diff --git a/docs/images/add_federated_term_field_label.png b/docs/images/add_federated_term_field_label.png
diff --git a/docs/images/add_federated_term_to_term.png b/docs/images/add_federated_term_to_term.png
diff --git a/docs/images/add_federated_terms.png b/docs/images/add_federated_terms.png
diff --git a/docs/images/add_federated_terms_to_vocabulary.png b/docs/images/add_federated_terms_to_vocabulary.png
diff --git a/docs/images/confirmation_added_federated_terms.png b/docs/images/confirmation_added_federated_terms.png
diff --git a/docs/images/edit_federated_field.png b/docs/images/edit_federated_field.png
diff --git a/docs/images/save_index_field_config.png b/docs/images/save_index_field_config.png
diff --git a/docs/usage.md b/docs/usage.md
diff --git a/search_api_federated_solr.info.yml b/search_api_federated_solr.info.yml
@@ -4,6 +4,7 @@ description: Allows indexing multiple Drupal sites into a single Solr search ind
 core: 8.x
 package: Search
 dependencies:
+  - search_api_field_map
   - search_api_solr
   - token
   - field
diff --git a/search_api_federated_solr.module b/search_api_federated_solr.module
@@ -88,10 +88,10 @@ function search_api_federated_solr_search_api_solr_field_mapping_alter(\Drupal\s
       $fields[$key] = $singleFieldsMap[$key];
     }
 
-    // Map all "federated_field" property fields to their single value in solr.
+    // Map all "mapped_field" property fields to their single value in solr.
     $field = $index->getField($key);
-    if (method_exists($field,'getPropertyPath') && 'federated_field' == $field->getPropertyPath()) {
-      $fields[$key] = str_replace("m_federated_","s_federated_", $fields[$key]);
+    if (method_exists($field,'getPropertyPath') && 'mapped_field' == $field->getPropertyPath()) {
+      $fields[$key] = preg_replace("/^(\w)m_/","$1s_", $fields[$key], 1);
     }
   };
 }

diff --git a/src/Plugin/search_api/processor/FederatedFields.php b/src/Plugin/search_api/processor/FederatedFields.php
diff --git a/src/Plugin/search_api/processor/Property/FederatedFieldProperty.php b/src/Plugin/search_api/processor/Property/FederatedFieldProperty.php
diff --git a/src/Plugin/search_api/processor/Property/SiteNameProperty.php b/src/Plugin/search_api/processor/Property/SiteNameProperty.php