comparison query.cpp @ 545:bf89c80ec4cc multiprobeLSH

Expanded interface to audiodb_insert_create_datum() and audiodb_track_id_datum() to include _offset versions of both. Default cache is NULL, but offset and size parameters required.

 
  error:
   return 1;
 }
 
-int audiodb_track_id_datum(adb_t *adb, uint32_t track_id, adb_datum_t *d, off_t vector_offset=0, size_t num_vectors=0, adb_fd_cache_t* cache=0){
+int audiodb_track_id_datum(adb_t * adb, uint32_t track_id, adb_datum_t *datum){
+  return audiodb_track_id_datum_offset(adb, track_id , datum, 0, 0, 0);
+}
+
+int audiodb_track_id_datum_offset(adb_t *adb, uint32_t track_id, adb_datum_t *d, off_t vector_offset, size_t num_vectors, adb_fd_cache_t* cache){
   off_t track_offset = (*adb->track_offsets)[track_id];
   
   if(adb->header->flags & ADB_HEADER_FLAG_REFERENCES) {
     /* create a reference/insert, then use adb_insert_create_datum() */
     adb_reference_t *reference = NULL;

 	lseek(adb->fd, adb->header->timesTableOffset + track_id * ADB_FILETABLE_ENTRY_SIZE, SEEK_SET);
 	read_or_goto_error(adb->fd, (void *)reference->times, ADB_MAXSTR);
       }
     }
 
-    int retval = audiodb_insert_create_datum(reference, d, vector_offset*adb->header->dim*sizeof(double), num_vectors*adb->header->dim*sizeof(double), cache);
+    int retval = audiodb_insert_create_datum_offset(reference, d, vector_offset*adb->header->dim*sizeof(double), num_vectors*adb->header->dim*sizeof(double), cache);
     if(!cache){
       audiodb_free_datum_reference(reference);
       free(reference);      
     }
     return retval;

     if(pp.trackID != currentTrack){
           audiodb_free_datum(&d);
 	  currentTrack = pp.trackID;
     }
     maybe_delete_array(dbpointers.mean_duration);
-    if(audiodb_track_id_datum(adb, pp.trackID, &d, pp.spos, sequence_length, &c)) {
+    if(audiodb_track_id_datum_offset(adb, pp.trackID, &d, pp.spos, sequence_length, &c)) {
       delete qstate->exact_evaluation_queue;
       delete qstate->set;
       audiodb_free_datum(&d);
       audiodb_free_datum_cache(&c);
       return 1;