From 33684cdcb51f6f8dc1f8af94f61bc4a314bd362e Mon Sep 17 00:00:00 2001 From: flack Date: Sun, 14 Feb 2016 13:15:41 +0000 Subject: [PATCH] Add solr4 compat --- lib/org/openpsa/documents/handler/search.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/org/openpsa/documents/handler/search.php b/lib/org/openpsa/documents/handler/search.php index e7de5983a9..b7af1f0c1c 100644 --- a/lib/org/openpsa/documents/handler/search.php +++ b/lib/org/openpsa/documents/handler/search.php @@ -40,12 +40,14 @@ public function _handler_search($handler_id, array $args, array &$data) // Add the search parameters $query = $_GET['query']; - $query .= " AND __TOPIC_URL:\"{$node[MIDCOM_NAV_FULLURL]}*\""; - $query .= " AND __COMPONENT:org.openpsa.documents"; + + $filter = new midcom_services_indexer_filter_chained; + $filter->add_filter(new midcom_services_indexer_filter_string('__TOPIC_URL', '"' . $node[MIDCOM_NAV_FULLURL] . '*"')); + $filter->add_filter(new midcom_services_indexer_filter_string('__COMPONENT', '"' . $this->_component . '"')); // TODO: Metadata support // Run the search - $this->_request_data['results'] = $indexer->query($query, null); + $this->_request_data['results'] = $indexer->query($query, $filter); } $this->add_stylesheet(MIDCOM_STATIC_URL . "/org.openpsa.documents/layout.css");