From: Adam Dickmeiss Date: Thu, 19 Jul 2001 12:46:57 +0000 (+0000) Subject: Updates to manual. Separate PHP stylesheet. X-Git-Tag: YAZ.1.8~71 X-Git-Url: http://lists.indexdata.dk/?a=commitdiff_plain;h=1f14d2d8be1c47d9e97fdd8ec55e2e5113abe899;p=yaz-moved-to-github.git Updates to manual. Separate PHP stylesheet. --- diff --git a/doc/Makefile.am b/doc/Makefile.am index ffa0ce7..b217793 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,4 +1,4 @@ -## $Id: Makefile.am,v 1.11 2001-03-25 21:54:24 adam Exp $ +## $Id: Makefile.am,v 1.12 2001-07-19 12:46:57 adam Exp $ docdir=$(pkgdatadir)/doc @@ -36,10 +36,13 @@ yaz.html: $(srcdir)/yaz.sgml XMLFILES=$(srcdir)/yaz.xml $(srcdir)/introduction.xml \ $(srcdir)/installation.xml $(srcdir)/indexdata.xml $(srcdir)/asn.xml \ $(srcdir)/tools.xml $(srcdir)/odr.xml $(srcdir)/comstack.xml \ - $(srcdir)/frontend.xml $(srcdir)/license.xml $(srcdir)/future.xml + $(srcdir)/frontend.xml $(srcdir)/license.xml $(srcdir)/future.xml $(srcdir)/book1.html: $(XMLFILES) $(srcdir)/yazhtml.dsl cd $(srcdir); jade -E14 -d yazhtml.dsl -t sgml xml.dcl yaz.xml +$(srcdir)/book1.php: $(XMLFILES) $(srcdir)/yazphp.dsl + cd $(srcdir); jade -E14 -d yazphp.dsl -t sgml xml.dcl yaz.xml + $(srcdir)/yaz.tex: $(XMLFILES) $(srcdir)/yazprint.dsl cd $(srcdir); jade -d yazprint.dsl -t tex xml.dcl yaz.xml diff --git a/doc/asn.xml b/doc/asn.xml index bafab6d..9620eba 100644 --- a/doc/asn.xml +++ b/doc/asn.xml @@ -1,4 +1,4 @@ - + The ASN Module Introduction @@ -351,31 +351,51 @@ PDU, as well as their default settings. -Z_InitRequest +Z_InitRequest -referenceId - -Z_ReferenceId - -NULL +referenceIdZ_ReferenceIdNULL -protocolVersion - -Odr_bitmask - -Empty bitmask +protocolVersionOdr_bitmaskEmpty bitmask -options - -Odr_bitmask - -Empty bitmask +optionsOdr_bitmaskEmpty bitmask + + + +preferredMessageSizeint30*1024 + + + +maximumRecordSizeint30*1024 + + + +idAuthenticationZ_IdAuthenticationNULL + + + +implementationIdchar*"YAZ (id=81)" + + + +implementationNamechar*"Index Data/YAZ" + + + +implementationVersionchar*YAZ_VERSION + + + +userInformationFieldZ_UserInformationNULL + + + +otherInfoZ_OtherInformationNULL @@ -383,24 +403,6 @@ Empty bitmask -Z_InitRequest -------------- -Field Type Default value - -referenceId Z_ReferenceId NULL -protocolVersion Odr_bitmask Empty bitmask -options Odr_bitmask Empty bitmask -preferredMessageSize int 30*1024 -maximumRecordSize int 30*1024 -idAuthentication Z_IdAuthentication NULL -implementationId char* "YAZ (id=81)" -implementationName char* "Index Data/YAZ" -implementationVersion char* YAZ_VERSION -userInformationField Z_UserInformation NULL -otherInfo Z_OtherInformation NULL - - - Z_InitResponse -------------- Field Type Default value diff --git a/doc/frontend.xml b/doc/frontend.xml index 9383455..61d85af 100644 --- a/doc/frontend.xml +++ b/doc/frontend.xml @@ -1,4 +1,4 @@ - + Making an IR Server for Your Database Introduction @@ -7,7 +7,7 @@ If you aren't into documentation, a good way to learn how the backend interface works is to look at the backend.h file. Then, look at the small dummy-server in -server/ztest.c. Finally, you can have a look at +ztest/ztest.c. Finally, you can have a look at the seshigh.c file, which is where most of the logic of the frontend server is located. The backend.h file also makes a good reference, once you've chewed your way through @@ -16,13 +16,14 @@ the prose of this file. If you have a database system that you would like to make available by -means of Z39.50/SR, &yaz; basically offers your two options. You +means of Z39.50, &yaz; basically offers your two options. You can use the APIs provided by the &asn;, &odr;, and &comstack; modules to -create and decode PDUs, and exchange them with a client. Using this -low-level interface gives you access to all fields and options of the -protocol, and you can construct your server as close to your existing -database as you like. It is also a fairly involved process, requiring +create and decode PDUs, and exchange them with a client. +Using this low-level interface gives you access to all fields and +options of the protocol, and you can construct your server as close +to your existing database as you like. +It is also a fairly involved process, requiring you to set up an event-handling mechanism, protocol state machine, etc. To simplify server implementation, we have implemented a compact and simple, but reasonably full-functioned server-frontend that will @@ -51,17 +52,17 @@ too many structural changes in existing applications. We refer to this software as a generic database frontend. Your database system is the backend database, and the interface between the two is called the backend API. -The backend API consists of a small number of function prototypes and +The backend API consists of a small number of function handlers and structure definitions. You are required to provide the main() routine for the server (which can be -quite simple), as well as functions to match each of the prototypes. +quite simple), as well as a set of handlers to match each of the prototypes. The interface functions that you write can use any mechanism you like to communicate with your database system: You might link the whole thing together with your database application and access it by function calls; you might use IPC to talk to a database server somewhere; or you might link with third-party software that handles the communication for you (like a commercial database client library). -At any rate, the functions will perform the tasks of: +At any rate, the handlers will perform the tasks of: @@ -79,7 +80,19 @@ Fetching records. -Scanning the database index (if you wish to implement SCAN). +Scanning the database index (optional - if you wish to implement SCAN). + + + +Extended Services (optional). + + + +Result-Set Delete (optional). + + + +Result-Set Sort (optional). @@ -89,14 +102,6 @@ Scanning the database index (if you wish to implement SCAN). Z39.50-1995 as possible). - -Because the model where pipes or sockets are used to access the backend -database is a fairly common one, we have added a mechanism that allows this -communication to take place asynchronously. In this mode, the frontend -server doesn't have to block while the backend database is processing -a request, but can wait for additional PDUs from the client. - - The Backend API @@ -123,18 +128,28 @@ call the function - int statserv_main(int argc, char **argv); +int statserv_main(int argc, char **argv, + bend_initresult *(*bend_init)(bend_initrequest *r), + void (*bend_close)(void *handle)); +The third and fourth arguments are pointers to handlers. Handler +bend_init is called whenever the server receives +an Initialize Request, so it serves as a Z39.50 session initializer. The +bend_close handler is called when the session is +closed. + + + statserv_main will establish listening sockets according to the parameters given. When connection requests are received, -the event handler will typically fork() to handle the -new request. If you do use global variables, you should be aware, then, +the event handler will typically fork() and +create a sub-process to handle a new connection. +Alternatively the server may be setup to create threads for each connection. +If you do use global variables and forking, you should be aware, then, that these cannot be shared between associations, unless you explicitly -disallow forking by command line parameters (we advise against this for -any purposes except debugging, as a crash or hang in the server process -will affect all users currently signed on to the server). +disable forking by command line parameters. @@ -143,7 +158,7 @@ without using command-line options. The function - statserv_options_block *statserv_getcontrol(void); +statserv_options_block *statserv_getcontrol(void); @@ -155,12 +170,27 @@ contains these elements: int dynamic A boolean value, which determines whether the server will fork on each incoming request (TRUE), or not (FALSE). Default is -TRUE. +TRUE. This flag is only read by UNIX-based servers (WIN32 based servers +doesn't fork). + +int threads +A boolean value, which determines whether the server +will create a thread on each incoming request (TRUE), or not (FALSE). +Default is FALSE. This flag is only read by UNIX-based servers that offer +POSIX Threads support. WIN32-based servers always operate in threaded mode. + + +int inetd +A boolean value, which determines whether the server +will operates under a UNIX INET daemon (inetd). Default is FALSE. + + int loglevel Set this by ORing the constants defined in include/yaz/yaz-log.h. + char logfile[ODR_MAXNAME+1] File for diagnostic output ("": stderr). @@ -169,12 +199,14 @@ Set this by ORing the constants defined in Name of file for logging incoming and outgoing APDUs ("": don't log APDUs, "-": stderr). + char default_listen[1024] Same form as the command-line specification of listener address. "": no default listener address. Default is to listen at "tcp:@:9999". You can only specify one default listener address in this fashion. + enum oid_proto default_proto; Either PROTO_SR or PROTO_Z3950. Default is PROTO_Z39_50. @@ -183,6 +215,7 @@ specify one default listener address in this fashion. Maximum session idletime, in minutes. Zero indicates no (infinite) timeout. Default is 120 minutes. + int maxrecordsize; Maximum permissible record (message) size. Default is 1Mb. This amount of memory will only be allocated if a client requests a @@ -190,13 +223,40 @@ very large amount of records in one operation (or a big record). Set it to a lower number if you are worried about resource consumption on your host system. + char configname[ODR_MAXNAME+1] Passed to the backend when a new connection is received. + char setuid[ODR_MAXNAME+1] Set user id to the user specified, after binding the listener addresses. + +void (*bend_start)(struct statserv_options_block *p) +Pointer to function which is called after the command line +options have been parsed - but before the server starts listening. For +forked UNIX servers this handler is called in the mother process; for +threaded servers this handler is called in the main thread. The default +value of this pointer is NULL in which case it isn't invoked by the frontend +server. When the server operates as an NT service this handler is called +whenever the service is started. + + +void (*bend_stop)(struct statserv_options_block *p) +Pointer to function which is called whenver the server +has stopped listening for incoming connections. This function pointer +has a default value of NULL in which case it isn't called. +When the server operates as an NT service this handler is called +whenever the service is stopped. + + +void *handle +User defined pointer (default value NULL). +This is a per-server handle that can be used to specify "user-data". +Do not confuse this with the session-handle as returned by bend_init. + + @@ -207,7 +267,7 @@ but the changes will not take effect before you call - void statserv_setcontrol(statserv_options_block *block); +void statserv_setcontrol(statserv_options_block *block); @@ -226,20 +286,47 @@ two functions. You are required to provide implementations of the functions representing the services that you wish to implement. +Init + - bend_initresult *bend_init(bend_initrequest *r); +bend_initresult (*bend_init)(bend_initrequest *r); -This function is called once for each new connection request, after -a new process has been forked, and an initRequest has been received -from the client. The parameter and result structures are defined as +This handler is called once for each new connection request, after +a new process/thread has been created, and an Initialize Request has been +received from the client. The pointer to the bend_init +handler is passed in the call to statserv_start. + + +Unlike previous versions of YAZ, the bend_init also +serves as a handler that defines the Z39.50 services that the backend +wish to support. Pointers to all service handlers, +including search - and fetch must be specified here in this handler. + + +The request - and result structures are defined as typedef struct bend_initrequest { - char *configname; + Z_IdAuthentication *auth; + ODR stream; /* encoding stream */ + ODR print; /* printing stream */ + Z_ReferenceId *referenceId;/* reference ID */ + char *peer_name; /* dns host of peer (client) */ + + char *implementation_name; + char *implementation_version; + int (*bend_sort) (void *handle, bend_sort_rr *rr); + int (*bend_search) (void *handle, bend_search_rr *rr); + int (*bend_fetch) (void *handle, bend_fetch_rr *rr); + int (*bend_present) (void *handle, bend_present_rr *rr); + int (*bend_esrequest) (void *handle, bend_esrequest_rr *rr); + int (*bend_delete)(void *handle, bend_delete_rr *rr); + int (*bend_scan)(void *handle, bend_scan_rr *rr); + int (*bend_segment)(void *handle, bend_segment_rr *rr); } bend_initrequest; typedef struct bend_initresult @@ -251,13 +338,6 @@ typedef struct bend_initresult -The configname of bend_initrequest -is currently always set to "default-config". We haven't had -use for putting anything special in the initrequest yet, but something -might go there if the need arises (account/password info would be obvious). - - - In general, the server frontend expects that the bend_*result pointer that you return is valid at least until the next call to a bend_* function. @@ -281,76 +361,84 @@ The typical use is to set it to point to a dynamically allocated state structure that is private to your backend module. + +The auth member holds the authentication information +part of the Z39.50 Initialize Request. Interpret this if your serves +requires authentication. + + + +The members peer_name, +implementation_name and +implementation_version holds DNS of client, name +of client (Z39.50) implementation - and version. + + + +The bend_ - members are set to NULL when +bend_init is called. Modify the pointers by setting them +to point to backend functions. + + + + +Search and retrieve + +We now describe the handlers that are required to support search - +and retrieve. You must support two functions - one for seearch - and one +for fetch (retrieval of one record). If desirable you can provide a +third handler which is called when a present request is received which +allows you to optimize retrieval of multiple-records. + + -bend_searchresult *bend_search(void *handle, bend_searchrequest *r, - int *fd); -bend_searchresult *bend_searchresponse(void *handle); +int (*bend_search) (void *handle, bend_search_rr *rr); + +typedef struct { + char *setname; /* name to give to this set */ + int replace_set; /* replace set, if it already exists */ + int num_bases; /* number of databases in list */ + char **basenames; /* databases to search */ + Z_ReferenceId *referenceId;/* reference ID */ + Z_Query *query; /* query structure */ + ODR stream; /* encode stream */ + ODR decode; /* decode stream */ + ODR print; /* print stream */ + + bend_request request; + bend_association association; + int *fd; + int hits; /* number of hits */ + int errcode; /* 0==OK */ + char *errstring; /* system error string or NULL */ +} bend_search_rr; -typedef struct bend_searchrequest -{ - char *setname; /* name to give to this set */ - int replace_set; /* replace set, if it already exists */ - int num_bases; /* number of databases in list */ - char **basenames; /* databases to search */ - Z_Query *query; /* query structure */ -} bend_searchrequest; - -typedef struct bend_searchresult -{ - int hits; /* number of hits */ - int errcode; /* 0==OK */ - char *errstring; /* system error string or NULL */ -} bend_searchresult; -The first thing to notice about the search request interface (as well -as all of the following requests), is that it consists of two separate -functions. The idea is to provide a simple facility for -asynchronous communication with the backend server. When a -searchrequest comes in, the server frontend will fill out the -bend_searchrequest tructure, and call the -bend_search function/. The fd -argument will point to an integer variable. If you are able to do -asynchronous I/O with your database server, you should set -*fd to the file descriptor you use for the -communication, and return a null pointer. -The server frontend will then select() on the -*fd, and will call -bend_searchresult when it sees that data is available. -If you don't support asynchronous I/O, you should return a pointer to the -bend_searchresult immediately, and leave -*fd untouched. This construction is common to -all of the bend_ functions (except -bend_init). Note that you can choose to support -this facility in none, any, or all of the bend_ -functions, and you can respond differently on each request at run-time. -The server frontend will adapt accordingly. - - - -The bend_searchrequest is a fairly close -approximation of a protocol searchRequest PDU. The -setname is the resultSetName from the protocol. You -are required to establish a mapping between the set name and whatever -your backend database likes to use. Similarly, the -replace_set is a boolean value corresponding to the -resultSetIndicator field in the protocol. -Num_bases/basenames is a length of/array of character -pointers to the database names provided by the client. The -query is the full query structure as defined in the -protocol ASN.1 specification. It can be either of the possible query -types, and it's up to you to determine if you can handle the provided -query type. Rather than reproduce the C interface here, we'll refer you -to the structure definitions in the file -include/yaz/proto.h. If you want to look at the +The bend_search handler is a fairly close +approximation of a protocol Search Request - and Response PDUs +The setname is the resultSetName from the protocol. +You are required to establish a mapping between the set name and whatever +your backend database likes to use. +Similarly, the replace_set is a boolean value +corresponding to the resultSetIndicator field in the protocol. +num_bases/basenames is a length of/array of character +pointers to the database names provided by the client. +The query is the full query structure as defined in the +protocol ASN.1 specification. +It can be either of the possible query types, and it's up to you to +determine if you can handle the provided query type. +Rather than reproduce the C interface here, we'll refer you to the +structure definitions in the file +include/yaz/z-core.h. If you want to look at the attributeSetId OID of the RPN query, you can either match it against your own internal tables, or you can use the oid_getentbyoid function provided by &yaz;. -The result structure contains a number of hits, and an +The structure contains a number of hits, and an errcode/errstring pair. If an error occurs during the search, or if you're unhappy with the request, you should set the errcode to a value from the BIB-1 diagnostic set. The value @@ -360,42 +448,35 @@ go in the addinfo field. Look at the protocol definition for the defined error codes, and the suggested uses of the addinfo field. - -bend_fetchresult *bend_fetch(void *handle, bend_fetchrequest *r, - int *fd); -bend_fetchresult *bend_fetchresponse(void *handle); - -typedef struct bend_fetchrequest -{ - char *setname; /* set name */ - int number; /* record number */ - oid_value format; -} bend_fetchrequest; -typedef struct bend_fetchresult -{ - char *basename; /* name of database that provided record */ - int len; /* length of record */ - char *record; /* record */ - int last_in_set; /* is it? */ - oid_value format; - int errcode; /* 0==success */ - char *errstring; /* system error string or NULL */ -} bend_fetchresult; + +int (*bend_fetch) (void *handle, bend_fetch_rr *rr); + +typedef struct bend_fetch_rr { + char *setname; /* set name */ + int number; /* record number */ + Z_ReferenceId *referenceId;/* reference ID */ + oid_value request_format; /* One of the CLASS_RECSYN members */ + int *request_format_raw; /* same as above (raw OID) */ + Z_RecordComposition *comp; /* Formatting instructions */ + ODR stream; /* encoding stream - memory source if req */ + ODR print; /* printing stream */ + + char *basename; /* name of database that provided record */ + int len; /* length of record or -1 if structured */ + char *record; /* record */ + int last_in_set; /* is it? */ + oid_value output_format; /* format */ + int *output_format_raw; /* used instead of above if not-null */ + int errcode; /* 0==success */ + char *errstring; /* system error string or NULL */ + int surrogate_flag; /* surrogate diagnostic */ +} bend_fetch_rr; - - -The bend_fetchresponse() function is not yet supported -in this version of the software. Your implementation of -bend_fetch() should always return a pointer to a -bend_fetchresult. - - - -The frontend server calls bend_fetch when it needs -database records to fulfill a searchRequest or a presentRequest. +The frontend server calls the bend_fetch handler when +it needs database records to fulfill a Search Request or a Present Request. The setname is simply the name of the result set that holds the reference to the desired record. The number is the offset into the set (with 1 @@ -412,23 +493,19 @@ or dynamic buffer for the record between calls. -In the result structure, the basename is the name of the +In the structure, the basename is the name of the database that holds the record. len is the length of the record returned, in bytes, and record is a pointer to the record. Last_in_set should be nonzero only if the record returned is the last one in the given result set. errcode -and errstring, if given, will currently be -interpreted as a global error pertaining to the set, and will be returned in a -nonSurrogateDiagnostic. +and errstring, if given, will be +interpreted as a global error pertaining to the set, and will be returned +in a non-surrogate-diagnostic. If you wish to return the error as a +surrogate-diagnostic (local error) you can do this by setting +surrogate_flag to 1 also. - - -This is silly. Add a flag to say which is which. - - - If the len field has the value -1, then record is assumed to point to a constructed data @@ -456,28 +533,64 @@ The current version of &yaz; only supports the direct reference mode. -bend_deleteresult *bend_delete(void *handle, bend_deleterequest *r, - int *fd); -bend_deleteresult *bend_deleteresponse(void *handle); +int (*bend_present) (void *handle, bend_present_rr *rr); + +typedef struct { + char *setname; /* set name */ + int start; + int number; /* record number */ + oid_value format; /* One of the CLASS_RECSYN members */ + Z_ReferenceId *referenceId;/* reference ID */ + Z_RecordComposition *comp; /* Formatting instructions */ + ODR stream; /* encoding stream - memory source if required */ + ODR print; /* printing stream */ + bend_request request; + bend_association association; + + int hits; /* number of hits */ + int errcode; /* 0==OK */ + char *errstring; /* system error string or NULL */ +} bend_present_rr; + -typedef struct bend_deleterequest -{ - char *setname; -} bend_deleterequest; + +The bend_present handler is called when +the server receives a Present Request. The setname, +start and number is the +name of the result set - start position - and number of records to +be retrieved respectively. format and +comp is the preferred transfer syntax and element +specifications of the present request. + + +Note that this is handler serves as a supplement for +bend_fetch and need not to be defined in order to +support search - and retrieve. + -typedef struct bend_deleteresult -{ - int errcode; /* 0==success */ - char *errstring; /* system error string or NULL */ -} bend_deleteresult; - + + +Delete - -The "delete" function is not yet supported in this version of -the software. +For backends that supports delete of a result set only one handler +must be defined. - + + +int (*bend_delete)(void *handle, bend_delete_rr *rr); + +typedef struct bend_delete_rr { + int function; + int num_setnames; + char **setnames; + Z_ReferenceId *referenceId; + int delete_status; /* status for the whole operation */ + int *statuses; /* status each set - indexed as setnames */ + ODR stream; + ODR print; +} bend_delete_rr; + @@ -489,47 +602,43 @@ that will actually delete sets they no longer need? + + +scan + + +For servers that wish to offer the scan service one handler +must be defined. + + -bend_scanresult *bend_scan(void *handle, bend_scanrequest *r, - int *fd); -bend_scanresult *bend_scanresponse(void *handle); +int (*bend_delete)(void *handle, bend_delete_rr *rr); -typedef struct bend_scanrequest -{ +typedef enum { + BEND_SCAN_SUCCESS, /* ok */ + BEND_SCAN_PARTIAL /* not all entries could be found */ +} bend_scan_status; + +typedef struct bend_scan_rr { int num_bases; /* number of elements in databaselist */ char **basenames; /* databases to search */ + oid_value attributeset; + Z_ReferenceId *referenceId; /* reference ID */ Z_AttributesPlusTerm *term; - int term_position; /* desired index of term in result list */ - int num_entries; /* number of entries requested */ -} bend_scanrequest; + ODR stream; /* encoding stream - memory source if required */ + ODR print; /* printing stream */ -typedef struct bend_scanresult -{ - int num_entries; - struct scan_entry - { - char *term; - int occurrences; - } *entries; - int term_position; - enum - { - BEND_SCAN_SUCCESS, - BEND_SCAN_PARTIAL - } status; + int *step_size; /* step size */ + int term_position; /* desired index of term in result list/returned */ + int num_entries; /* number of entries requested/returned */ + + struct scan_entry *entries; + bend_scan_status status; int errcode; char *errstring; -} bend_scanresult; +} bend_scan_rr; - - - -The bend_scanresponse() function is not yet supported -in this version of the software. Your implementation of -bend_scan() should always return a pointer to a -bend_scanresult. - - + Application Invocation @@ -540,7 +649,7 @@ invocation syntax (by way of statserv_main()): -appname [-szSu -a apdufile -l logfile -v loglevel] +appname [-szSiTu -a apdufile -l logfile -v loglevel -c config] [listener ...] @@ -557,21 +666,28 @@ The special name "-" sends output to stderr. -S -Don't fork on connection requests. This is good for debugging, but -not recommended for real operation: Although the server is +Don't fork or make threads on connection requests. This is good for +debugging, but not recommended for real operation: Although the server is asynchronous and non-blocking, it can be nice to keep a software malfunction (okay then, a crash) from affecting all current users. +-T + +Operate the server in threaded mode. The server creates a thread +for each connection rather than a fork a process. Only available +on UNIX systems that offers POSIX threads. + + -s -Use the SR protocol. +Use the SR protocol (obsolete). -z Use the Z39.50 protocol (default). These two options complement -eachother. You can use both multiple times on the same command +each other. You can use both multiple times on the same command line, between listener-specifications (see below). This way, you can set up the server to listen for connections in both protocols concurrently, on different local ports. @@ -581,6 +697,13 @@ concurrently, on different local ports. The logfile. +-c config +A user option that serves as a specifier for some +sort of configuration, e.g. a filename. +The argument to this option is transferred to member +confignameof the statserv_options_block. + + -v level The log level. Use a comma-separated list of members of the set @@ -615,6 +738,7 @@ Idle session timeout, in minutes. Maximum record size/message size, in kilobytes. + @@ -680,34 +804,5 @@ server application. You can test the procedure with the -Summary and Synopsis - - -#include <backend.h> - -bend_initresult *bend_init(bend_initrequest *r); - -bend_searchresult *bend_search(void *handle, bend_searchrequest *r, - int *fd); - -bend_searchresult *bend_searchresponse(void *handle); - -bend_fetchresult *bend_fetch(void *handle, bend_fetchrequest *r, - int *fd); - -bend_fetchresult *bend_fetchresponse(void *handle); - -bend_scanresult *bend_scan(void *handle, bend_scanrequest *r, int *fd); - -bend_scanresult *bend_scanresponse(void *handle); - -bend_deleteresult *bend_delete(void *handle, bend_deleterequest *r, - int *fd); - -bend_deleteresult *bend_deleteresponse(void *handle); - -void bend_close(void *handle); - - diff --git a/doc/yaz.xml b/doc/yaz.xml index d50abc4..1710087 100644 --- a/doc/yaz.xml +++ b/doc/yaz.xml @@ -16,7 +16,7 @@ ODR"> COMSTACK"> ]> - + YAZ User's Guide and Reference @@ -35,7 +35,7 @@ This document is the programmer's guide and reference to the &yaz; package. &yaz; is a compact toolkit that provides access to the -Z39.50/SR protocol, as well as a set of higher-level tools for +Z39.50 protocol, as well as a set of higher-level tools for implementing the server and client roles, respectively. The documentation can be used on its own, or as a reference when looking at the example applications provided with the package. diff --git a/doc/yazhtml.dsl b/doc/yazhtml.dsl index 4a69f09..e5e94c7 100644 --- a/doc/yazhtml.dsl +++ b/doc/yazhtml.dsl @@ -1,9 +1,10 @@ + + ]> @@ -16,3 +17,4 @@ + diff --git a/doc/yazphp.dsl b/doc/yazphp.dsl new file mode 100644 index 0000000..0f3f672 --- /dev/null +++ b/doc/yazphp.dsl @@ -0,0 +1,85 @@ + + + +]> + + + + + +(define %html-ext% ".php") +(define %shade-verbatim% #t) + +(define (php-code code) + (make processing-instruction + data: (string-append "php " code "?"))) + +(define (html-document title-sosofo body-sosofo) + (let* (;; Let's look these up once, so that we can avoid calculating + ;; them over and over again. + (prev (prev-chunk-element)) + (next (next-chunk-element)) + (prevm (prev-major-component-chunk-element)) + (nextm (next-major-component-chunk-element)) + (navlist (list prev next prevm nextm)) + + ;; Let's make it possible to control the output even in the + ;; nochunks case. Note: in the nochunks case, (chunk?) will + ;; return #t for only the root element. + (make-entity? (and (or (not nochunks) rootchunk) + (chunk?))) + + (make-head? (or make-entity? + (and nochunks + (node-list=? (current-node) + (sgml-root-element))))) + (doc-sosofo + (if make-head? + (make sequence + (php-code "require \"../id_common.inc\"") + (make element gi: "HTML" + (make element gi: "HEAD" + (make element gi: "TITLE " title-sosofo) + ($standard-html-header$ prev next prevm nextm)) + (make element gi: "BODY" + attributes: (append + (list (list "CLASS" (gi))) + %body-attr%) + (header-navigation (current-node) navlist) + body-sosofo + (footer-navigation (current-node) navlist) + ) + ) + (php-code "id_footer();") + ) + body-sosofo + ) + ) + ) + (if make-entity? + (make entity + system-id: (html-entity-file (html-file)) + (if %html-pubid% + (make document-type + name: "HTML" + public-id: %html-pubid%) + (empty-sosofo)) + doc-sosofo) + (if (node-list=? (current-node) (sgml-root-element)) + (make sequence + (if %html-pubid% + (make document-type + name: "HTML" + public-id: %html-pubid%) + (empty-sosofo)) + doc-sosofo) + doc-sosofo)))) + + + + + + diff --git a/doc/yazprint.dsl b/doc/yazprint.dsl index 9c99e11..b4a5ddd 100644 --- a/doc/yazprint.dsl +++ b/doc/yazprint.dsl @@ -1,9 +1,9 @@ + ]> @@ -12,4 +12,5 @@ - \ No newline at end of file + +