Changeset adc28f6

Timestamp:

08/31/10 16:44:59 (21 months ago)

Author:

Benoit Grégoire <benoitg@…>

Branches:

('master', '8434b8322dd6f8ff37c17bd45b94e7a826f86b53')('vitrine', 'afe109c61a407808bd54d88bcccb1cde726a010a')

Children:

f2cb64b2836c21c04a38954812e396eab23b9017

Parents:

f0daea643ebbade00cd85a4698420c4d1894a697

git-author:

Benoit Grégoire <benoitg@coeus.ca>2010-08-31 16:44:59-04:00

git-committer:

Benoit Grégoire <benoitg@coeus.ca>2010-08-31 16:44:59-04:00

Message:

Fix destToSource joins being ignored

File:

• html/classes/SearchEngine.php (modified) (8 diffs)

html/classes/SearchEngine.php

@@ -620 +620 @@
             $finalJoinTable = $finalTable;
             $sql .= " vocabulary_terms AS {$finalTable} \n";
-                        $sql .= " JOIN vocabulary_terms AS {$initialLeftTable} \n";
-                       // $sql .= " JOIN vocabulary_terms AS {$finalJoinTable} \n";
+            $sql .= " JOIN vocabulary_terms AS {$initialLeftTable} \n";
+            // $sql .= " JOIN vocabulary_terms AS {$finalJoinTable} \n";
         }
         if($navLevel>1) {
@@ -647 +647 @@
         $joinCondArray=array();
         //navigableSourceToDest
-        $joinBackwards?$sourceToDestTypes=$navigableRelationships['navigableSourceToDest']:$sourceToDestTypes=$navigableRelationships['navigableSourceToDest'];
+        $joinBackwards?$sourceToDestTypes=$navigableRelationships['navigableDestToSource']:$sourceToDestTypes=$navigableRelationships['navigableSourceToDest'];
         if(count($sourceToDestTypes)>0){
             $tmpSql = null;
@@ -655 +655 @@
 
             $internaljoinCondArray = array();
-            
+
             foreach($sourceToDestTypes as $relationshipType) {
                 $internaljoinCondArray[] = "(navigated_relationship_level_{$navLevel}.vdex_7_4_1_relationship_type_source='$relationshipType[1]' AND navigated_relationship_level_{$navLevel}.vdex_7_4_2_relationship_type_value='$relationshipType[0]') \n";
@@ -665 +665 @@
         }
         //navigableDestToSource
-        $joinBackwards?$destToSourceTypes=$navigableRelationships['navigableSourceToDest']:$destToSourceTypes=$navigableRelationships['navigableSourceToDest'];
+        $joinBackwards?$destToSourceTypes=$navigableRelationships['navigableSourceToDest']:$destToSourceTypes=$navigableRelationships['navigableDestToSource'];
         if(count($destToSourceTypes)>0){
             $tmpSql = null;
@@ -687 +687 @@
 
         /* Re-joining with vocabulary_term is essential to exploit the nested-set structure later */
-        $selectListArray[] = "navigated_relationship_level_{$navLevel}.vdex_7_4_2_relationship_type_value as RT";
+        $selectListArray[] = "navigated_relationship_level_{$navLevel}.vdex_7_4_2_relationship_type_value as l{$navLevel}_RT";
         $selectListArray[] = "navigated_relationship_level_{$navLevel}.source_term_identifier as l{$navLevel}_STid, navigated_relationship_level_{$navLevel}.target_term_identifier as l{$navLevel}_TTid";
         $selectListArray[] = "navigated_terms_level_{$navLevel}.vdex_4_vocabulary_identifier as l{$navLevel}_voc, navigated_terms_level_{$navLevel}.vdex_6_1_identifier as l{$navLevel}_term";
+
         $sqlVocTermJoin = null;
         $sqlVocTermJoin .= " LEFT JOIN vocabulary_terms AS {$rightTable} ON ( \n";
@@ -715 +716 @@
             /* Re-joining with vocabulary_term is essential to exploit the nested-set structure later */
             $selectListArray[] = "{$finalJoinTable}.vdex_4_vocabulary_identifier as final_voc, {$finalJoinTable}.vdex_6_1_identifier as final_term";
+                    //$selectListArray[] = "array_agg(".implode(', ',$vocIdcoalesceParts).")";
             $sqlFinalJoin = null;
             $sqlFinalJoin .= "  ON ( \n";
@@ -760 +762 @@
                 $sql .= " WHERE initial_theme_limit_terms.vdex_4_vocabulary_identifier='rVoc1' AND initial_theme_limit_terms.vdex_6_1_identifier='rVoc1T2'\n";
                 //$sql .= " WHERE vocabulary_terms.vdex_4_vocabulary_identifier='pivotVoc' AND vocabulary_terms.vdex_6_1_identifier='pivotVocT3'\n";
-                pretty_print_r($sql);ob_flush();flush();
+                pretty_print_r($sql);@ob_flush();flush();
                 $db->ExecuterSql($sql, $rows, true);
                 //pretty_print_r($navigableRelationships);
@@ -772 +774 @@
         }
         else {
-                        //Yes, that's an identity join, but we do need both names to be compatible with code above
+            //Yes, that's an identity join, but we do need both names to be compatible with code above
             $retval .= " vocabulary_terms AS theme_limit_terms JOIN vocabulary_terms AS initial_theme_limit_terms ON \n";
             $retval .= " (theme_limit_terms.vdex_6_1_identifier=initial_theme_limit_terms.vdex_6_1_identifier AND theme_limit_terms.vdex_4_vocabulary_identifier=initial_theme_limit_terms.vdex_4_vocabulary_identifier)\n";
         }
-                //$retval .= " JOIN vocabulary_terms AS initial_theme_limit_terms ON  \n";
+        //$retval .= " JOIN vocabulary_terms AS initial_theme_limit_terms ON  \n";
         $retval .= ") ON (path_identifier=theme_limit_terms.vdex_6_1_identifier AND path_vdex_4_vocabulary_identifier=theme_limit_terms.vdex_4_vocabulary_identifier)  \n";
-        
+
         return $retval;
     }