Changeset 80d4466

Timestamp:

08/26/10 15:26:14 (21 months ago)

Author:

Benoit Grégoire <benoitg@…>

Branches:

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

Children:

f0daea643ebbade00cd85a4698420c4d1894a697

Parents:

ce9b376399bdac774ac9123625fc841f9afdfbb4

git-author:

Benoit Grégoire <benoitg@coeus.ca>2010-08-26 15:26:14-04:00

git-committer:

Benoit Grégoire <benoitg@coeus.ca>2010-08-26 15:26:14-04:00

Message:

Snapshot

File:

• html/classes/SearchEngine.php (modified) (1 diff)

html/classes/SearchEngine.php

@@ -623 +623 @@
 
         $navigableRelationships = configGetNavigableRelationshipsIdArray();
-
+        $sql .= " LEFT JOIN vocabulary_relationships AS navigated_relationship_level_{$navLevel} ON ( \n";
+        $joinCondArray=array();
         //navigableSourceToDest
         if(count($navigableRelationships['navigableSourceToDest']>0)){
             $tmpSql = null;
-            $tmpSql .= " LEFT JOIN vocabulary_relationships AS navigated_relationship_level_{$navLevel}_sourceToDest ON ( \n";
-            $tmpSql .= " navigated_relationship_level_{$navLevel}_sourceToDest.source_term_vocabulary_identifier=$leftTable.vdex_4_vocabulary_identifier \n";
-            $tmpSql .= " AND navigated_relationship_level_{$navLevel}_sourceToDest.source_term_identifier=$leftTable.vdex_6_1_identifier \n";
-            $tmpSql .= " AND navigated_relationship_level_{$navLevel}_sourceToDest.target_term_vocabulary_identifier!=$leftTable.vdex_4_vocabulary_identifier \n";
-            $tmpSql .= " AND navigated_relationship_level_{$navLevel}_sourceToDest.target_term_identifier!=$leftTable.vdex_6_1_identifier \n";
+            $tmpSql .= " ( \n";
+            $tmpSql .= " navigated_relationship_level_{$navLevel}.source_term_vocabulary_identifier=$leftTable.vdex_4_vocabulary_identifier \n";
+            $tmpSql .= " AND navigated_relationship_level_{$navLevel}.source_term_identifier=$leftTable.vdex_6_1_identifier \n";
+            $tmpSql .= " AND navigated_relationship_level_{$navLevel}.target_term_vocabulary_identifier!=$leftTable.vdex_4_vocabulary_identifier \n";
+            $tmpSql .= " AND navigated_relationship_level_{$navLevel}.target_term_identifier!=$leftTable.vdex_6_1_identifier \n";
             $internaljoinCondArray = array();
             foreach($navigableRelationships['navigableSourceToDest'] as $relationshipType) {
-                $internaljoinCondArray[] = "(navigated_relationship_level_{$navLevel}_sourceToDest.vdex_7_4_1_relationship_type_source='$relationshipType[1]' AND navigated_relationship_level_{$navLevel}_sourceToDest.vdex_7_4_2_relationship_type_value='$relationshipType[0]') \n";
+                $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";
             }
             $internalJoinCond=implode(" OR \n", $internaljoinCondArray);
             $tmpSql .= " AND (\n$internalJoinCond) \n";
-            $tmpSql .=")\n";
-            $sql.=$tmpSql;
+            $tmpSql .=" )\n";
+            $joinCondArray[]=$tmpSql;
         }
         //navigableDestToSource
         if(count($navigableRelationships['navigableDestToSource']>0)){
             $tmpSql = null;
-            $tmpSql .= " LEFT JOIN vocabulary_relationships AS navigated_relationship_level_{$navLevel}_destToSource ON ( \n";
-            $tmpSql .= " navigated_relationship_level_{$navLevel}_destToSource.target_term_vocabulary_identifier=$leftTable.vdex_4_vocabulary_identifier \n";
-            $tmpSql .= " AND navigated_relationship_level_{$navLevel}_sourceToDest.source_term_identifier IS NULL \n";
+            $tmpSql .= " ( \n";
+            $tmpSql .= " navigated_relationship_level_{$navLevel}.target_term_vocabulary_identifier=$leftTable.vdex_4_vocabulary_identifier \n";
+            $tmpSql .= " AND navigated_relationship_level_{$navLevel}.target_term_identifier=$leftTable.vdex_6_1_identifier \n";
             $internaljoinCondArray = array();
             foreach($navigableRelationships['navigableDestToSource'] as $relationshipType) {
-                $internaljoinCondArray[] = "(navigated_relationship_level_{$navLevel}_destToSource.vdex_7_4_1_relationship_type_source='$relationshipType[1]' AND navigated_relationship_level_{$navLevel}_destToSource.vdex_7_4_2_relationship_type_value='$relationshipType[0]') \n";
+                $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";
             }
             $internalJoinCond=implode(" OR \n", $internaljoinCondArray);
             $tmpSql .= " AND (\n$internalJoinCond) \n";
-            $tmpSql .=")\n";
-            $sql.=$tmpSql;
-        }
-
+            $tmpSql .=" )\n";
+            $joinCondArray[]=$tmpSql;
+        }
+        $sql .= implode("\n OR \n", $joinCondArray);
+        $sql .= " )\n";
         $joinCondArray = array();
-         $selectListArray[] = "navigated_relationship_level_{$navLevel}_destToSource.vdex_7_4_2_relationship_type_value as destToSourceRT";
-        $selectListArray[] = "navigated_relationship_level_{$navLevel}_sourceToDest.vdex_7_4_2_relationship_type_value as sourceToDestRT";
-        $selectListArray[] = "navigated_relationship_level_{$navLevel}_destToSource.source_term_identifier as l{$navLevel}_destToSourceSTid, navigated_relationship_level_{$navLevel}_sourceToDest.target_term_identifier as l{$navLevel}_sourceToDestDTid";
+        $selectListArray[] = "navigated_relationship_level_{$navLevel}.vdex_7_4_2_relationship_type_value as RT";
+        $selectListArray[] = "navigated_relationship_level_{$navLevel}.source_term_identifier as l{$navLevel}_STid, navigated_relationship_level_{$navLevel}.target_term_identifier as l{$navLevel}_TTid";
+        $caseSql = " CASE \n";
+        $caseSql .= " WHEN navigated_relationship_level_{$navLevel}.target_term_identifier!=$leftTable.vdex_6_1_identifier THEN navigated_relationship_level_{$navLevel}.target_term_identifier\n";
+        $caseSql .= " WHEN navigated_relationship_level_{$navLevel}.source_term_identifier!=$leftTable.vdex_6_1_identifier THEN navigated_relationship_level_{$navLevel}.source_term_identifier \n";
+        $caseSql .= " END  as navigated_relationship_level_{$navLevel}_joined_term_identifier \n";
+        $caseSql .= " , CASE  \n";
+        $caseSql .= " WHEN navigated_relationship_level_{$navLevel}.target_term_identifier!=$leftTable.vdex_6_1_identifier THEN navigated_relationship_level_{$navLevel}.target_term_vocabulary_identifier\n";
+        $caseSql .= " WHEN navigated_relationship_level_{$navLevel}.source_term_identifier!=$leftTable.vdex_6_1_identifier THEN navigated_relationship_level_{$navLevel}.source_term_vocabulary_identifier \n";
+        $caseSql .= " END  as navigated_relationship_level_{$navLevel}_joined_term_vocabulary_identifier \n";
+        $selectListArray[] = $caseSql;
         /*
          $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";