No support for indexes on multiple entity types

Hi,

I found out that the module does not currently support search indexes which hold multiple entities. Is this correct?

This is what I found out:

My setup

Versions:

• Drupal 7.39
• Apache SOLR 5.2.1
• search_api 7x-1.16
• search_api_solr 7x-1.9
• search_api_attachments 7.x-1.6
• Results are being rendered by search_api_views

I have 1 custom search index with the item type selected as "multiple types" (thus using multiple entity types). Next, under Datasource options -> Entity Types I selected "node" and 1 custom ECK entity.

For search_api_attachments I have followed the readme. I am using the SOLR extraction method, and SOLR is properly configured.
In the "Filters" tab of the index, I selected the File attachments with no special settings.

The problem

When I index, the contents of attached files are not being indexed. When I run a query in SOLR, the file contents aren't picked up either.

After some searching and debugging I found this:

In callback_attachments_settings.inc, when the entityType of the index != 'file' (my case), you start traversing the $items array at line 44. When a normal index on a single entity type is use, every item in the $items array contains the entity object (node etc.). But when using multiple entity types in you index, every item in the $items array is again an array containing information about the entity, and the first key is the entity object itself.

Because the entity is one level deeper in the $items array, the code stops in the second foreach where is says if (isset($item->$name)) { (line 46).

The solution?

I applied a quick fix to see if I would get any results. Right before the first foreach, where you start traversing the $items array in the big else{}, I added:

if ($this->index->item_type == 'multiple') {
        foreach ($items as $key => $item) {
          $items[$key] = reset($item);
        }
      }

I just move the entity object to the current $item, so that when you start looping through $items, the entity object is directly available.

I doesn't seem like the right solution, but it works for now as I'm now able to index file contents and can succesfully search within files.

Diff:

--- a/htdocs/sites/all/modules/contrib/search_api_attachments/includes/callback_attachments_settings.inc
+++ b/htdocs/sites/all/modules/contrib/search_api_attachments/includes/callback_attachments_settings.inc
@@ -41,6 +41,13 @@ class SearchApiAttachmentsAlterSettings extends SearchApiAbstractAlterCallback {
     }
     else {
       $fields = $this->getFileFields();
+
+      if ($this->index->item_type == 'multiple') {
+        foreach ($items as $key => $item) {
+          $items[$key] = reset($item);
+        }
+      }
+
       foreach ($items as $id => &$item) {
         foreach ($fields as $name => $field) {
           if (isset($item->$name)) {