diff audioDB.cpp @ 328:7ff56cce3297

Added WS support for Radius search by featureFileName via adb__sequenceQueryByKey(). Added relative path support for non-large ADB.

--- a/audioDB.cpp	Fri Aug 29 20:16:10 2008 +0000
+++ b/audioDB.cpp	Sat Aug 30 13:41:50 2008 +0000
@@ -37,9 +37,12 @@
   }
 
   // Perform database prefix substitution
-  if(adb_root)
+  if(dbName && adb_root)
     prefix_name((char** const)&dbName, adb_root);
 
+  if(inFile && adb_feature_root)
+    prefix_name((char** const)&inFile, adb_feature_root);
+
   if(O2_ACTION(COM_SERVER))
     startServer();
 
@@ -55,7 +58,7 @@
   else if(O2_ACTION(COM_QUERY))
     if(isClient){
       if(query_from_key)
-	ws_query_by_key(dbName, key, (char*)hostport);	
+	ws_query_by_key(dbName, key, inFile, (char*)hostport);	
       else
 	ws_query(dbName, inFile, (char*)hostport);
     }
@@ -93,8 +96,10 @@
     isServer = 1; // FIXME: Hack
     processArgs(argc, argv);
     // Perform database prefix substitution
-    if(adb_root)
+    if(dbName && adb_root)
       prefix_name((char** const)&dbName, adb_root);
+    if(inFile && adb_feature_root)
+      prefix_name((char** const)&inFile, adb_feature_root);
     assert(O2_ACTION(COM_QUERY));
     query(dbName, inFile, adbQueryResponse);
   } catch(char *err) {
@@ -109,8 +114,10 @@
     isServer = 1; // FIXME: Hack
     processArgs(argc, argv);
     // Perform database prefix substitution
-    if(adb_root)
+    if(dbName && adb_root)
       prefix_name((char** const)&dbName, adb_root);
+    if(inFile && adb_feature_root)
+      prefix_name((char** const)&inFile, adb_feature_root);
     assert(O2_ACTION(COM_STATUS));
     status(dbName, adbStatusResponse);
   } catch(char *err) {