# HG changeset patch
# User mas01mc
# Date 1220139313 0
# Node ID 0c908093082f4fa2ba9b80d138d86fca08653f7b
# Parent  b1c48012cd3d767ccaaff3a02dae52783c6d2af0
fixed another potential NULL string de-reference in soap.cpp

diff -r b1c48012cd3d -r 0c908093082f soap.cpp
--- a/soap.cpp	Sat Aug 30 15:47:53 2008 +0000
+++ b/soap.cpp	Sat Aug 30 23:35:13 2008 +0000
@@ -68,8 +68,7 @@
       asqp.usingQueryPoint = usingQueryPoint;
       asqp.lsh_exact = lsh_exact;
   */
-  VERB_LOG(1, "Calling %s query on database %s with %s=%s\n", strlen(trackKey)?"KEY":"FILENAME", dbName, strlen(trackKey)?"KEY":"FILENAME",
-	   strlen(trackKey)?trackKey:featureFileName);
+  VERB_LOG(1, "Calling %s query on database %s with %s=%s\n", (trackKey&&strlen(trackKey))?"KEY":"FILENAME", dbName, (trackKey&&strlen(trackKey))?"KEY":"FILENAME",(trackKey&&strlen(trackKey))?trackKey:featureFileName);
   soap_init(&soap);  
   if(queryType==O2_SEQUENCE_QUERY || queryType==O2_N_SEQUENCE_QUERY){
     if(soap_call_adb__sequenceQueryByKey(&soap,hostport,NULL,
@@ -205,8 +204,7 @@
   char absolute_thresholdStr[256];
   char qtypeStr[256];
 
-  fprintf(stderr, "Calling %s query on database %s with %s=%s\n", strlen(trackKey)?"KEY":"FILENAME", dbName, strlen(trackKey)?"KEY":"FILENAME",
-	   strlen(trackKey)?trackKey:featureFileName);
+  fprintf(stderr, "Calling %s query on database %s with %s=%s\n", (trackKey&&strlen(trackKey))?"KEY":"FILENAME", dbName, (trackKey&&strlen(trackKey))?"KEY":"FILENAME",(trackKey&&strlen(trackKey))?trackKey:featureFileName);
 
   /* When the branch is merged, move this to a header and use it
      elsewhere */