1 files changed, 4 insertions, 2 deletions
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;