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

add styles to getfeatures/sequence calls.

parent 7808ee34
No related branches found
No related tags found
No related merge requests found
......@@ -26,9 +26,9 @@
* Description:
* Exported functions: See ZMap/zmapServer.h
* HISTORY:
* Last edited: Dec 4 09:59 2008 (edgrif)
* Last edited: Feb 4 15:15 2009 (edgrif)
* Created: Wed Aug 6 15:46:38 2003 (edgrif)
* CVS info: $Id: zmapServer.c,v 1.34 2008-12-05 09:01:01 edgrif Exp $
* CVS info: $Id: zmapServer.c,v 1.35 2009-02-04 16:10:07 edgrif Exp $
*-------------------------------------------------------------------
*/
......@@ -277,7 +277,7 @@ ZMapServerResponseType zMapServerSetContext(ZMapServer server, ZMapFeatureContex
}
ZMapServerResponseType zMapServerGetFeatures(ZMapServer server, ZMapFeatureContext feature_context)
ZMapServerResponseType zMapServerGetFeatures(ZMapServer server, GData *styles, ZMapFeatureContext feature_context)
{
ZMapServerResponseType result = ZMAP_SERVERRESPONSE_REQFAIL ;
......@@ -285,7 +285,7 @@ ZMapServerResponseType zMapServerGetFeatures(ZMapServer server, ZMapFeatureConte
{
result = server->last_response
= (server->funcs->get_features)(server->server_conn, feature_context) ;
= (server->funcs->get_features)(server->server_conn, styles, feature_context) ;
if (result != ZMAP_SERVERRESPONSE_OK)
......@@ -298,14 +298,15 @@ ZMapServerResponseType zMapServerGetFeatures(ZMapServer server, ZMapFeatureConte
}
ZMapServerResponseType zMapServerGetContextSequences(ZMapServer server, ZMapFeatureContext feature_context)
ZMapServerResponseType zMapServerGetContextSequences(ZMapServer server, GData *styles,
ZMapFeatureContext feature_context)
{
ZMapServerResponseType result = ZMAP_SERVERRESPONSE_REQFAIL ;
if (server->last_response != ZMAP_SERVERRESPONSE_SERVERDIED)
{
result = server->last_response
= (server->funcs->get_context_sequences)(server->server_conn, feature_context) ;
= (server->funcs->get_context_sequences)(server->server_conn, styles, feature_context) ;
if (result != ZMAP_SERVERRESPONSE_OK)
server->last_error_msg = ZMAPSERVER_MAKEMESSAGE(server->url->protocol,
......
......@@ -26,9 +26,9 @@
* details from caller.
*
* HISTORY:
* Last edited: Dec 3 10:14 2008 (edgrif)
* Last edited: Feb 4 15:22 2009 (edgrif)
* Created: Wed Aug 6 15:48:47 2003 (edgrif)
* CVS info: $Id: zmapServer.h,v 1.10 2008-12-05 09:01:01 edgrif Exp $
* CVS info: $Id: zmapServer.h,v 1.11 2009-02-04 16:10:07 edgrif Exp $
*-------------------------------------------------------------------
*/
#ifndef ZMAP_SERVER_H
......@@ -63,8 +63,8 @@ ZMapServerResponseType zMapServerStylesHaveMode(ZMapServer server, gboolean *hav
ZMapServerResponseType zMapServerGetSequence(ZMapServer server, GList *sequences_inout) ;
ZMapServerResponseType zMapServerSetContext(ZMapServer server, ZMapFeatureContext feature_context) ;
ZMapFeatureContext zMapServerCopyContext(ZMapServer server) ;
ZMapServerResponseType zMapServerGetFeatures(ZMapServer server, ZMapFeatureContext feature_context) ;
ZMapServerResponseType zMapServerGetContextSequences(ZMapServer server, ZMapFeatureContext feature_context) ;
ZMapServerResponseType zMapServerGetFeatures(ZMapServer server, GData *styles, ZMapFeatureContext feature_context) ;
ZMapServerResponseType zMapServerGetContextSequences(ZMapServer server, GData *styles, ZMapFeatureContext feature_context) ;
char *zMapServerLastErrorMsg(ZMapServer server) ;
ZMapServerResponseType zMapServerCloseConnection(ZMapServer server) ;
ZMapServerResponseType zMapServerFreeConnection(ZMapServer server) ;
......
......@@ -28,9 +28,9 @@
* include this header, its not really for general consumption.
*
* HISTORY:
* Last edited: Dec 4 09:48 2008 (edgrif)
* Last edited: Feb 4 15:01 2009 (edgrif)
* Created: Wed Aug 6 15:48:47 2003 (edgrif)
* CVS info: $Id: zmapServerPrototype.h,v 1.23 2008-12-05 09:13:23 edgrif Exp $
* CVS info: $Id: zmapServerPrototype.h,v 1.24 2009-02-04 16:11:19 edgrif Exp $
*-------------------------------------------------------------------
*/
#ifndef ZMAP_SERVER_PROTOTYPEP_H
......@@ -73,10 +73,10 @@ typedef ZMapFeatureContext
(*ZMapServerCopyContextFunc)(void *server_conn) ;
typedef ZMapServerResponseType
(*ZMapServerGetFeatures)(void *server_conn, ZMapFeatureContext feature_context) ;
(*ZMapServerGetFeatures)(void *server_conn, GData *styles, ZMapFeatureContext feature_context) ;
typedef ZMapServerResponseType
(*ZMapServerGetContextSequences)(void *server_conn, ZMapFeatureContext feature_context) ;
(*ZMapServerGetContextSequences)(void *server_conn, GData *styles, ZMapFeatureContext feature_context) ;
typedef char * (*ZMapServerGetErrorMsgFunc)(void *server_conn) ;
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment