Skip to content
Snippets Groups Projects
Commit f7f279d8 authored by edgrif's avatar edgrif
Browse files

add source list to getFeatureSets call, need to fetch correct features.

parent 4a1ae32e
Branches
Tags
No related merge requests found
......@@ -27,9 +27,9 @@
* structs that give all the information/fields for the request/reply.
*
* HISTORY:
* Last edited: Aug 13 09:43 2009 (edgrif)
* Last edited: Oct 1 10:43 2009 (edgrif)
* Created: Wed Feb 2 11:47:16 2005 (edgrif)
* CVS info: $Id: zmapServerProtocol.h,v 1.25 2009-08-14 09:51:10 edgrif Exp $
* CVS info: $Id: zmapServerProtocol.h,v 1.26 2009-10-02 09:23:15 edgrif Exp $
*-------------------------------------------------------------------
*/
#ifndef ZMAP_PROTOCOL_H
......@@ -132,7 +132,15 @@ typedef struct
ZMapServerResponseType response ;
GList *feature_sets_inout ; /* List of prespecified features sets or
NULL to get all available sets. */
NULL to get all available sets,
these are columns so maybe we
should call them that. */
GList *sources ; /* Optional list of sources, these
_must_ have a parent feature_set in
feature_sets_inout, if NULL then
_all_ the sources derived from
feature_sets_inout will be loaded. */
/* Is this still needed ????? */
GList *required_styles_out ; /* May be derived from features. */
......
......@@ -26,9 +26,9 @@
*
* Exported functions: See ZMap/zmapServerPrototype.h
* HISTORY:
* Last edited: Aug 13 09:55 2009 (edgrif)
* Last edited: Oct 2 08:11 2009 (edgrif)
* Created: Wed Aug 6 15:46:38 2003 (edgrif)
* CVS info: $Id: dasServer.c,v 1.39 2009-08-14 09:51:10 edgrif Exp $
* CVS info: $Id: dasServer.c,v 1.40 2009-10-02 09:21:53 edgrif Exp $
*-------------------------------------------------------------------
*/
......@@ -93,6 +93,7 @@ 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 *sources,
GList **required_styles,
GHashTable **featureset_2_stylelist_inout,
GHashTable **source_2_featureset_out) ;
......@@ -454,6 +455,7 @@ static ZMapServerResponseType getSequences(void *server_in, GList *sequences_ino
* */
static ZMapServerResponseType getFeatureSets(void *server,
GList **feature_sets_out,
GList *sources,
GList **required_styles,
GHashTable **featureset_2_stylelist_inout,
GHashTable **source_2_featureset_out)
......
......@@ -30,9 +30,9 @@
*
* Exported functions: See ZMap/zmapServerPrototype.h
* HISTORY:
* Last edited: Aug 13 09:55 2009 (edgrif)
* Last edited: Oct 2 08:12 2009 (edgrif)
* Created: Fri Sep 10 18:29:18 2004 (edgrif)
* CVS info: $Id: fileServer.c,v 1.40 2009-08-14 09:51:10 edgrif Exp $
* CVS info: $Id: fileServer.c,v 1.41 2009-10-02 09:21:53 edgrif Exp $
*-------------------------------------------------------------------
*/
......@@ -71,6 +71,7 @@ static ZMapServerResponseType openConnection(void *server) ;
static ZMapServerResponseType getInfo(void *server, ZMapServerInfo info) ;
static ZMapServerResponseType getFeatureSetNames(void *server,
GList **feature_sets_out,
GList *sources,
GList **required_styles,
GHashTable **featureset_2_stylelist_inout,
GHashTable **source_2_featureset_out) ;
......@@ -240,6 +241,7 @@ static ZMapServerResponseType getInfo(void *server_in, ZMapServerInfo info)
* */
static ZMapServerResponseType getFeatureSetNames(void *server_in,
GList **feature_sets_inout,
GList *sources,
GList **required_styles_out,
GHashTable **featureset_2_stylelist_inout,
GHashTable **source_2_featureset_out)
......
......@@ -26,9 +26,9 @@
* Description:
* Exported functions: See ZMap/zmapServer.h
* HISTORY:
* Last edited: Aug 13 09:33 2009 (edgrif)
* Last edited: Oct 2 08:12 2009 (edgrif)
* Created: Wed Aug 6 15:46:38 2003 (edgrif)
* CVS info: $Id: zmapServer.c,v 1.38 2009-08-14 09:51:10 edgrif Exp $
* CVS info: $Id: zmapServer.c,v 1.39 2009-10-02 09:21:53 edgrif Exp $
*-------------------------------------------------------------------
*/
......@@ -178,6 +178,7 @@ ZMapServerResponseType zMapServerOpenConnection(ZMapServer server)
ZMapServerResponseType zMapServerFeatureSetNames(ZMapServer server,
GList **feature_sets_inout,
GList *sources,
GList **required_styles_out,
GHashTable **featureset_2_stylelist_out,
GHashTable **source_2_featureset_out)
......@@ -189,6 +190,7 @@ ZMapServerResponseType zMapServerFeatureSetNames(ZMapServer server,
result = server->last_response
= (server->funcs->feature_set_names)(server->server_conn,
feature_sets_inout,
sources,
required_styles_out,
featureset_2_stylelist_out,
source_2_featureset_out) ;
......
......@@ -26,9 +26,9 @@
* details from caller.
*
* HISTORY:
* Last edited: Aug 13 09:31 2009 (edgrif)
* Last edited: Oct 2 08:08 2009 (edgrif)
* Created: Wed Aug 6 15:48:47 2003 (edgrif)
* CVS info: $Id: zmapServer.h,v 1.14 2009-08-14 09:51:10 edgrif Exp $
* CVS info: $Id: zmapServer.h,v 1.15 2009-10-02 09:21:53 edgrif Exp $
*-------------------------------------------------------------------
*/
#ifndef ZMAP_SERVER_H
......@@ -63,6 +63,7 @@ ZMapServerResponseType zMapServerOpenConnection(ZMapServer server) ;
ZMapServerResponseType zMapServerGetServerInfo(ZMapServer server, ZMapServerInfo info) ;
ZMapServerResponseType zMapServerFeatureSetNames(ZMapServer server,
GList **feature_sets_inout,
GList *sources,
GList **required_styles,
GHashTable **featureset_2_stylelist_out,
GHashTable **source_2_featureset_out) ;
......
......@@ -25,9 +25,9 @@
* Description:
* Exported functions: See ZMap/zmapServerProtocol.h
* HISTORY:
* Last edited: Aug 13 09:43 2009 (edgrif)
* Last edited: Oct 1 15:52 2009 (edgrif)
* Created: Thu Jan 27 13:17:43 2005 (edgrif)
* CVS info: $Id: zmapServerProtocolHandler.c,v 1.45 2009-08-14 09:51:10 edgrif Exp $
* CVS info: $Id: zmapServerProtocolHandler.c,v 1.46 2009-10-02 09:21:53 edgrif Exp $
*-------------------------------------------------------------------
*/
......@@ -206,6 +206,7 @@ ZMapServerReqAny zMapServerRequestCreate(ZMapServerReqType request_type, ...)
ZMapServerReqFeatureSets feature_sets = (ZMapServerReqFeatureSets)req_any ;
feature_sets->feature_sets_inout = va_arg(args, GList *) ;
feature_sets->sources = va_arg(args, GList *) ;
break ;
}
......@@ -395,6 +396,7 @@ ZMapThreadReturnCode zMapServerRequestHandler(void **slave_data,
request->response = zMapServerFeatureSetNames(server,
&(feature_sets->feature_sets_inout),
feature_sets->sources,
&(feature_sets->required_styles_out),
&(feature_sets->featureset_2_stylelist_out),
&(feature_sets->source_2_featureset_out)) ;
......
......@@ -28,9 +28,9 @@
* include this header, its not really for general consumption.
*
* HISTORY:
* Last edited: Aug 13 09:32 2009 (edgrif)
* Last edited: Oct 2 08:09 2009 (edgrif)
* Created: Wed Aug 6 15:48:47 2003 (edgrif)
* CVS info: $Id: zmapServerPrototype.h,v 1.27 2009-08-14 09:51:10 edgrif Exp $
* CVS info: $Id: zmapServerPrototype.h,v 1.28 2009-10-02 09:21:53 edgrif Exp $
*-------------------------------------------------------------------
*/
#ifndef ZMAP_SERVER_PROTOTYPEP_H
......@@ -67,6 +67,7 @@ typedef ZMapServerResponseType (*ZMapServerGetServerInfo)(void *server_in, ZMapS
typedef ZMapServerResponseType (*ZMapServerGetFeatureSets)(void *server_in,
GList **feature_sets_inout,
GList *sources,
GList **required_styles_out,
GHashTable **featureset_2_stylelist_out,
GHashTable **source_2_featureset_out) ;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment