Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Z
zmap
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Iterations
Wiki
Requirements
Jira
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ensembl-gh-mirror
zmap
Commits
53a416ce
Commit
53a416ce
authored
16 years ago
by
edgrif
Browse files
Options
Downloads
Patches
Plain Diff
add styles to getfeatures/sequence calls.
parent
7808ee34
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/zmapServer/zmapServer.c
+7
-6
7 additions, 6 deletions
src/zmapServer/zmapServer.c
src/zmapServer/zmapServer.h
+4
-4
4 additions, 4 deletions
src/zmapServer/zmapServer.h
src/zmapServer/zmapServerPrototype.h
+4
-4
4 additions, 4 deletions
src/zmapServer/zmapServerPrototype.h
with
15 additions
and
14 deletions
src/zmapServer/zmapServer.c
+
7
−
6
View file @
53a416ce
...
...
@@ -26,9 +26,9 @@
* Description:
* Exported functions: See ZMap/zmapServer.h
* HISTORY:
* Last edited:
Dec
4
09:59
200
8
(edgrif)
* Last edited:
Feb
4
15:15
200
9
(edgrif)
* Created: Wed Aug 6 15:46:38 2003 (edgrif)
* CVS info: $Id: zmapServer.c,v 1.3
4
200
8-12-05 09:01
:0
1
edgrif Exp $
* CVS info: $Id: zmapServer.c,v 1.3
5
200
9-02-04 16:10
:0
7
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
,
...
...
This diff is collapsed.
Click to expand it.
src/zmapServer/zmapServer.h
+
4
−
4
View file @
53a416ce
...
...
@@ -26,9 +26,9 @@
* details from caller.
*
* HISTORY:
* Last edited:
Dec
3
1
0:14
200
8
(edgrif)
* Last edited:
Feb
4
1
5:22
200
9
(edgrif)
* Created: Wed Aug 6 15:48:47 2003 (edgrif)
* CVS info: $Id: zmapServer.h,v 1.1
0
200
8-12-05 09:01
:0
1
edgrif Exp $
* CVS info: $Id: zmapServer.h,v 1.1
1
200
9-02-04 16:10
:0
7
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
)
;
...
...
This diff is collapsed.
Click to expand it.
src/zmapServer/zmapServerPrototype.h
+
4
−
4
View file @
53a416ce
...
...
@@ -28,9 +28,9 @@
* include this header, its not really for general consumption.
*
* HISTORY:
* Last edited:
Dec
4
09:48
200
8
(edgrif)
* Last edited:
Feb
4
15:01
200
9
(edgrif)
* Created: Wed Aug 6 15:48:47 2003 (edgrif)
* CVS info: $Id: zmapServerPrototype.h,v 1.2
3
200
8-12-05 09:13:23
edgrif Exp $
* CVS info: $Id: zmapServerPrototype.h,v 1.2
4
200
9-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
)
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment