From 3a0cb900e955b3f9f82f2ef61a9cfacbbed98de4 Mon Sep 17 00:00:00 2001
From: edgrif <edgrif>
Date: Thu, 16 Apr 2009 09:08:15 +0000
Subject: [PATCH] update getfeaturesetnames() signature for new hash param.
---
src/zmapServer/das/dasServer.c | 14 ++++++++++----
src/zmapServer/file/fileServer.c | 13 +++++++++----
2 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/src/zmapServer/das/dasServer.c b/src/zmapServer/das/dasServer.c
index 1a56be75f..b4d33bad5 100755
--- a/src/zmapServer/das/dasServer.c
+++ b/src/zmapServer/das/dasServer.c
@@ -26,9 +26,9 @@
*
* Exported functions: See ZMap/zmapServerPrototype.h
* HISTORY:
- * Last edited: Feb 4 15:41 2009 (edgrif)
+ * Last edited: Apr 16 09:37 2009 (edgrif)
* Created: Wed Aug 6 15:46:38 2003 (edgrif)
- * CVS info: $Id: dasServer.c,v 1.36 2009-02-04 16:14:18 edgrif Exp $
+ * CVS info: $Id: dasServer.c,v 1.37 2009-04-16 09:08:15 edgrif Exp $
*-------------------------------------------------------------------
*/
@@ -90,7 +90,10 @@ static ZMapServerResponseType openConnection(void *server) ;
static ZMapServerResponseType getStyles(void *server, GData **styles_out) ;
static ZMapServerResponseType haveModes(void *server, gboolean *have_mode) ;
static ZMapServerResponseType getSequences(void *server_in, GList *sequences_inout) ;
-static ZMapServerResponseType getFeatureSets(void *server, GList **feature_sets_out, GList **required_styles) ;
+static ZMapServerResponseType getFeatureSets(void *server,
+ GList **feature_sets_out,
+ GList **required_styles,
+ GHashTable **featureset_2_stylelist_inout) ;
static ZMapServerResponseType setContext(void *server, ZMapFeatureContext feature_context);
static ZMapServerResponseType getFeatures(void *server_in, GData *styles, ZMapFeatureContext feature_context) ;
static ZMapServerResponseType getContextSequence(void *server_in, GData *styles, ZMapFeatureContext feature_context) ;
@@ -433,7 +436,10 @@ static ZMapServerResponseType getSequences(void *server_in, GList *sequences_ino
*
* I haven't filled it in as there was no original code to do this.
* */
-static ZMapServerResponseType getFeatureSets(void *server, GList **feature_sets_out, GList **required_styles)
+static ZMapServerResponseType getFeatureSets(void *server,
+ GList **feature_sets_out,
+ GList **required_styles,
+ GHashTable **featureset_2_stylelist_inout)
{
ZMapServerResponseType result = ZMAP_SERVERRESPONSE_OK;
diff --git a/src/zmapServer/file/fileServer.c b/src/zmapServer/file/fileServer.c
index fb79b98c0..8913bba65 100755
--- a/src/zmapServer/file/fileServer.c
+++ b/src/zmapServer/file/fileServer.c
@@ -30,9 +30,9 @@
*
* Exported functions: See ZMap/zmapServerPrototype.h
* HISTORY:
- * Last edited: Feb 4 15:27 2009 (edgrif)
+ * Last edited: Apr 16 08:56 2009 (edgrif)
* Created: Fri Sep 10 18:29:18 2004 (edgrif)
- * CVS info: $Id: fileServer.c,v 1.35 2009-02-04 16:14:41 edgrif Exp $
+ * CVS info: $Id: fileServer.c,v 1.36 2009-04-16 09:08:15 edgrif Exp $
*-------------------------------------------------------------------
*/
@@ -69,7 +69,10 @@ static gboolean createConnection(void **server_out,
static ZMapServerResponseType openConnection(void *server) ;
static ZMapServerResponseType getInfo(void *server, char **database_path) ;
-static ZMapServerResponseType getFeatureSetNames(void *server, GList **feature_sets_out, GList **required_styles) ;
+static ZMapServerResponseType getFeatureSetNames(void *server,
+ GList **feature_sets_out,
+ GList **required_styles,
+ GHashTable **featureset_2_stylelist_inout) ;
static ZMapServerResponseType getStyles(void *server, GData **styles_out) ;
static ZMapServerResponseType haveModes(void *server, gboolean *have_mode) ;
static ZMapServerResponseType getSequences(void *server_in, GList *sequences_inout) ;
@@ -281,7 +284,9 @@ static ZMapServerResponseType getSequences(void *server_in, GList *sequences_ino
*
* */
static ZMapServerResponseType getFeatureSetNames(void *server_in,
- GList **feature_sets_inout, GList **required_styles_out)
+ GList **feature_sets_inout,
+ GList **required_styles_out,
+ GHashTable **featureset_2_stylelist_inout)
{
ZMapServerResponseType result = ZMAP_SERVERRESPONSE_REQFAIL ;
FileServer server = (FileServer)server_in ;
--
GitLab