annotate audioDB.cpp @ 465:1030664df98c api-inversion

No more audioDB::index_allocate and audioDB::index_init_query No more SERVER_LSH_INDEX_SINGLETON, either; instead each adb_t contains a single cache of the last used in-core index. At the moment, this cache is unused by the server (and the previous cache code has been replaced by a comment), but I think that this way everyone can be allowed to benefit without anyone having to explicitly manage indexes themselves. I'm not going to say how long I wandered in a maze of valgrind before giving up and keeping the hacky workaround for loading the lsh tables [see the FIXME comment in audiodb_index_init_query()]; let's just say that it was long enough to find the extra bonus crashy close(lshfid) in audioDB::index_index_db. Also, delete the abstraction-inverting LSH stuff from query.cpp where we are making our reporters; the fix for that, which is presumably when creating small indexes for large datasets, is to implement space-efficient reporters. (The accumulator code, which is my second attempt, is more space-efficient than the reporters; inspiration may wish to be drawn...)
author mas01cr
date Tue, 30 Dec 2008 23:56:57 +0000
parents fcc6f7c4856b
children d3afc91d205d
rev   line source
mas01cr@0 1 #include "audioDB.h"
mas01cr@385 2 extern "C" {
mas01cr@385 3 #include "audioDB_API.h"
mas01cr@402 4 #include "audioDB-internals.h"
mas01cr@385 5 }
mas01cr@0 6
mas01mc@324 7 char* SERVER_ADB_ROOT;
mas01mc@324 8 char* SERVER_ADB_FEATURE_ROOT;
mas01mc@308 9
mas01mc@292 10 PointPair::PointPair(Uns32T a, Uns32T b, Uns32T c):trackID(a),qpos(b),spos(c){};
mas01mc@292 11
mas01mc@292 12 bool operator<(const PointPair& a, const PointPair& b){
mas01mc@324 13 return ( (a.trackID<b.trackID) ||
mas01mc@324 14 ( (a.trackID==b.trackID) &&
mas01mc@324 15 ( (a.spos<b.spos) || ( (a.spos==b.spos) && (a.qpos < b.qpos) )) ) );
mas01mc@292 16 }
mas01mc@292 17
mas01mc@292 18 bool operator>(const PointPair& a, const PointPair& b){
mas01mc@324 19 return ( (a.trackID>b.trackID) ||
mas01mc@324 20 ( (a.trackID==b.trackID) &&
mas01mc@324 21 ( (a.spos>b.spos) || ( (a.spos==b.spos) && (a.qpos > b.qpos) )) ) );
mas01mc@292 22 }
mas01mc@292 23
mas01mc@292 24 bool operator==(const PointPair& a, const PointPair& b){
mas01mc@292 25 return ( (a.trackID==b.trackID) && (a.qpos==b.qpos) && (a.spos==b.spos) );
mas01mc@292 26 }
mas01mc@292 27
mas01cr@370 28 audioDB::audioDB(const unsigned argc, const char *argv[]): O2_AUDIODB_INITIALIZERS
mas01cr@76 29 {
mas01cr@0 30 if(processArgs(argc, argv)<0){
mas01cr@0 31 printf("No command found.\n");
mas01cr@0 32 cmdline_parser_print_version ();
mas01cr@0 33 if (strlen(gengetopt_args_info_purpose) > 0)
mas01cr@0 34 printf("%s\n", gengetopt_args_info_purpose);
mas01cr@0 35 printf("%s\n", gengetopt_args_info_usage);
mas01cr@0 36 printf("%s\n", gengetopt_args_info_help[1]);
mas01cr@0 37 printf("%s\n", gengetopt_args_info_help[2]);
mas01cr@0 38 printf("%s\n", gengetopt_args_info_help[0]);
mas01cr@151 39 error("No command found");
mas01cr@0 40 }
mas01cr@77 41
mas01mc@324 42 // Perform database prefix substitution
mas01mc@328 43 if(dbName && adb_root)
mas01mc@324 44 prefix_name((char** const)&dbName, adb_root);
mas01mc@324 45
mas01cr@0 46 if(O2_ACTION(COM_SERVER))
mas01cr@371 47 #ifdef LIBRARY
mas01cr@371 48 ;
mas01cr@371 49 #else
mas01cr@0 50 startServer();
mas01cr@371 51 #endif
mas01cr@0 52
mas01cr@0 53 else if(O2_ACTION(COM_CREATE))
mas01cr@0 54 create(dbName);
mas01cr@0 55
mas01cr@0 56 else if(O2_ACTION(COM_INSERT))
mas01cr@0 57 insert(dbName, inFile);
mas01cr@0 58
mas01cr@0 59 else if(O2_ACTION(COM_BATCHINSERT))
mas01cr@0 60 batchinsert(dbName, inFile);
mas01cr@0 61
mas01cr@0 62 else if(O2_ACTION(COM_QUERY))
mas01mc@307 63 if(isClient){
mas01cr@371 64 #ifdef LIBRARY
mas01cr@371 65 ;
mas01cr@371 66 #else
mas01mc@329 67 if(query_from_key){
mas01mc@332 68 VERB_LOG(1, "Calling web services query %s on database %s, query=%s\n", radius>0?"(Radius)":"(NN)", dbName, (key&&strlen(key))?key:inFile);
mas01mc@328 69 ws_query_by_key(dbName, key, inFile, (char*)hostport);
mas01mc@329 70 }
mas01mc@329 71 else{
mas01mc@332 72 VERB_LOG(1, "Calling web services query on database %s, query=%s\n", dbName, (key&&strlen(key))?key:inFile);
mas01mc@307 73 ws_query(dbName, inFile, (char*)hostport);
mas01mc@329 74 }
mas01cr@371 75 #endif
mas01mc@307 76 }
mas01cr@0 77 else
mas01cr@76 78 query(dbName, inFile);
mas01cr@0 79
mas01cr@0 80 else if(O2_ACTION(COM_STATUS))
mas01cr@0 81 if(isClient)
mas01cr@371 82 #ifdef LIBRARY
mas01cr@371 83 ;
mas01cr@371 84 #else
mas01cr@0 85 ws_status(dbName,(char*)hostport);
mas01cr@371 86 #endif
mas01cr@0 87 else
mas01cr@0 88 status(dbName);
mas01cr@280 89
mas01cr@280 90 else if(O2_ACTION(COM_SAMPLE))
mas01cr@280 91 sample(dbName);
mas01cr@0 92
mas01cr@0 93 else if(O2_ACTION(COM_L2NORM))
mas01cr@0 94 l2norm(dbName);
mas01cr@0 95
mas01cr@193 96 else if(O2_ACTION(COM_POWER))
mas01cr@193 97 power_flag(dbName);
mas01cr@193 98
mas01cr@0 99 else if(O2_ACTION(COM_DUMP))
mas01cr@0 100 dump(dbName);
mas01mc@292 101
mas01mc@334 102 else if(O2_ACTION(COM_LISZT))
mas01mc@334 103 if(isClient)
mas01cr@371 104 #ifdef LIBRARY
mas01cr@371 105 ;
mas01cr@371 106 #else
mas01mc@334 107 ws_liszt(dbName, (char*) hostport);
mas01cr@371 108 #endif
mas01mc@334 109 else
mas01mc@334 110 liszt(dbName, lisztOffset, lisztLength);
mas01mc@334 111
mas01mc@292 112 else if(O2_ACTION(COM_INDEX))
mas01mc@292 113 index_index_db(dbName);
mas01cr@0 114
mas01cr@0 115 else
mas01cr@0 116 error("Unrecognized command",command);
mas01cr@0 117 }
mas01cr@0 118
mas01cr@370 119 audioDB::audioDB(const unsigned argc, const char *argv[], adb__queryResponse *adbQueryResponse): O2_AUDIODB_INITIALIZERS
mas01cr@76 120 {
mas01cr@97 121 try {
mas01mc@338 122 isServer = 1; // Set to make errors report over SOAP
mas01cr@97 123 processArgs(argc, argv);
mas01mc@324 124 // Perform database prefix substitution
mas01mc@328 125 if(dbName && adb_root)
mas01mc@324 126 prefix_name((char** const)&dbName, adb_root);
mas01cr@97 127 assert(O2_ACTION(COM_QUERY));
mas01cr@133 128 query(dbName, inFile, adbQueryResponse);
mas01cr@97 129 } catch(char *err) {
mas01cr@97 130 cleanup();
mas01cr@97 131 throw(err);
mas01cr@97 132 }
mas01cr@76 133 }
mas01cr@76 134
mas01cr@370 135 audioDB::audioDB(const unsigned argc, const char *argv[], adb__statusResponse *adbStatusResponse): O2_AUDIODB_INITIALIZERS
mas01cr@76 136 {
mas01cr@97 137 try {
mas01mc@338 138 isServer = 1; // Set to make errors report over SOAP
mas01cr@97 139 processArgs(argc, argv);
mas01mc@324 140 // Perform database prefix substitution
mas01mc@328 141 if(dbName && adb_root)
mas01mc@324 142 prefix_name((char** const)&dbName, adb_root);
mas01cr@97 143 assert(O2_ACTION(COM_STATUS));
mas01cr@133 144 status(dbName, adbStatusResponse);
mas01cr@97 145 } catch(char *err) {
mas01cr@97 146 cleanup();
mas01cr@97 147 throw(err);
mas01cr@97 148 }
mas01cr@76 149 }
mas01cr@76 150
mas01cr@370 151 audioDB::audioDB(const unsigned argc, const char *argv[], adb__lisztResponse *adbLisztResponse): O2_AUDIODB_INITIALIZERS
mas01mc@334 152 {
mas01mc@334 153 try {
mas01mc@338 154 isServer = 1; // Set to make errors report over SOAP
mas01mc@338 155 processArgs(argc, argv);
mas01mc@334 156 // Perform database prefix substitution
mas01mc@334 157 if(dbName && adb_root)
mas01mc@334 158 prefix_name((char** const)&dbName, adb_root);
mas01mc@334 159 assert(O2_ACTION(COM_LISZT));
mas01mc@334 160 liszt(dbName, lisztOffset, lisztLength, adbLisztResponse);
mas01mc@334 161 } catch(char *err) {
mas01mc@334 162 cleanup();
mas01mc@334 163 throw(err);
mas01mc@334 164 }
mas01mc@334 165 }
mas01mc@334 166
mas01cr@395 167 //for API query
mas01cr@395 168 audioDB::audioDB(const unsigned argc, const char *argv[],adb__queryResponse *adbQueryResponse, int * apierror, adb_t *a): O2_AUDIODB_INITIALIZERS
mas01ik@355 169 {
mas01ik@355 170
mas01ik@355 171 try {
mas01ik@355 172 UseApiError=1;
mas01cr@395 173 adb = a;
mas01ik@355 174
mas01ik@355 175 if(processArgs(argc, argv)<0){
mas01ik@355 176 printf("No command found.\n");
mas01ik@355 177 cmdline_parser_print_version ();
mas01ik@355 178 if (strlen(gengetopt_args_info_purpose) > 0)
mas01ik@355 179 printf("%s\n", gengetopt_args_info_purpose);
mas01ik@355 180 printf("%s\n", gengetopt_args_info_usage);
mas01ik@355 181 printf("%s\n", gengetopt_args_info_help[1]);
mas01ik@355 182 printf("%s\n", gengetopt_args_info_help[2]);
mas01ik@355 183 printf("%s\n", gengetopt_args_info_help[0]);
mas01ik@355 184 error("No command found");
mas01ik@355 185 }
mas01ik@355 186
mas01ik@355 187 query(dbName, inFile, adbQueryResponse);
mas01ik@355 188
mas01ik@355 189 } catch(int a) {
mas01ik@355 190 *apierror=a;
mas01ik@355 191 return;
mas01ik@355 192
mas01ik@355 193 }
mas01ik@355 194 *apierror=apierrortemp;
mas01ik@355 195 return;
mas01ik@355 196
mas01ik@355 197 }
mas01ik@355 198
mas01cr@97 199 void audioDB::cleanup() {
mas01cr@122 200 cmdline_parser_free(&args_info);
mas01cr@196 201 if(fileTable)
mas01cr@196 202 munmap(fileTable, fileTableLength);
mas01cr@196 203 if(trackTable)
mas01cr@196 204 munmap(trackTable, trackTableLength);
mas01cr@196 205 if(timesTable)
mas01cr@196 206 munmap(timesTable, timesTableLength);
mas01mc@314 207 if(powerTable)
mas01mc@314 208 munmap(powerTable, powerTableLength);
mas01cr@196 209 if(l2normTable)
mas01cr@196 210 munmap(l2normTable, l2normTableLength);
mas01mc@324 211 if(featureFileNameTable)
mas01mc@324 212 munmap(featureFileNameTable, fileTableLength);
mas01mc@324 213 if(timesFileNameTable)
mas01mc@324 214 munmap(timesFileNameTable, fileTableLength);
mas01mc@324 215 if(powerFileNameTable)
mas01mc@324 216 munmap(powerFileNameTable, fileTableLength);
mas01mc@292 217 if(reporter)
mas01mc@292 218 delete reporter;
mas01cr@284 219 if(rng)
mas01cr@284 220 gsl_rng_free(rng);
mas01cr@0 221 if(infid>0)
mas01cr@0 222 close(infid);
mas01cr@395 223 if(adb && !UseApiError) {
mas01cr@392 224 audiodb_close(adb);
mas01cr@392 225 adb = NULL;
mas01cr@392 226 }
mas01cr@465 227 if(lsh)
mas01mc@308 228 delete lsh;
mas01cr@0 229 }
mas01cr@0 230
mas01cr@97 231 audioDB::~audioDB(){
mas01cr@97 232 cleanup();
mas01cr@97 233 }
mas01cr@97 234
mas01cr@370 235 int audioDB::processArgs(const unsigned argc, const char *argv[]){
mas01cr@0 236
mas01cr@0 237 if(argc<2){
mas01cr@0 238 cmdline_parser_print_version ();
mas01cr@0 239 if (strlen(gengetopt_args_info_purpose) > 0)
mas01cr@0 240 printf("%s\n", gengetopt_args_info_purpose);
mas01cr@0 241 printf("%s\n", gengetopt_args_info_usage);
mas01cr@0 242 printf("%s\n", gengetopt_args_info_help[1]);
mas01cr@0 243 printf("%s\n", gengetopt_args_info_help[2]);
mas01cr@0 244 printf("%s\n", gengetopt_args_info_help[0]);
mas01cr@0 245 exit(0);
mas01cr@0 246 }
mas01cr@0 247
mas01cr@345 248 /* KLUDGE: gengetopt generates a function which is not completely
mas01cr@345 249 const-clean in its declaration. We cast argv here to keep the
mas01cr@345 250 compiler happy. -- CSR, 2008-10-08 */
mas01cr@345 251 if (cmdline_parser (argc, (char *const *) argv, &args_info) != 0)
mas01cr@151 252 error("Error parsing command line");
mas01cr@0 253
mas01cr@0 254 if(args_info.help_given){
mas01cr@0 255 cmdline_parser_print_help();
mas01cr@0 256 exit(0);
mas01cr@0 257 }
mas01cr@0 258
mas01cr@0 259 if(args_info.verbosity_given){
mas01cr@239 260 verbosity = args_info.verbosity_arg;
mas01cr@239 261 if(verbosity < 0 || verbosity > 10){
mas01cr@239 262 std::cerr << "Warning: verbosity out of range, setting to 1" << std::endl;
mas01cr@239 263 verbosity = 1;
mas01cr@0 264 }
mas01cr@0 265 }
mas01cr@0 266
mas01cr@129 267 if(args_info.size_given) {
mas01cr@256 268 if(args_info.datasize_given) {
mas01cr@256 269 error("both --size and --datasize given", "");
mas01cr@256 270 }
mas01cr@256 271 if(args_info.ntracks_given) {
mas01cr@256 272 error("both --size and --ntracks given", "");
mas01cr@256 273 }
mas01cr@256 274 if(args_info.datadim_given) {
mas01cr@256 275 error("both --size and --datadim given", "");
mas01cr@256 276 }
mas01cr@196 277 if (args_info.size_arg < 50 || args_info.size_arg > 32000) {
mas01cr@129 278 error("Size out of range", "");
mas01cr@129 279 }
mas01cr@256 280 double ratio = (double) args_info.size_arg * 1000000 / ((double) O2_DEFAULTDBSIZE);
mas01cr@256 281 /* FIXME: what's the safe way of doing this? */
mas01cr@256 282 datasize = (unsigned int) ceil(datasize * ratio);
mas01cr@256 283 ntracks = (unsigned int) ceil(ntracks * ratio);
mas01cr@256 284 } else {
mas01cr@256 285 if(args_info.datasize_given) {
mas01cr@256 286 datasize = args_info.datasize_arg;
mas01cr@256 287 }
mas01cr@256 288 if(args_info.ntracks_given) {
mas01cr@256 289 ntracks = args_info.ntracks_arg;
mas01cr@256 290 }
mas01cr@256 291 if(args_info.datadim_given) {
mas01cr@256 292 datadim = args_info.datadim_arg;
mas01cr@256 293 }
mas01cr@129 294 }
mas01cr@129 295
mas01cr@239 296 if(args_info.radius_given) {
mas01cr@239 297 radius = args_info.radius_arg;
mas01mc@307 298 if(radius < 0 || radius > 1000000000) {
mas01cr@77 299 error("radius out of range");
mas01cr@239 300 } else {
mas01cr@239 301 VERB_LOG(3, "Setting radius to %f\n", radius);
mas01mc@17 302 }
mas01mc@17 303 }
mas01mc@17 304
mas01mc@292 305 sequenceLength = args_info.sequencelength_arg;
mas01mc@292 306 if(sequenceLength < 1 || sequenceLength > 1000) {
mas01mc@292 307 error("seqlen out of range: 1 <= seqlen <= 1000");
mas01mc@292 308 }
mas01mc@292 309 sequenceHop = args_info.sequencehop_arg;
mas01mc@292 310 if(sequenceHop < 1 || sequenceHop > 1000) {
mas01mc@292 311 error("seqhop out of range: 1 <= seqhop <= 1000");
mas01mc@292 312 }
mas01mc@292 313
mas01mc@292 314 if (args_info.absolute_threshold_given) {
mas01mc@292 315 if (args_info.absolute_threshold_arg >= 0) {
mas01mc@292 316 error("absolute threshold out of range: should be negative");
mas01mc@292 317 }
mas01mc@292 318 use_absolute_threshold = true;
mas01mc@292 319 absolute_threshold = args_info.absolute_threshold_arg;
mas01mc@292 320 }
mas01mc@292 321 if (args_info.relative_threshold_given) {
mas01mc@292 322 use_relative_threshold = true;
mas01mc@292 323 relative_threshold = args_info.relative_threshold_arg;
mas01mc@292 324 }
mas01mc@292 325
mas01mc@324 326 if (args_info.adb_root_given){
mas01mc@324 327 adb_root = args_info.adb_root_arg;
mas01mc@324 328 }
mas01mc@324 329
mas01mc@324 330 if (args_info.adb_feature_root_given){
mas01mc@324 331 adb_feature_root = args_info.adb_feature_root_arg;
mas01mc@324 332 }
mas01mc@324 333
mas01mc@324 334 // perform dbName path prefix SERVER-side subsitution
mas01mc@324 335 if(SERVER_ADB_ROOT && !adb_root)
mas01mc@324 336 adb_root = SERVER_ADB_ROOT;
mas01mc@324 337 if(SERVER_ADB_FEATURE_ROOT && !adb_feature_root)
mas01mc@324 338 adb_feature_root = SERVER_ADB_FEATURE_ROOT;
mas01mc@339 339
mas01cr@0 340 if(args_info.SERVER_given){
mas01cr@0 341 command=COM_SERVER;
mas01cr@0 342 port=args_info.SERVER_arg;
mas01cr@0 343 if(port<100 || port > 100000)
mas01cr@0 344 error("port out of range");
mas01cr@105 345 #if defined(O2_DEBUG)
mas01cr@104 346 struct sigaction sa;
mas01cr@104 347 sa.sa_sigaction = sigterm_action;
mas01cr@104 348 sa.sa_flags = SA_SIGINFO | SA_RESTART | SA_NODEFER;
mas01cr@104 349 sigaction(SIGTERM, &sa, NULL);
mas01cr@104 350 sa.sa_sigaction = sighup_action;
mas01cr@104 351 sa.sa_flags = SA_SIGINFO | SA_RESTART | SA_NODEFER;
mas01cr@104 352 sigaction(SIGHUP, &sa, NULL);
mas01cr@105 353 #endif
mas01mc@308 354 if(args_info.load_index_given){
mas01mc@308 355 if(!args_info.database_given)
mas01mc@308 356 error("load_index requires a --database argument");
mas01mc@308 357 else
mas01mc@308 358 dbName=args_info.database_arg;
mas01mc@308 359 if(!args_info.radius_given)
mas01mc@308 360 error("load_index requires a --radius argument");
mas01mc@308 361 if(!args_info.sequencelength_given)
mas01mc@308 362 error("load_index requires a --sequenceLength argument");
mas01mc@308 363 WS_load_index = true;
mas01mc@308 364 }
mas01cr@0 365 return 0;
mas01cr@0 366 }
mas01cr@0 367
mas01cr@0 368 // No return on client command, find database command
mas01cr@105 369 if(args_info.client_given){
mas01cr@105 370 command=COM_CLIENT;
mas01cr@105 371 hostport=args_info.client_arg;
mas01cr@105 372 isClient=1;
mas01cr@105 373 }
mas01cr@0 374
mas01cr@105 375 if(args_info.NEW_given){
mas01cr@105 376 command=COM_CREATE;
mas01cr@105 377 dbName=args_info.database_arg;
mas01cr@105 378 return 0;
mas01cr@105 379 }
mas01cr@0 380
mas01cr@105 381 if(args_info.STATUS_given){
mas01cr@105 382 command=COM_STATUS;
mas01cr@105 383 dbName=args_info.database_arg;
mas01cr@105 384 return 0;
mas01cr@105 385 }
mas01cr@0 386
mas01cr@280 387 if(args_info.SAMPLE_given) {
mas01cr@280 388 command = COM_SAMPLE;
mas01cr@280 389 dbName = args_info.database_arg;
mas01cr@280 390 sequenceLength = args_info.sequencelength_arg;
mas01cr@280 391 if(sequenceLength < 1 || sequenceLength > 1000) {
mas01cr@280 392 error("seqlen out of range: 1 <= seqlen <= 1000");
mas01cr@280 393 }
mas01cr@280 394 nsamples = args_info.nsamples_arg;
mas01cr@280 395 return 0;
mas01cr@280 396 }
mas01cr@280 397
mas01cr@105 398 if(args_info.DUMP_given){
mas01cr@105 399 command=COM_DUMP;
mas01cr@105 400 dbName=args_info.database_arg;
mas01cr@131 401 output = args_info.output_arg;
mas01cr@105 402 return 0;
mas01cr@105 403 }
mas01cr@0 404
mas01cr@105 405 if(args_info.L2NORM_given){
mas01cr@105 406 command=COM_L2NORM;
mas01cr@105 407 dbName=args_info.database_arg;
mas01cr@105 408 return 0;
mas01cr@105 409 }
mas01cr@0 410
mas01cr@193 411 if(args_info.POWER_given){
mas01cr@193 412 command=COM_POWER;
mas01cr@193 413 dbName=args_info.database_arg;
mas01cr@193 414 return 0;
mas01cr@193 415 }
mas01cr@193 416
mas01cr@370 417 if(args_info.INSERT_given) {
mas01cr@105 418 command=COM_INSERT;
mas01cr@105 419 dbName=args_info.database_arg;
mas01cr@105 420 inFile=args_info.features_arg;
mas01cr@370 421 if(args_info.key_given) {
mas01cr@370 422 if(!args_info.features_given) {
mas01mc@292 423 error("INSERT: '-k key' argument depends on '-f features'");
mas01cr@370 424 } else {
mas01mc@292 425 key=args_info.key_arg;
mas01cr@370 426 }
mas01cr@370 427 }
mas01cr@370 428 if(args_info.times_given) {
mas01cr@105 429 timesFileName=args_info.times_arg;
mas01cr@370 430 if(strlen(timesFileName)>0) {
mas01cr@370 431 if(!(timesFile = new std::ifstream(timesFileName,std::ios::in))) {
mas01cr@105 432 error("Could not open times file for reading", timesFileName);
mas01cr@370 433 }
mas01cr@105 434 usingTimes=1;
mas01cr@105 435 }
mas01cr@105 436 }
mas01cr@193 437 if (args_info.power_given) {
mas01cr@193 438 powerFileName = args_info.power_arg;
mas01cr@193 439 if (strlen(powerFileName) > 0) {
mas01cr@193 440 if (!(powerfd = open(powerFileName, O_RDONLY))) {
mas01cr@193 441 error("Could not open power file for reading", powerFileName, "open");
mas01cr@193 442 }
mas01cr@193 443 usingPower = 1;
mas01cr@193 444 }
mas01cr@193 445 }
mas01cr@105 446 return 0;
mas01cr@105 447 }
mas01cr@105 448
mas01cr@370 449 if(args_info.BATCHINSERT_given) {
mas01cr@105 450 command=COM_BATCHINSERT;
mas01cr@105 451 dbName=args_info.database_arg;
mas01cr@105 452 inFile=args_info.featureList_arg;
mas01cr@370 453 if(args_info.keyList_given) {
mas01cr@370 454 if(!args_info.featureList_given) {
mas01tc@300 455 error("BATCHINSERT: '-K keyList' argument depends on '-F featureList'");
mas01cr@370 456 } else {
mas01cr@304 457 key=args_info.keyList_arg; // INCONSISTENT NO CHECK
mas01cr@370 458 }
mas01cr@370 459 }
mas01cr@105 460 /* TO DO: REPLACE WITH
mas01cr@0 461 if(args_info.keyList_given){
mas01mc@18 462 trackFileName=args_info.keyList_arg;
mas01cr@239 463 if(strlen(trackFileName)>0 && !(trackFile = new std::ifstream(trackFileName,std::ios::in)))
mas01mc@18 464 error("Could not open keyList file for reading",trackFileName);
mas01cr@0 465 }
mas01cr@0 466 AND UPDATE BATCHINSERT()
mas01cr@105 467 */
mas01cr@105 468
mas01cr@370 469 if(args_info.timesList_given) {
mas01cr@105 470 timesFileName=args_info.timesList_arg;
mas01cr@370 471 if(strlen(timesFileName)>0) {
mas01cr@239 472 if(!(timesFile = new std::ifstream(timesFileName,std::ios::in)))
mas01cr@105 473 error("Could not open timesList file for reading", timesFileName);
mas01cr@105 474 usingTimes=1;
mas01cr@105 475 }
mas01cr@105 476 }
mas01cr@370 477 if(args_info.powerList_given) {
mas01cr@193 478 powerFileName=args_info.powerList_arg;
mas01cr@370 479 if(strlen(powerFileName)>0) {
mas01cr@239 480 if(!(powerFile = new std::ifstream(powerFileName,std::ios::in)))
mas01cr@193 481 error("Could not open powerList file for reading", powerFileName);
mas01cr@193 482 usingPower=1;
mas01cr@193 483 }
mas01cr@193 484 }
mas01cr@105 485 return 0;
mas01cr@105 486 }
mas01mc@292 487
mas01mc@292 488 // Set no_unit_norm flag
mas01mc@292 489 no_unit_norming = args_info.no_unit_norming_flag;
mas01mc@292 490 lsh_use_u_functions = args_info.lsh_use_u_functions_flag;
mas01mc@292 491
mas01mc@292 492 // LSH Index Command
mas01mc@292 493 if(args_info.INDEX_given){
mas01mc@292 494 if(radius <= 0 )
mas01mc@292 495 error("INDEXing requires a Radius argument");
mas01mc@292 496 if(!(sequenceLength>0 && sequenceLength <= O2_MAXSEQLEN))
mas01mc@292 497 error("INDEXing requires 1 <= sequenceLength <= 1000");
mas01mc@292 498 command=COM_INDEX;
mas01mc@337 499 if(!args_info.database_given)
mas01mc@337 500 error("INDEXing requires a database");
mas01mc@292 501 dbName=args_info.database_arg;
mas01mc@292 502
mas01mc@292 503 // Whether to store LSH hash tables for query in core (FORMAT2)
mas01mc@297 504 lsh_in_core = !args_info.lsh_on_disk_flag; // This flag is set to 0 if on_disk requested
mas01mc@292 505
mas01mc@292 506 lsh_param_w = args_info.lsh_w_arg;
mas01mc@292 507 if(!(lsh_param_w>0 && lsh_param_w<=O2_SERIAL_MAX_BINWIDTH))
mas01mc@292 508 error("Indexing parameter w out of range (0.0 < w <= 100.0)");
mas01mc@292 509
mas01mc@292 510 lsh_param_k = args_info.lsh_k_arg;
mas01mc@292 511 if(!(lsh_param_k>0 && lsh_param_k<=O2_SERIAL_MAX_FUNS))
mas01mc@292 512 error("Indexing parameter k out of range (1 <= k <= 100)");
mas01mc@292 513
mas01mc@292 514 lsh_param_m = args_info.lsh_m_arg;
mas01mc@292 515 if(!(lsh_param_m>0 && lsh_param_m<= (1 + (sqrt(1 + O2_SERIAL_MAX_TABLES*8.0)))/2.0))
mas01mc@292 516 error("Indexing parameter m out of range (1 <= m <= 20)");
mas01mc@292 517
mas01mc@292 518 lsh_param_N = args_info.lsh_N_arg;
mas01mc@292 519 if(!(lsh_param_N>0 && lsh_param_N<=O2_SERIAL_MAX_ROWS))
mas01mc@292 520 error("Indexing parameter N out of range (1 <= N <= 1000000)");
mas01mc@292 521
mas01mc@292 522 lsh_param_b = args_info.lsh_b_arg;
mas01mc@292 523 if(!(lsh_param_b>0 && lsh_param_b<=O2_SERIAL_MAX_TRACKBATCH))
mas01mc@292 524 error("Indexing parameter b out of range (1 <= b <= 10000)");
mas01mc@292 525
mas01mc@296 526 lsh_param_ncols = args_info.lsh_ncols_arg;
mas01mc@296 527 if(lsh_in_core) // We don't want to block rows with FORMAT2 indexing
mas01mc@296 528 lsh_param_ncols = O2_SERIAL_MAX_COLS;
mas01mc@292 529 if( !(lsh_param_ncols>0 && lsh_param_ncols<=O2_SERIAL_MAX_COLS))
mas01mc@292 530 error("Indexing parameter ncols out of range (1 <= ncols <= 1000");
mas01mc@292 531
mas01mc@292 532 return 0;
mas01mc@292 533 }
mas01mc@292 534
mas01cr@105 535 // Query command and arguments
mas01cr@105 536 if(args_info.QUERY_given){
mas01cr@105 537 command=COM_QUERY;
mas01cr@105 538 dbName=args_info.database_arg;
mas01mc@292 539 // XOR features and key search
mas01cr@370 540 if((!args_info.features_given && !args_info.key_given) || (args_info.features_given && args_info.key_given))
mas01mc@292 541 error("QUERY requires exactly one of either -f features or -k key");
mas01mc@292 542 if(args_info.features_given)
mas01mc@292 543 inFile=args_info.features_arg; // query from file
mas01mc@292 544 else{
mas01mc@292 545 query_from_key = true;
mas01mc@292 546 key=args_info.key_arg; // query from key
mas01mc@292 547 }
mas01mc@292 548
mas01cr@105 549 if(args_info.keyList_given){
mas01cr@105 550 trackFileName=args_info.keyList_arg;
mas01cr@239 551 if(strlen(trackFileName)>0 && !(trackFile = new std::ifstream(trackFileName,std::ios::in)))
mas01cr@105 552 error("Could not open keyList file for reading",trackFileName);
mas01cr@105 553 }
mas01cr@105 554
mas01cr@105 555 if(args_info.times_given){
mas01cr@105 556 timesFileName=args_info.times_arg;
mas01cr@105 557 if(strlen(timesFileName)>0){
mas01cr@239 558 if(!(timesFile = new std::ifstream(timesFileName,std::ios::in)))
mas01cr@105 559 error("Could not open times file for reading", timesFileName);
mas01cr@105 560 usingTimes=1;
mas01cr@105 561 }
mas01cr@105 562 }
mas01cr@193 563
mas01cr@193 564 if(args_info.power_given){
mas01cr@193 565 powerFileName=args_info.power_arg;
mas01cr@193 566 if(strlen(powerFileName)>0){
mas01cr@193 567 if (!(powerfd = open(powerFileName, O_RDONLY))) {
mas01cr@193 568 error("Could not open power file for reading", powerFileName, "open");
mas01cr@193 569 }
mas01cr@193 570 usingPower = 1;
mas01cr@193 571 }
mas01cr@193 572 }
mas01cr@105 573
mas01cr@105 574 // query type
mas01cr@105 575 if(strncmp(args_info.QUERY_arg, "track", MAXSTR)==0)
mas01cr@105 576 queryType=O2_TRACK_QUERY;
mas01cr@105 577 else if(strncmp(args_info.QUERY_arg, "point", MAXSTR)==0)
mas01cr@105 578 queryType=O2_POINT_QUERY;
mas01cr@105 579 else if(strncmp(args_info.QUERY_arg, "sequence", MAXSTR)==0)
mas01cr@105 580 queryType=O2_SEQUENCE_QUERY;
mas01mc@248 581 else if(strncmp(args_info.QUERY_arg, "nsequence", MAXSTR)==0)
mas01mc@248 582 queryType=O2_N_SEQUENCE_QUERY;
mas01mc@263 583 else if(strncmp(args_info.QUERY_arg, "onetoonensequence", MAXSTR)==0)
mas01mc@263 584 queryType=O2_ONE_TO_ONE_N_SEQUENCE_QUERY;
mas01cr@105 585 else
mas01cr@105 586 error("unsupported query type",args_info.QUERY_arg);
mas01cr@105 587
mas01cr@105 588 if(!args_info.exhaustive_flag){
mas01cr@105 589 queryPoint = args_info.qpoint_arg;
mas01cr@105 590 usingQueryPoint=1;
mas01cr@105 591 if(queryPoint<0 || queryPoint >10000)
mas01cr@105 592 error("queryPoint out of range: 0 <= queryPoint <= 10000");
mas01cr@105 593 }
mas01mc@292 594
mas01mc@296 595 // Whether to pre-load LSH hash tables for query (default on, if flag set then off)
mas01mc@297 596 lsh_in_core = !args_info.lsh_on_disk_flag;
mas01mc@292 597
mas01mc@292 598 // Whether to perform exact evaluation of points returned by LSH
mas01mc@292 599 lsh_exact = args_info.lsh_exact_flag;
mas01mc@292 600
mas01cr@105 601 pointNN = args_info.pointnn_arg;
mas01mc@263 602 if(pointNN < 1 || pointNN > O2_MAXNN) {
mas01mc@263 603 error("pointNN out of range: 1 <= pointNN <= 1000000");
mas01cr@105 604 }
mas01cr@105 605 trackNN = args_info.resultlength_arg;
mas01mc@263 606 if(trackNN < 1 || trackNN > O2_MAXNN) {
mas01mc@263 607 error("resultlength out of range: 1 <= resultlength <= 1000000");
mas01cr@105 608 }
mas01cr@105 609 return 0;
mas01cr@105 610 }
mas01mc@334 611
mas01mc@334 612 if(args_info.LISZT_given){
mas01mc@334 613 command = COM_LISZT;
mas01mc@334 614 dbName=args_info.database_arg;
mas01mc@334 615 lisztOffset = args_info.lisztOffset_arg;
mas01mc@334 616 lisztLength = args_info.lisztLength_arg;
mas01mc@334 617 if(args_info.lisztOffset_arg<0) // check upper bound later when database is opened
mas01mc@334 618 error("lisztOffset cannot be negative");
mas01mc@334 619 if(args_info.lisztLength_arg<0)
mas01mc@334 620 error("lisztLength cannot be negative");
mas01mc@334 621 if(lisztLength >1000000)
mas01mc@334 622 error("lisztLength too large (>1000000)");
mas01mc@334 623 return 0;
mas01mc@334 624 }
mas01mc@334 625
mas01cr@105 626 return -1; // no command found
mas01cr@0 627 }
mas01cr@0 628
mas01cr@133 629 void audioDB::status(const char* dbName, adb__statusResponse *adbStatusResponse){
mas01cr@395 630 adb_status_t status;
mas01cr@399 631 if(!adb) {
mas01cr@399 632 if(!(adb = audiodb_open(dbName, O_RDONLY))) {
mas01cr@399 633 error("Failed to open database file", dbName);
mas01cr@399 634 }
mas01cr@0 635 }
mas01cr@395 636 if(audiodb_status(adb, &status)) {
mas01cr@395 637 error("Failed to retrieve database status", dbName);
mas01cr@395 638 }
mas01cr@76 639
mas01cr@133 640 if(adbStatusResponse == 0) {
mas01cr@395 641 std::cout << "num files:" << status.numFiles << std::endl;
mas01cr@395 642 std::cout << "data dim:" << status.dim <<std::endl;
mas01cr@395 643 if(status.dim > 0) {
mas01cr@397 644 size_t bytes_per_vector = sizeof(double) * status.dim;
mas01cr@397 645 off_t nvectors = status.length / bytes_per_vector;
mas01cr@397 646 off_t data_region_vectors = status.data_region_size / bytes_per_vector;
mas01cr@395 647 std::cout << "total vectors:" << nvectors << std::endl;
mas01cr@395 648 std::cout << "vectors available:";
mas01cr@395 649 if(status.flags & O2_FLAG_LARGE_ADB) {
mas01cr@395 650 std::cout << O2_MAX_VECTORS - nvectors << std::endl;
mas01cr@395 651 } else {
mas01cr@395 652 std::cout << data_region_vectors - nvectors << std::endl;
mas01cr@395 653 }
mas01cr@76 654 }
mas01cr@395 655 if(!(status.flags & O2_FLAG_LARGE_ADB)) {
mas01cr@395 656 double used_frac = ((double) status.length) / status.data_region_size;
mas01cr@395 657 std::cout << "total bytes:" << status.length <<
mas01cr@395 658 " (" << (100.0*used_frac) << "%)" << std::endl;
mas01cr@395 659 std::cout << "bytes available:" << status.data_region_size - status.length <<
mas01cr@395 660 " (" << (100.0*(1-used_frac)) << "%)" << std::endl;
mas01mc@324 661 }
mas01cr@395 662 std::cout << "flags:" << " l2norm[" << DISPLAY_FLAG(status.flags&O2_FLAG_L2NORM)
mas01cr@395 663 << "] minmax[" << DISPLAY_FLAG(status.flags&O2_FLAG_MINMAX)
mas01cr@395 664 << "] power[" << DISPLAY_FLAG(status.flags&O2_FLAG_POWER)
mas01cr@395 665 << "] times[" << DISPLAY_FLAG(status.flags&O2_FLAG_TIMES)
mas01cr@395 666 << "] largeADB[" << DISPLAY_FLAG(status.flags&O2_FLAG_LARGE_ADB)
mas01mc@324 667 << "]" << endl;
mas01mc@324 668
mas01cr@395 669 std::cout << "null count: " << status.nullCount << " small sequence count " << status.dudCount-status.nullCount << std::endl;
mas01cr@76 670 } else {
mas01cr@395 671 adbStatusResponse->result.numFiles = status.numFiles;
mas01cr@395 672 adbStatusResponse->result.dim = status.dim;
mas01cr@395 673 adbStatusResponse->result.length = status.length;
mas01cr@395 674 adbStatusResponse->result.dudCount = status.dudCount;
mas01cr@395 675 adbStatusResponse->result.nullCount = status.nullCount;
mas01cr@395 676 adbStatusResponse->result.flags = status.flags;
mas01cr@76 677 }
mas01cr@0 678 }
mas01cr@0 679
mas01cr@196 680 void audioDB::l2norm(const char* dbName) {
mas01cr@401 681 if(!adb) {
mas01cr@401 682 if(!(adb = audiodb_open(dbName, O_RDWR))) {
mas01cr@401 683 error("Failed to open database file", dbName);
mas01cr@401 684 }
mas01cr@0 685 }
mas01cr@401 686 if(audiodb_l2norm(adb)) {
mas01cr@401 687 error("failed to turn on l2norm flag for database", dbName);
mas01cr@401 688 }
mas01cr@0 689 }
mas01cr@193 690
mas01cr@193 691 void audioDB::power_flag(const char *dbName) {
mas01cr@400 692 if(!adb) {
mas01cr@400 693 if(!(adb = audiodb_open(dbName, O_RDWR))) {
mas01cr@400 694 error("Failed to open database file", dbName);
mas01cr@400 695 }
mas01cr@193 696 }
mas01cr@400 697 if(audiodb_power(adb)) {
mas01cr@400 698 error("can't turn on power flag for database", dbName);
mas01cr@400 699 }
mas01cr@193 700 }
mas01cr@193 701
mas01cr@385 702 void audioDB::create(const char *dbName) {
mas01cr@399 703 if(adb) {
mas01cr@399 704 error("Already have an adb in this object", "");
mas01cr@399 705 }
mas01cr@391 706 if(!(adb = audiodb_create(dbName, datasize, ntracks, datadim))) {
mas01cr@392 707 error("Failed to create database file", dbName);
mas01cr@385 708 }
mas01cr@385 709 }
mas01cr@385 710
mas01cr@399 711 void audioDB::dump(const char *dbName) {
mas01cr@399 712 if(!adb) {
mas01cr@399 713 if(!(adb = audiodb_open(dbName, O_RDONLY))) {
mas01cr@399 714 error("Failed to open database file", dbName);
mas01cr@399 715 }
mas01cr@399 716 }
mas01cr@399 717 if(audiodb_dump(adb, output)) {
mas01cr@399 718 error("Failed to dump database to ", output);
mas01cr@399 719 }
mas01cr@399 720 status(dbName);
mas01cr@399 721 }
mas01cr@193 722
mas01cr@409 723 void audioDB::insert(const char* dbName, const char* inFile) {
mas01cr@409 724 if(!adb) {
mas01cr@409 725 if(!(adb = audiodb_open(dbName, O_RDWR))) {
mas01cr@409 726 error("failed to open database", dbName);
mas01cr@409 727 }
mas01cr@409 728 }
mas01cr@409 729
mas01cr@409 730 /* at this point, we have powerfd (an fd), timesFile (a
mas01cr@409 731 * std::ifstream *) and inFile (a char *). Wacky, huh? Ignore
mas01cr@409 732 * the wackiness and just use the names. */
mas01cr@409 733 adb_insert_t insert;
mas01cr@409 734 insert.features = inFile;
mas01cr@409 735 insert.times = timesFileName;
mas01cr@409 736 insert.power = powerFileName;
mas01cr@409 737 insert.key = key;
mas01cr@409 738
mas01cr@409 739 if(audiodb_insert(adb, &insert)) {
mas01cr@409 740 error("insertion failure", inFile);
mas01cr@409 741 }
mas01cr@409 742 status(dbName);
mas01cr@409 743 }
mas01cr@409 744
mas01cr@409 745 void audioDB::batchinsert(const char* dbName, const char* inFile) {
mas01cr@409 746 if(!adb) {
mas01cr@409 747 if(!(adb = audiodb_open(dbName, O_RDWR))) {
mas01cr@409 748 error("failed to open database", dbName);
mas01cr@409 749 }
mas01cr@409 750 }
mas01cr@409 751
mas01cr@409 752 if(!key)
mas01cr@409 753 key=inFile;
mas01cr@409 754 std::ifstream *filesIn = 0;
mas01cr@409 755 std::ifstream *keysIn = 0;
mas01cr@409 756
mas01cr@409 757 if(!(filesIn = new std::ifstream(inFile)))
mas01cr@409 758 error("Could not open batch in file", inFile);
mas01cr@409 759 if(key && key!=inFile)
mas01cr@409 760 if(!(keysIn = new std::ifstream(key)))
mas01cr@409 761 error("Could not open batch key file",key);
mas01cr@409 762
mas01cr@409 763 unsigned totalVectors=0;
mas01cr@409 764 char *thisFile = new char[MAXSTR];
mas01cr@409 765 char *thisKey = 0;
mas01cr@409 766 if (key && (key != inFile)) {
mas01cr@409 767 thisKey = new char[MAXSTR];
mas01cr@409 768 }
mas01cr@409 769 char *thisTimesFileName = new char[MAXSTR];
mas01cr@409 770 char *thisPowerFileName = new char[MAXSTR];
mas01cr@409 771
mas01cr@409 772 do {
mas01cr@409 773 filesIn->getline(thisFile,MAXSTR);
mas01cr@409 774 if(key && key!=inFile) {
mas01cr@409 775 keysIn->getline(thisKey,MAXSTR);
mas01cr@409 776 } else {
mas01cr@409 777 thisKey = thisFile;
mas01cr@409 778 }
mas01cr@409 779 if(usingTimes) {
mas01cr@409 780 timesFile->getline(thisTimesFileName,MAXSTR);
mas01cr@409 781 }
mas01cr@409 782 if(usingPower) {
mas01cr@409 783 powerFile->getline(thisPowerFileName, MAXSTR);
mas01cr@409 784 }
mas01cr@409 785
mas01cr@409 786 if(filesIn->eof()) {
mas01cr@409 787 break;
mas01cr@409 788 }
mas01cr@409 789 if(usingTimes){
mas01cr@409 790 if(timesFile->eof()) {
mas01cr@409 791 error("not enough timestamp files in timesList", timesFileName);
mas01cr@409 792 }
mas01cr@409 793 }
mas01cr@409 794 if (usingPower) {
mas01cr@409 795 if(powerFile->eof()) {
mas01cr@409 796 error("not enough power files in powerList", powerFileName);
mas01cr@409 797 }
mas01cr@409 798 }
mas01cr@409 799 adb_insert_t insert;
mas01cr@409 800 insert.features = thisFile;
mas01cr@409 801 insert.times = usingTimes ? thisTimesFileName : NULL;
mas01cr@409 802 insert.power = usingPower ? thisPowerFileName : NULL;
mas01cr@409 803 insert.key = thisKey;
mas01cr@409 804 if(audiodb_insert(adb, &insert)) {
mas01cr@409 805 error("insertion failure", thisFile);
mas01cr@409 806 }
mas01cr@409 807 } while(!filesIn->eof());
mas01cr@409 808
mas01cr@409 809 VERB_LOG(0, "%s %s %u vectors %ju bytes.\n", COM_BATCHINSERT, dbName, totalVectors, (intmax_t) (totalVectors * dbH->dim * sizeof(double)));
mas01cr@409 810
mas01cr@409 811 delete [] thisPowerFileName;
mas01cr@409 812 if(key && (key != inFile)) {
mas01cr@409 813 delete [] thisKey;
mas01cr@409 814 }
mas01cr@409 815 delete [] thisFile;
mas01cr@409 816 delete [] thisTimesFileName;
mas01cr@409 817
mas01cr@409 818 delete filesIn;
mas01cr@409 819 delete keysIn;
mas01cr@409 820
mas01cr@409 821 // Report status
mas01cr@409 822 status(dbName);
mas01cr@409 823 }
mas01cr@409 824
mas01mc@308 825 // This entry point is visited once per instance
mas01mc@308 826 // so it is a good place to set any global state variables
mas01cr@370 827 int main(const int argc, const char* argv[]){
mas01mc@324 828 SERVER_ADB_ROOT = 0; // Server-side database root prefix
mas01mc@324 829 SERVER_ADB_FEATURE_ROOT = 0; // Server-side features root prefix
mas01cr@0 830 audioDB(argc, argv);
mas01cr@0 831 }
mas01ik@355 832
mas01ik@355 833
mas01ik@355 834 extern "C" {
mas01ik@355 835
mas01ik@355 836 /* for API questions contact
mas01ik@355 837 * Christophe Rhodes c.rhodes@gold.ac.uk
mas01ik@355 838 * Ian Knopke mas01ik@gold.ac.uk, ian.knopke@gmail.com */
mas01ik@355 839
mas01ik@355 840 int audiodb_query(adb_ptr mydb, adb_query_ptr adbq, adb_queryresult_ptr adbqr){
mas01ik@355 841
mas01cr@370 842 const char *argv[32];
mas01ik@355 843 int argvctr=0;
mas01ik@355 844 char tempstr1[200];
mas01ik@355 845 char tempstr2[200];
mas01ik@355 846 char tempstr3[200];
mas01ik@355 847 int apierror=0;
mas01ik@355 848
mas01ik@355 849 adb__queryResponse adbQueryResponse;
mas01ik@355 850
mas01ik@355 851 /* TODO: may need error checking here */
mas01ik@355 852 /* currently counting on audioDB binary to fail for me */
mas01ik@355 853 argv[argvctr++]="audioDB";
mas01ik@355 854
mas01ik@355 855 if(adbq->querytype){
mas01ik@355 856 argv[argvctr++]="-Q";
mas01ik@355 857 argv[argvctr++]=adbq->querytype;
mas01ik@355 858 }
mas01ik@355 859
mas01cr@388 860 if(mydb->path){
mas01ik@355 861 argv[argvctr++]="-d";
mas01cr@388 862 argv[argvctr++]=mydb->path;
mas01ik@355 863 }
mas01ik@355 864
mas01ik@355 865 if (adbq->feature){
mas01ik@355 866 argv[argvctr++]="-f";
mas01ik@355 867 argv[argvctr++]=adbq->feature;
mas01ik@355 868 }
mas01ik@355 869
mas01ik@355 870 if (adbq->power){
mas01ik@355 871 argv[argvctr++]="-w";
mas01ik@355 872 argv[argvctr++]=adbq->power;
mas01ik@355 873 }
mas01ik@355 874
mas01ik@355 875 if (adbq->qpoint){
mas01ik@355 876 argv[argvctr++]="-p";
mas01ik@355 877 argv[argvctr++]=adbq->qpoint;
mas01ik@355 878 }
mas01ik@355 879 if (adbq->numpoints){
mas01ik@355 880 argv[argvctr++]="-n";
mas01ik@355 881 argv[argvctr++]=adbq->numpoints;
mas01ik@355 882 }
mas01ik@355 883 if (adbq->radius){
mas01ik@355 884 argv[argvctr++]="-R";
mas01ik@355 885 argv[argvctr++]=adbq->radius;
mas01ik@355 886 }
mas01ik@355 887 if(adbq->resultlength){
mas01ik@355 888 argv[argvctr++]="-r";
mas01ik@355 889 argv[argvctr++]=adbq->resultlength;
mas01ik@355 890 }
mas01ik@355 891 if(adbq->sequencelength){
mas01ik@355 892 argv[argvctr++]="-l";
mas01ik@355 893 argv[argvctr++]=adbq->sequencelength;
mas01ik@355 894 }
mas01ik@355 895 if(adbq->sequencehop){
mas01ik@355 896 argv[argvctr++]="-h";
mas01ik@355 897 argv[argvctr++]=adbq->sequencehop;
mas01ik@355 898 }
mas01ik@355 899
mas01ik@355 900 if (adbq->absolute_threshold){
mas01ik@355 901 argv[argvctr++]="--absolute-threshold";
mas01ik@355 902 snprintf(tempstr1,sizeof(tempstr1),"%f",adbq->absolute_threshold);
mas01ik@355 903 argv[argvctr++]=tempstr1;
mas01ik@355 904 }
mas01ik@355 905
mas01ik@355 906 if (adbq->relative_threshold){
mas01ik@355 907 argv[argvctr++]="--relative-threshold";
mas01ik@355 908 snprintf(tempstr2,sizeof(tempstr2),"%f",adbq->relative_threshold);
mas01ik@355 909 argv[argvctr++]=tempstr2;
mas01ik@355 910 }
mas01ik@355 911
mas01ik@355 912 if (adbq->exhaustive){
mas01ik@355 913 argv[argvctr++]="--exhaustive";
mas01ik@355 914 }
mas01ik@355 915
mas01ik@355 916 if (adbq->expandfactor){
mas01ik@355 917 argv[argvctr++]="--expandfactor";
mas01ik@355 918 snprintf(tempstr3,sizeof(tempstr3),"%f",adbq->expandfactor);
mas01ik@355 919 argv[argvctr++]=tempstr3;
mas01ik@355 920 }
mas01ik@355 921
mas01ik@355 922 if (adbq->rotate){
mas01ik@355 923 argv[argvctr++]="--rotate";
mas01ik@355 924 }
mas01ik@355 925
mas01ik@355 926 if (adbq->keylist){
mas01ik@355 927 argv[argvctr++]="-K";
mas01ik@355 928 argv[argvctr++]=adbq->keylist;
mas01ik@355 929 }
mas01cr@382 930 argv[argvctr]='\0';
mas01ik@355 931
mas01ik@355 932 /* debugging */
mas01ik@355 933
mas01cr@395 934 audioDB::audioDB(argvctr,argv, &adbQueryResponse, &apierror,mydb);
mas01ik@355 935
mas01ik@355 936 //copy data over here from adbQueryResponse to adbqr
mas01ik@355 937 adbqr->sizeRlist=adbQueryResponse.result.__sizeRlist;
mas01ik@355 938 adbqr->sizeDist=adbQueryResponse.result.__sizeDist;
mas01ik@355 939 adbqr->sizeQpos=adbQueryResponse.result.__sizeQpos;
mas01ik@355 940 adbqr->sizeSpos=adbQueryResponse.result.__sizeSpos;
mas01ik@355 941 adbqr->Rlist=adbQueryResponse.result.Rlist;
mas01ik@355 942 adbqr->Dist=adbQueryResponse.result.Dist;
mas01ik@355 943 adbqr->Qpos=adbQueryResponse.result.Qpos;
mas01ik@355 944 adbqr->Spos=adbQueryResponse.result.Spos;
mas01ik@355 945
mas01ik@355 946 return apierror;
mas01ik@355 947 }
mas01ik@355 948 }
mas01ik@355 949