From 18d4af31abad796f660fee8ffeef95ce2ee5bd28 Mon Sep 17 00:00:00 2001
From: dsandersoremutah <dsandersoremutah@0109f412-320b-0410-ab79-c3e0c5ffbbe6>
Date: Thu, 20 Jul 2006 23:06:30 +0000
Subject: [PATCH] Changed setupKeys to allow multiple predicates to be passed
 in so we can use multiple components of a compound index.

git-svn-id: https://svn.code.sf.net/p/flaim/code/trunk@700 0109f412-320b-0410-ab79-c3e0c5ffbbe6
---
 sql/src/fscursor.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/sql/src/fscursor.cpp b/sql/src/fscursor.cpp
index 6d35178..7205264 100644
--- a/sql/src/fscursor.cpp
+++ b/sql/src/fscursor.cpp
@@ -127,7 +127,8 @@ RCODE FSIndexCursor::setupKeys(
 	F_Db *			pDb,
 	F_INDEX *		pIndex,
 	F_TABLE *		pTable,
-	SQL_PRED *		pPred,
+	SQL_PRED **		ppKeyComponents,
+	FLMUINT			uiComponentsUsed,
 	FLMBOOL *		pbDoRowMatch,
 	FLMBOOL *		pbCanCompareOnKey,
 	FLMUINT64 *		pui64LeafBlocksBetween,	// [out] blocks between the stacks
@@ -145,10 +146,9 @@ RCODE FSIndexCursor::setupKeys(
 		goto Exit;
 	}
 
-// VISIT: NEED TO REDO THIS
-
 	if (RC_BAD( rc = flmBuildFromAndUntilKeys( pDb->getDict(), pIndex, pTable,
-			pPred, &m_fromExtKey, m_fromKey.ucKey, &m_fromKey.uiKeyLen, 
+			ppKeyComponents, uiComponentsUsed,
+			&m_fromExtKey, m_fromKey.ucKey, &m_fromKey.uiKeyLen, 
 			&m_untilExtKey, m_untilKey.ucKey, &m_untilKey.uiKeyLen,
 			pbDoRowMatch, pbCanCompareOnKey)))
 	{