comparison audioDB.cpp @ 328:7ff56cce3297

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

     printf("%s\n", gengetopt_args_info_help[0]);
     error("No command found");
   }
 
   // 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();
 
   else  if(O2_ACTION(COM_CREATE))

     batchinsert(dbName, inFile);
 
   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);
     }
     else
       query(dbName, inFile);

 {
   try {
     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) {
     cleanup();
     throw(err);

 {
   try {
     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) {
     cleanup();
     throw(err);