annotate 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.
author mas01cr
date Mon, 01 Sep 2008 15:35:05 +0000
parents 7ff56cce3297
children 100cf66a5825
rev   line source
mas01cr@0 1 // audioDBws.h -- web services interface to audioDB
mas01cr@0 2 //
mas01cr@22 3 //FIXME: this hard-coding of the service location might be right for
mas01cr@22 4 //its internal use at Goldsmiths (for now) but really isn't in
mas01cr@22 5 //general. Find a way to bind this later (at install time? Or maybe
mas01cr@22 6 //just require that the installer edit the resulting wsdl file?)
mas01cr@0 7 //
mas01cr@22 8 //gsoap adb service location: http://gibbons.doc.gold.ac.uk:20703/
mas01cr@0 9
mas01cr@0 10 typedef int xsd__int;
mas01cr@0 11 typedef double xsd__double;
mas01cr@0 12 typedef char* xsd__string;
mas01cr@0 13
mas01cr@0 14 // Supports result lists of arbitrary length
mas01cr@133 15 struct adb__queryResult{
mas01cr@0 16 int __sizeRlist;
mas01cr@0 17 char **Rlist; // Maximum size of result list
mas01cr@0 18 int __sizeDist;
mas01cr@0 19 double *Dist;
mas01cr@0 20 int __sizeQpos;
mas01cr@86 21 unsigned int *Qpos;
mas01cr@0 22 int __sizeSpos;
mas01cr@86 23 unsigned int *Spos;
mas01cr@0 24 };
mas01cr@0 25
mas01cr@133 26 struct adb__statusResult {
mas01cr@76 27 unsigned numFiles;
mas01cr@76 28 unsigned dim;
mas01cr@76 29 unsigned length;
mas01cr@76 30 unsigned dudCount;
mas01cr@76 31 unsigned nullCount;
mas01cr@76 32 unsigned flags;
mas01cr@76 33 };
mas01cr@133 34
mas01cr@133 35 struct adb__statusResponse {
mas01cr@133 36 struct adb__statusResult result;
mas01cr@133 37 };
mas01cr@133 38
mas01cr@133 39 struct adb__queryResponse {
mas01cr@133 40 struct adb__queryResult result;
mas01cr@133 41 };
mas01cr@133 42
mas01cr@0 43 // Print the status of an existing adb database
mas01cr@133 44 int adb__status(xsd__string dbName, struct adb__statusResponse &adbStatusResponse);
mas01cr@0 45
mas01cr@0 46 // Query an existing adb database
mas01cr@333 47 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);
mas01cr@193 48
mas01mc@328 49 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);