add new style/feature set calls to interface.

src/zmapServer/zmapServer.c

@@ -26,9 +26,9 @@
  * Description: 
  * Exported functions: See ZMap/zmapServer.h
  * HISTORY:
- * Last edited: Jun 10 16:07 2008 (rds)
+ * Last edited: Aug  5 09:03 2008 (edgrif)
  * Created: Wed Aug  6 15:46:38 2003 (edgrif)
- * CVS info:   $Id: zmapServer.c,v 1.32 2008-06-10 15:07:09 rds Exp $
+ * CVS info:   $Id: zmapServer.c,v 1.33 2008-09-24 14:45:09 edgrif Exp $
  *-------------------------------------------------------------------
  */
 
@@ -86,15 +86,19 @@ gboolean zMapServerGlobalInit(ZMapURL url, void **server_global_data_out)
 
   /* All functions MUST be specified. */
   zMapAssert(serverfuncs->global_init
-	     && serverfuncs->create && serverfuncs->open
+	     && serverfuncs->create
+	     && serverfuncs->open
 	     && serverfuncs->get_info
-	     && serverfuncs->get_styles && serverfuncs->have_modes
+	     && serverfuncs->feature_set_names
+	     && serverfuncs->get_styles
+	     && serverfuncs->have_modes
 	     && serverfuncs->get_sequence
-	     && serverfuncs->get_feature_sets
 	     && serverfuncs->set_context
-	     && serverfuncs->get_features && serverfuncs->get_context_sequences
+	     && serverfuncs->get_features
+	     && serverfuncs->get_context_sequences
 	     && serverfuncs->errmsg
-	     && serverfuncs->close && serverfuncs->destroy) ;
+	     && serverfuncs->close
+	     && serverfuncs->destroy) ;
   
   /* Call the global init function. */
   if (result)
@@ -233,12 +237,15 @@ ZMapServerResponseType zMapServerGetServerInfo(ZMapServer server, char **databas
 }
 
 
-ZMapServerResponseType zMapServerGetFeatureSets(ZMapServer server, GList **feature_sets_out)
+ZMapServerResponseType zMapServerFeatureSetNames(ZMapServer server,
+						 GList **feature_sets_inout, GList **required_styles_out)
 {
   ZMapServerResponseType result = ZMAP_SERVERRESPONSE_REQFAIL ;
 
+  zMapAssert(server && *feature_sets_inout && !*required_styles_out) ;
+
   result = server->last_response
-    = (server->funcs->get_feature_sets)(server->server_conn, feature_sets_out) ;
+    = (server->funcs->feature_set_names)(server->server_conn, feature_sets_inout, required_styles_out) ;
 
   if (result != ZMAP_SERVERRESPONSE_OK)
     server->last_error_msg = ZMAPSERVER_MAKEMESSAGE(server->url->protocol, 

src/zmapServer/zmapServer.h

@@ -26,9 +26,9 @@
  *              details from caller.
  *
  * HISTORY:
- * Last edited: Feb  8 14:46 2008 (edgrif)
+ * Last edited: Aug  1 13:56 2008 (edgrif)
  * Created: Wed Aug  6 15:48:47 2003 (edgrif)
- * CVS info:   $Id: zmapServer.h,v 1.8 2008-06-10 15:05:08 rds Exp $
+ * CVS info:   $Id: zmapServer.h,v 1.9 2008-09-24 14:45:30 edgrif Exp $
  *-------------------------------------------------------------------
  */
 #ifndef ZMAP_SERVER_H
@@ -57,10 +57,10 @@ gboolean zMapServerCreateConnection(ZMapServer *server_out, void *server_global_
 				    int timeout, char *version_str);
 ZMapServerResponseType zMapServerOpenConnection(ZMapServer server) ;
 ZMapServerResponseType zMapServerGetServerInfo(ZMapServer server, char **database_path) ;
+ZMapServerResponseType zMapServerFeatureSetNames(ZMapServer server, GList **feature_sets_inout, GList **required_styles) ;
 ZMapServerResponseType zMapServerGetStyles(ZMapServer server, GData **types_out) ;
 ZMapServerResponseType zMapServerStylesHaveMode(ZMapServer server, gboolean *have_mode) ;
 ZMapServerResponseType zMapServerGetSequence(ZMapServer server, GList *sequences_inout) ;
-ZMapServerResponseType zMapServerGetFeatureSets(ZMapServer server, GList **feature_sets_out) ;
 ZMapServerResponseType zMapServerSetContext(ZMapServer server, ZMapFeatureContext feature_context) ;
 ZMapFeatureContext zMapServerCopyContext(ZMapServer server) ;
 ZMapServerResponseType zMapServerGetFeatures(ZMapServer server, ZMapFeatureContext feature_context) ;