fixed silly mistake in query string handling

src/zmapServer/pipe/pipeServer.c

@@ -34,7 +34,7 @@
  * HISTORY:
  * Last edited: Nov 30 09:18 2009 (edgrif)
  * Created: 2009-11-26 12:02:40 (mh17)
- * CVS info:   $Id: pipeServer.c,v 1.10 2009-12-15 15:24:02 mh17 Exp $
+ * CVS info:   $Id: pipeServer.c,v 1.11 2009-12-16 08:58:49 mh17 Exp $
  *-------------------------------------------------------------------
  */
 
@@ -225,7 +225,7 @@ static gboolean createConnection(void **server_out,
   }
 
   if(url->query)
-      server->query = g_strdup_printf("(%s)",url->query);
+      server->query = g_strdup_printf("%s",url->query);
   else
       server->query = g_strdup("");
       
@@ -243,7 +243,7 @@ static gboolean createConnection(void **server_out,
 
 
 /* 
- * fork and exec the script and read teh output via a pipe
+ * fork and exec the script and read the output via a pipe
  * no data sent to STDIN and STDERR ignored
  * in case of errors or hangups eventually we will time out and an error popped up.
  * downside is limited to not having the data, which is what happens anyway
@@ -281,7 +281,7 @@ static gboolean pipe_server_spawn(PipeServer server,GError **error)
     g_io_channel_set_flags(server->gff_stderr,G_IO_FLAG_NONBLOCK,&pipe_error);
   }
 
-  g_free(argv);   // strings allocated and freed seperately
+  g_free(argv);   // strings allocated and freed seperatelygetgff.pl
   g_strfreev(q_args);
   if(server->zmap_start || server->zmap_end)
   {

src/zmapServer/pipe/pipeServer_P.h

@@ -28,7 +28,7 @@
  *              
  * HISTORY:
  * Created: Thu Nov 26 10:30:21 2009 (mh17)
- * CVS info:   $Id: pipeServer_P.h,v 1.5 2009-12-07 12:53:42 mh17 Exp $
+ * CVS info:   $Id: pipeServer_P.h,v 1.6 2009-12-16 08:59:10 mh17 Exp $
  *-------------------------------------------------------------------
  */
 #ifndef PIPE_SERVER_P_H
@@ -36,6 +36,7 @@
 
 
 #define PIPE_PROTOCOL_STR "GFF Pipe"			    /* For error messages. */
+#define FILE_PROTOCOL_STR "GFF File"
 
 #define PIPE_MAX_ARGS	4	// extra args we add on to the query, including the program and terminating NULL
 #define PIPE_ARG_ZMAP_START	"zmap_start"
@@ -63,10 +64,11 @@ typedef struct _PipeServerStruct
 
   gboolean error ;					    /* TRUE if any error occurred. */
   char *last_err_msg ;
+  char *protocol;             // GFF Pipe or File
 
   ZMapFeatureContext req_context ;
 
 } PipeServerStruct, *PipeServer ;
 
 
-#endif /* !FILE_SERVER_P_H */
+#endif /* PIPE_SERVER_P_H */

src/zmapServer/zmapServerPrototype.h

@@ -30,7 +30,7 @@
  * HISTORY:
  * Last edited: Oct  2 08:09 2009 (edgrif)
  * Created: Wed Aug  6 15:48:47 2003 (edgrif)
- * CVS info:   $Id: zmapServerPrototype.h,v 1.30 2009-12-03 15:03:08 mh17 Exp $
+ * CVS info:   $Id: zmapServerPrototype.h,v 1.31 2009-12-16 08:59:29 mh17 Exp $
  *-------------------------------------------------------------------
  */
 #ifndef ZMAP_SERVER_PROTOTYPEP_H
@@ -130,7 +130,7 @@ void pipeGetServerFuncs(ZMapServerFuncs pipe_funcs) ;
 
 /* Try to give consistent messages/logging.... */
 #define ZMAP_SERVER_MSGPREFIX "Server %s:%s - "
-#define ZMAP_PIPESERVER_MSGPREFIX "Server %s:%s(%s) - "
+#define ZMAP_PIPESERVER_MSGPREFIX "Server %s:%s %s - "
 
 /* LOGTYPE just be one of the zMapLogXXXX types, i.e. Message, Warning, Critical or Fatal */
 #define ZMAPSERVER_LOG(LOGTYPE, PROTOCOL, HOST, FORMAT, ...) \