diff audioDBws.h @ 333:cc3f9d1ca2cd

Ugly hack upon ugly hack:

* extend adb__query() to take a bunch of other arguments that allow
  useful functionality through to the SOAP server;
* alter the RadiusQuery reporter so that the count for tracks is
  returned through SOAP, punning one of the result fields for the
  purpose;
* alter argv construction to be more dynamic, to reflect that the very
  presence of some arguments changes audioDB behaviour.

Now test 0020 passes, only some 12 months after it was originally
written, yay.  Alter test 0050 also, so that the results are actually
vaguely what would be expected from a radius search; they are not
completely checked for correctness, but are (apart from the last two)
the same as test 0040.

I believe that the modifications are backward compatible; lightly
testing with an old audioDB binary suggests that old-format SOAP queries
continue to work.  Currently too baby-encumbered to think of how to test
this fully.

--- a/audioDBws.h	Sun Aug 31 08:45:22 2008 +0000
+++ b/audioDBws.h	Mon Sep 01 15:35:05 2008 +0000
@@ -44,6 +44,6 @@
 int adb__status(xsd__string dbName, struct adb__statusResponse &adbStatusResponse);
 
 // Query an existing adb database
-int adb__query(xsd__string dbName, xsd__string qKey, xsd__string keyList, xsd__string timesFileName, xsd__int qType, xsd__int qPos, xsd__int pointNN, xsd__int segNN, xsd__int segLen, struct adb__queryResponse &adbQueryResponse);
+int adb__query(xsd__string dbName, xsd__string qKey, xsd__string keyList, xsd__string timesFileName, xsd__string powerFileName, xsd__int qType, xsd__int qPos, xsd__int pointNN, xsd__int segNN, xsd__int segLen, xsd__double radius, xsd__double absolute_threshold, xsd__double relative_threshold, xsd__int exhaustive, xsd__int lsh_exact, struct adb__queryResponse &adbQueryResponse);
 
 int adb__sequenceQueryByKey(xsd__string dbName,xsd__string trackKey, xsd__string featureFileName, xsd__int queryType,xsd__string trackFileName,xsd__string timesFileName,xsd__int queryPoint,xsd__int pointNN,xsd__int trackNN,xsd__int sequenceLength,xsd__double radius,xsd__double absolute_threshold,xsd__int usingQueryPoint,xsd__int lsh_exact,struct adb__queryResponse &adbQueryResponse);