comparison audioDB.cpp @ 332:a0493f861531

Added new tests for indexed query over WS. Fixed potential NULL string dereference in audioDB.cpp
author mas01mc
date Sun, 31 Aug 2008 08:45:22 +0000
parents 8f11ea4d9cd2
children 100cf66a5825
comparison
equal deleted inserted replaced
331:0c908093082f 332:a0493f861531
56 batchinsert(dbName, inFile); 56 batchinsert(dbName, inFile);
57 57
58 else if(O2_ACTION(COM_QUERY)) 58 else if(O2_ACTION(COM_QUERY))
59 if(isClient){ 59 if(isClient){
60 if(query_from_key){ 60 if(query_from_key){
61 VERB_LOG(1, "Calling web services query %s on database %s, query=%s\n", radius>0?"(Radius)":"(NN)", dbName, strlen(key)?key:inFile); 61 VERB_LOG(1, "Calling web services query %s on database %s, query=%s\n", radius>0?"(Radius)":"(NN)", dbName, (key&&strlen(key))?key:inFile);
62 ws_query_by_key(dbName, key, inFile, (char*)hostport); 62 ws_query_by_key(dbName, key, inFile, (char*)hostport);
63 } 63 }
64 else{ 64 else{
65 VERB_LOG(1, "Calling web services query on database %s, query=%s\n", dbName, strlen(key)?key:inFile); 65 VERB_LOG(1, "Calling web services query on database %s, query=%s\n", dbName, (key&&strlen(key))?key:inFile);
66 ws_query(dbName, inFile, (char*)hostport); 66 ws_query(dbName, inFile, (char*)hostport);
67 } 67 }
68 } 68 }
69 else 69 else
70 query(dbName, inFile); 70 query(dbName, inFile);