comparison soap.cpp @ 310:435ffdaecae9

Added Web Services support for --exhaustive and --lsh_exact flags in Radius sequence searches.

   asqp.trackNN = trackNN;
   asqp.sequenceLength = sequenceLength;
   asqp.radius = radius;
   asqp.relative_threshold = relative_threshold;
   asqp.absolute_threshold = absolute_threshold;
+  asqp.usingQueryPoint = usingQueryPoint;
+  asqp.lsh_exact = lsh_exact;
 
   soap_init(&soap);  
   if(queryType==O2_SEQUENCE_QUERY || queryType==O2_N_SEQUENCE_QUERY){
     if(soap_call_adb__sequenceQuery_by_key(&soap,hostport,NULL,(char*)dbName,(char*)trackKey,queryType,&asqp,adbQueryResponse)==SOAP_OK){
       //std::std::cerr << "result list length:" << adbQueryResponse.result.__sizeRlist << std::std::endl;

 
   // WS queries only support 1-nearest neighbour point reporting
   // at the moment, until we figure out how to better serve results
   snprintf(qtypeStr, 256, "nsequence");
 
-  const char *argv[] = {
+  const char *argv[]={
     "./audioDB",
     COM_QUERY,
     qtypeStr,
     COM_DATABASE,
     dbName, 
     COM_QUERYKEY,
     ENSURE_STRING(qKey),
     COM_KEYLIST,
     ENSURE_STRING(parms->keyList),
-    COM_QPOINT, 
-    qPosStr,
+    parms->usingQueryPoint?COM_QPOINT:COM_EXHAUSTIVE, 
+    parms->usingQueryPoint?qPosStr:"",
     COM_POINTNN,
     pointNNStr,
     COM_TRACKNN,
     trackNNStr,
     COM_RADIUS,
     radiusStr,
     COM_SEQLEN,
     seqLenStr,
     COM_ABSOLUTE_THRESH,
-    absolute_thresholdStr
+    absolute_thresholdStr,
+    parms->lsh_exact?COM_LSH_EXACT:""
   };
 
-  const unsigned argc = 21;
-
+  const unsigned argc = 22;
+  
+ 
   try {
     audioDB(argc, (char* const*)argv, &adbQueryResponse);
     return SOAP_OK;
   } catch (char *err) {
     soap_receiver_fault(soap, err, "");