Made compatible with Omeka 2.

Daniel-KM · Nov 17, 2019 · a901575 · a901575
1 parent a7ea6e5
commit a901575
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 12 deletions.
diff --git a/config/module.ini b/config/module.ini
@@ -8,5 +8,5 @@ author_link  = "https://github.com/biblibre"
 module_link  = "https://github.com/biblibre/omeka-s-module-Solr"
 support_link = "https://github.com/biblibre/omeka-s-module-Solr/issues"
 configurable = false
-version      = "3.5.10"
-omeka_version_constraint = "^1.2.0"
+version      = "3.5.10.1"
+omeka_version_constraint = "^1.2.0 || ^2.0.0"
diff --git a/src/Api/Adapter/SolrMappingAdapter.php b/src/Api/Adapter/SolrMappingAdapter.php
@@ -78,22 +78,25 @@ public function hydrate(Request $request, EntityInterface $entity,
 
     public function buildQuery(QueryBuilder $qb, array $query)
     {
+        $isOldOmeka = \Omeka\Module::VERSION < 2;
+        $alias = $isOldOmeka ? $this->getEntityClass() : 'omeka_root';
         $expr = $qb->expr();
 
         if (isset($query['solr_node_id'])) {
-            $alias = $this->createAlias();
-            $qb->innerJoin(
-                $this->getEntityClass() . '.solrNode',
-                $alias
-            );
-            $qb->andWhere($expr->eq(
-                $alias . '.id',
-                $this->createNamedParameter($qb, $query['solr_node_id']))
-            );
+            $nodeAlias = $this->createAlias();
+            $qb
+                ->innerJoin(
+                    $alias . '.solrNode',
+                    $nodeAlias
+                )
+                ->andWhere($expr->eq(
+                    $nodeAlias . '.id',
+                    $this->createNamedParameter($qb, $query['solr_node_id']))
+                );
         }
         if (isset($query['resource_name'])) {
             $qb->andWhere($expr->eq(
-                $this->getEntityClass() . '.resourceName',
+                $alias . '.resourceName',
                 $this->createNamedParameter($qb, $query['resource_name'])
             ));
         }