Merge pull request #181 from ezsystems/EZP-23644

Fix EZP-23644: add proper handling for hidden nodes in subtree fetches a...
ezsystems · Mar 23, 2015 · ce64d88 · ce64d88
2 parents d6f40c1 + adeb87c
commit ce64d88
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 4 deletions.
diff --git a/classes/ezfezpsolrquerybuilder.php b/classes/ezfezpsolrquerybuilder.php
@@ -180,6 +180,7 @@ public function buildSearch( $searchText, $params = array(), $searchTypes = arra
             $params['Filter'] = array( $params['Filter'] );
         }
 
+        $pathFieldName = eZSolr::getMetaFieldName( $ignoreVisibility ? 'path' : 'visible_path' );
 
 
         $filterQuery = array();
@@ -191,7 +192,7 @@ public function buildSearch( $searchText, $params = array(), $searchTypes = arra
             $subtreeQueryParts = array();
             foreach ( $subtrees as $subtreeNodeID )
             {
-                $subtreeQueryParts[] = eZSolr::getMetaFieldName( 'path' ) . ':' . $subtreeNodeID;
+                $subtreeQueryParts[] = $pathFieldName . ':' . $subtreeNodeID;
             }
 
             $filterQuery[] = implode( ' OR ', $subtreeQueryParts );
@@ -1533,6 +1534,8 @@ protected function policyLimitationFilterQuery( $limitation = null, $ignoreVisib
         $filterQuery = false;
         $policies = array();
 
+        $pathFieldName = $ignoreVisibility ? eZSolr::getMetaFieldName( 'path' ) : eZSolr::getMetaFieldName( 'visible_path' );
+
         if ( is_array( $limitation ) )
         {
             if ( empty( $limitation ) )
@@ -1606,7 +1609,7 @@ protected function policyLimitationFilterQuery( $limitation = null, $ignoreVisib
                             $pathArray = explode( '/', $pathString );
                             // we only take the last node ID in the path identification string
                             $subtreeNodeID = array_pop( $pathArray );
-                            $policyLimitationsOnLocations[] = eZSolr::getMetaFieldName( 'path' ) . ':' . $subtreeNodeID;
+                            $policyLimitationsOnLocations[] = $pathFieldName . ':' . $subtreeNodeID;
                             if ( isset( $this->searchPluginInstance->postSearchProcessingData['subtree_limitations'] ) )
                                 $this->searchPluginInstance->postSearchProcessingData['subtree_limitations'][] = $subtreeNodeID;
                             else

diff --git a/java/solr/ezp-default/conf/schema.xml b/java/solr/ezp-default/conf/schema.xml
@@ -149,7 +149,7 @@
 
     <!-- A Trie based date field for faster date range queries and date faceting. -->
     <fieldType name="tdate" class="solr.TrieDateField" omitNorms="true" precisionStep="6" positionIncrementGap="0"/>
-    
+
     <!--
       Note:
       These should only be used for compatibility with existing indexes (created with older Solr versions)
@@ -564,6 +564,11 @@
    <field name="meta_is_hidden_b" type="boolean" indexed="true" stored="true" multiValued="true"/>
    <field name="meta_is_invisible_b" type="boolean" indexed="true" stored="true" multiValued="true"/>
    <field name="meta_priority_si" type="sint" indexed="true" stored="true" multiValued="true"/>
+   <!-- denormalised fields for hidden and visible path elements -->
+   <field name="meta_visible_path_si" type="sint" indexed="true" stored="true" multiValued="true"/>     <!-- Visible Location path IDs -->
+   <field name="meta_visible_path_string_ms" type="mstring" indexed="true" stored="true" multiValued="true"/> <!-- Visible Location path string -->
+   <field name="meta_hidden_path_si" type="sint" indexed="true" stored="true" multiValued="true"/>     <!-- Hidden Location path IDs -->
+   <field name="meta_hidden_path_string_ms" type="mstring" indexed="true" stored="true" multiValued="true"/> <!-- Hidden Location path string -->
 
    <!-- Here, default is used to create a "timestamp" field indicating
         When each document was indexed.

diff --git a/search/plugins/ezsolr/ezsolr.php b/search/plugins/ezsolr/ezsolr.php
@@ -124,7 +124,11 @@ static function getMetaAttributeType( $name, $context = 'search' )
                                              'owner_name' => 'text',
                                              'owner_group_id' => 'sint',
                                              'path' => 'sint',
-                                             'object_states' => 'sint'),
+                                             'object_states' => 'sint',
+                                             'visible_path' => 'sint',
+                                             'hidden_path' => 'sint',
+                                             'visible_path_string' => 'mstring',
+                                             'hidden_path_string' => 'mstring' ),
                                       self::metaAttributes(),
                                       self::nodeAttributes() ),
                                 'facet' =>  array(
@@ -465,6 +469,11 @@ function addObject( $contentObject, $commit = true, $commitWithin = 0, $softComm
         $mainNodeID = $mainNode->attribute( 'node_id' );
         // initialize array of parent node path ids, needed for multivalued path field and subtree filters
         $nodePathArray = array();
+        // eZ Find 5.4+ expanding on nodePathArray, collect them in different visibility arrays
+        $invisibleNodePathArray = array();
+        $visibleNodePathArray = array();
+        $invisibleNodePathString = array();
+        $visibleNodePathString = array();
 
         //included in $nodePathArray
         //$pathArray = $mainNode->attribute( 'path_array' );
@@ -485,6 +494,16 @@ function addObject( $contentObject, $commit = true, $commitWithin = 0, $softComm
                                                 'fieldType' => $fieldType );
             }
             $nodePathArray[] = $contentNode->attribute( 'path_array' );
+            if ( $contentNode->attribute( 'is_hidden' ) || $contentNode->attribute( 'is_invisible' ) )
+            {
+                $invisibleNodePathArray = array_merge( $invisibleNodePathArray, $contentNode->attribute( 'path_array' ) );
+                $invisibleNodePathString[]= $contentNode->attribute( 'path_string' );
+            }
+            else
+            {
+                $visibleNodePathArray = array_merge( $visibleNodePathArray, $contentNode->attribute( 'path_array' ) );
+                $visibleNodePathString[] = $contentNode->attribute( 'path_string' );
+            }
 
         }
 
@@ -628,6 +647,12 @@ function addObject( $contentObject, $commit = true, $commitWithin = 0, $softComm
                 $doc->addField( 'meta_main_path_element_' . $key . '_si', $pathNodeID );
 
             }
+            // Since eZ Find 5.4
+
+            $doc->addField( ezfSolrDocumentFieldBase::generateMetaFieldName( 'visible_path' ), $visibleNodePathArray );
+            $doc->addField( ezfSolrDocumentFieldBase::generateMetaFieldName( 'visible_path_string' ), $visibleNodePathString );
+            $doc->addField( ezfSolrDocumentFieldBase::generateMetaFieldName( 'hidden_path' ), $invisibleNodePathArray );
+            $doc->addField( ezfSolrDocumentFieldBase::generateMetaFieldName( 'hidden_path_string' ), $invisibleNodePathString );
 
             eZContentObject::recursionProtectionStart();