comparison query.cpp @ 423:b09d2eb1a2b2 api-inversion

Cheap hackery abounds.

Include an accumulator into the query_loop chain.  Somewhat
surprisingly, very few tests fail, and those that do are due to
over-specific reporting requirements in the case of ties, so rewrite
those tests to be more permissive.

There are probably codepaths which ignore the accumulator completely;
they will still work, because the accumulator will return zero points
when it is asked to ->get_points().

   else{
     VERB_LOG(1, "Calling brute-force query on database %s\n", dbName);
     query_loop(dbName, query_from_key_index);
   }
 
+  adb_query_results_t *rs = accumulator->get_points();
+  for(unsigned int k = 0; k < rs->nresults; k++) {
+    adb_result_t r = rs->results[k];
+    reporter->add_point(getKeyPos(r.key), r.qpos, r.ipos, r.dist);
+  }
+
   reporter->report(fileTable, adbQueryResponse);
 }
 
 // return ordinal position of key in keyTable
 // this should really be a STL hash map search
-unsigned audioDB::getKeyPos(char* key){  
+unsigned audioDB::getKeyPos(const char* key){  
   if(!dbH)
     error("dbH not initialized","getKeyPos");
   for(unsigned k=0; k<dbH->numFiles; k++)
     if(strncmp(fileTable + k*O2_FILETABLE_ENTRY_SIZE, key, strlen(key))==0)
       return k;

 
 	    // Power test
 	    if ((!usingPower) || powers_acceptable(qpPtr[j], sPower[trackIndexOffset + k])) {
               // radius test
               if((!radius) || thisDist <= (radius+O2_DISTANCE_TOLERANCE)) {
-                reporter->add_point(track, usingQueryPoint ? queryPoint : j, k, thisDist);
+                adb_result_t r;
+                r.key = fileTable + track * O2_FILETABLE_ENTRY_SIZE;
+                r.dist = thisDist;
+                r.qpos = usingQueryPoint ? queryPoint : j;
+                r.ipos = k;
+                accumulator->add_point(&r);
               }
             }
           }
         }
       } // Duration match