[tracker/fts-positions: 1/2] libtracker-fts: Fix reading rank and offset information

[Jürg Billeter <juergbi src gnome org>]

commit 0425c0f66d2414fdb5415bce4377e9b6c609fef2
Author: Jürg Billeter <j bitron ch>
Date:   Thu Oct 8 11:46:24 2009 +0200

    libtracker-fts: Fix reading rank and offset information

 src/libtracker-fts/tracker-fts.c |   24 ++++++++++++------------
 1 files changed, 12 insertions(+), 12 deletions(-)
---
diff --git a/src/libtracker-fts/tracker-fts.c b/src/libtracker-fts/tracker-fts.c
index 4e0106e..045d624 100644
--- a/src/libtracker-fts/tracker-fts.c
+++ b/src/libtracker-fts/tracker-fts.c
@@ -1920,9 +1920,9 @@ static void docListAndMerge(
 
   if( nLeft==0 || nRight==0 ) return;
 
-  dlrInit(&left, DL_DOCIDS, pLeft, nLeft);
-  dlrInit(&right, DL_DOCIDS, pRight, nRight);
-  dlwInit(&writer, DL_DOCIDS, pOut);
+  dlrInit(&left, DL_POSITIONS, pLeft, nLeft);
+  dlrInit(&right, DL_POSITIONS, pRight, nRight);
+  dlwInit(&writer, DL_POSITIONS, pOut);
 
   while( !dlrAtEnd(&left) && !dlrAtEnd(&right) ){
     if( dlrDocid(&left)<dlrDocid(&right) ){
@@ -2020,9 +2020,9 @@ static void docListOrMerge(
     return;
   }
 
-  dlrInit(&left, DL_DOCIDS, pLeft, nLeft);
-  dlrInit(&right, DL_DOCIDS, pRight, nRight);
-  dlwInit(&writer, DL_DOCIDS, pOut);
+  dlrInit(&left, DL_POSITIONS, pLeft, nLeft);
+  dlrInit(&right, DL_POSITIONS, pRight, nRight);
+  dlwInit(&writer, DL_POSITIONS, pOut);
 
   while( !dlrAtEnd(&left) || !dlrAtEnd(&right) ){
     if( dlrAtEnd(&right) ){
@@ -2116,9 +2116,9 @@ static void docListExceptMerge(
     return;
   }
 
-  dlrInit(&left, DL_DOCIDS, pLeft, nLeft);
-  dlrInit(&right, DL_DOCIDS, pRight, nRight);
-  dlwInit(&writer, DL_DOCIDS, pOut);
+  dlrInit(&left, DL_POSITIONS, pLeft, nLeft);
+  dlrInit(&right, DL_POSITIONS, pRight, nRight);
+  dlwInit(&writer, DL_POSITIONS, pOut);
 
   while( !dlrAtEnd(&left) ){
     while( !dlrAtEnd(&right) && dlrDocid(&right)<dlrDocid(&left) ){
@@ -4264,7 +4264,7 @@ static int docListOfTerm(
                   DL_POSITIONS, &left);
   #else
   rc = termSelect(v, iColumn, pQTerm->pTerm, pQTerm->nTerm, pQTerm->isPrefix,
-                  (0<pQTerm->nPhrase ? DL_POSITIONS : DL_DOCIDS), &left);
+                  DL_POSITIONS, &left);
   #endif                
                   
   if( rc ) return rc;
@@ -4298,7 +4298,7 @@ static int docListOfTerm(
     #else
     docListPhraseMerge(left.pData, left.nData, right.pData, right.nData,
                        pQTerm[i-1].nNear, pQTerm[i-1].iPhrase + nPhraseRight,
-                       ((i<pQTerm->nPhrase) ? DL_POSITIONS : DL_DOCIDS),
+                       DL_POSITIONS,
                        &new, i);
 
     #endif                   
@@ -4730,7 +4730,7 @@ static int fulltextFilter(
 #ifdef STORE_CATEGORY
         dlrInit(&c->reader, DL_POSITIONS, c->result.pData, c->result.nData);
 #else      
-        dlrInit(&c->reader, DL_DOCIDS, c->result.pData, c->result.nData);
+        dlrInit(&c->reader, DL_POSITIONS, c->result.pData, c->result.nData);
 
 #endif