From 653bee4b89131a997043a074d51c28dedb907f5c Mon Sep 17 00:00:00 2001
From: Joe Zhao <ztuowen@gmail.com>
Date: Mon, 18 May 2015 16:17:01 +0800
Subject: output update

---
 tools/fileDataProvider.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'tools')

diff --git a/tools/fileDataProvider.cpp b/tools/fileDataProvider.cpp
index e9b7f3d..72330d5 100644
--- a/tools/fileDataProvider.cpp
+++ b/tools/fileDataProvider.cpp
@@ -58,6 +58,9 @@ void RidFileDP::readEntries() {
         d.addEntry(e);
     }
     pos = 0;
+    std::vector<DataEntry*> & dat = d.getData();
+    while (pos<dat.size() && dat[pos]->rank!=-1 && dat[pos]->qid!="-1")
+        ++pos;
     qid = 1;
     read = true;
 }
@@ -92,10 +95,9 @@ int RidFileDP::getDataSet(DataList &out){
             }
             out.addEntry(e);
         }
-    dat[pos]->qid=std::to_string(qid);
     ++qid;
     dat[pos]->rank=qid;
-    while (pos<dat.size() && dat[pos]->rank!=-1)
+    while (pos<dat.size() && (dat[pos]->rank!=-1 || dat[pos]->qid=="-1"))
         ++pos;
     if (pos==d.getSize())
         eof = true;
-- 
cgit v1.2.3-70-g09d2