#include "ext/standard/info.h"
#include "php_yaz.h"
-#include <yaz/proto.h>
-#include <yaz/tcpip.h>
-#include <yaz/pquery.h>
-
-#ifdef YAZ_VERSIONL
-
-#if YAZ_VERSIONL >= 0x010808
-#define USE_ZOOM 1
-#endif
-
-#else
-
-#ifdef YAZ_DATE
-#define USE_ZOOM 0
-#endif
+#include <yaz/yaz-version.h>
+#ifndef YAZ_VERSIONL
+#error YAZ version 1.9 or later must be used.
#endif
-#ifndef USE_ZOOM
-#error YAZ version 1.8 or later must be used.
+#if YAZ_VERSIONL < 0x010900
+#error YAZ version 1.9 or later must be used.
#endif
-#include <yaz/diagbib1.h>
-#include <yaz/otherinfo.h>
+#include <yaz/proto.h>
#include <yaz/marcdisp.h>
#include <yaz/yaz-util.h>
-#include <yaz/yaz-version.h>
#include <yaz/yaz-ccl.h>
-#if USE_ZOOM
#include <yaz/zoom.h>
-#else
-#include <yaz/sortspec.h>
-#include <yaz/ill.h>
-#endif
#define MAX_ASSOC 100
typedef struct Yaz_AssociationInfo *Yaz_Association;
-#if USE_ZOOM
-#else
-typedef struct Yaz_ResultSetInfo *Yaz_ResultSet;
-typedef struct Yaz_RecordCacheInfo *Yaz_RecordCache;
-
-struct Yaz_RecordCacheInfo {
- Z_NamePlusRecordList recordList;
- Yaz_RecordCache next;
-};
-
-struct Yaz_ResultSetInfo {
- Z_Query *query;
- Z_ReferenceId *referenceId;
- ODR odr;
- int resultCount;
- Yaz_ResultSet next;
- Z_NamePlusRecordList *recordList;
- int sorted;
-};
-
-#define PHP_YAZ_SELECT_READ 1
-#define PHP_YAZ_SELECT_WRITE 2
-#define PHP_YAZ_STATE_CONNECTING 1
-#define PHP_YAZ_STATE_ESTABLISHED 2
-#define PHP_YAZ_STATE_CLOSED 3
-
-#define PHP_YAZ_ERROR_CONNECTION_LOST (-1)
-#define PHP_YAZ_ERROR_DECODE (-2)
-#define PHP_YAZ_ERROR_ENCODE (-3)
-#define PHP_YAZ_ERROR_CONNECT (-4)
-#define PHP_YAZ_ERROR_INIT (-5)
-#define PHP_YAZ_ERROR_TIMEOUT (-6)
-
-#endif
-
struct Yaz_AssociationInfo {
CCL_parser ccl_parser;
-#if USE_ZOOM
ZOOM_connection zoom_conn;
ZOOM_resultset zoom_set;
ZOOM_scanset zoom_scan;
ZOOM_package zoom_package;
-#else
- char *host_port;
- int num_databaseNames;
- char **databaseNames;
- char *local_databases;
- COMSTACK cs;
- char *cookie_in;
- char *cookie_out;
- char *client_IP;
- char *user;
- char *group;
- char *pass;
- char *proxy;
- int piggyback;
- int error;
- char *addinfo;
- Yaz_ResultSet resultSets;
- int state;
- int mask_select;
- int reconnect_flag;
- ODR odr_in;
- ODR odr_out;
- ODR odr_scan;
- ODR odr_es;
- Z_ScanResponse *scan_response;
- Z_ExtendedServicesResponse *es_response;
- char *buf_out;
- int len_out;
- char *buf_in;
- int len_in;
- int (*action)(Yaz_Association t);
- int resultSetStartPoint;
- int numberOfRecordsRequested;
- char *elementSetName;
- char *preferredRecordSyntax;
- char *schema;
-
- char *ill_buf_out;
- int ill_len_out;
-#endif
char *sort_criteria;
int persistent;
int in_use;
static Yaz_Association yaz_association_mk ()
{
Yaz_Association p = xmalloc (sizeof(*p));
-#if USE_ZOOM
+
p->zoom_conn = ZOOM_connection_create (0);
p->zoom_set = 0;
p->zoom_scan = 0;
p->zoom_package = 0;
ZOOM_connection_option_set(p->zoom_conn, "implementationName", "PHP");
ZOOM_connection_option_set(p->zoom_conn, "async", "1");
-#else
- p->host_port = 0;
- p->num_databaseNames = 0;
- p->databaseNames = 0;
- p->local_databases = 0;
- p->cs = 0;
- p->cookie_in = 0;
- p->cookie_out = 0;
- p->client_IP = 0;
- p->user = 0;
- p->group = 0;
- p->pass = 0;
- p->proxy = 0;
- p->error = 0;
- p->addinfo = 0;
- p->resultSets = 0;
- p->state = PHP_YAZ_STATE_CLOSED;
- p->mask_select = 0;
- p->reconnect_flag = 0;
- p->odr_in = odr_createmem (ODR_DECODE);
- p->odr_out = odr_createmem (ODR_ENCODE);
- p->odr_scan = odr_createmem (ODR_ENCODE);
- p->odr_es = odr_createmem (ODR_ENCODE);
- p->scan_response = 0;
- p->es_response = 0;
- p->buf_out = 0;
- p->len_out = 0;
- p->buf_in = 0;
- p->len_in = 0;
- p->action = 0;
- p->ill_buf_out = 0;
- p->ill_len_out = 0;
- p->resultSetStartPoint = 1;
- p->numberOfRecordsRequested = 10;
- p->elementSetName = 0;
- p->preferredRecordSyntax = 0;
- p->schema = 0;
-#endif
p->sort_criteria = 0;
p->in_use = 0;
p->order = 0;
int i;
if (!p)
return ;
-#if USE_ZOOM
ZOOM_resultset_destroy (p->zoom_set);
ZOOM_scanset_destroy (p->zoom_scan);
ZOOM_package_destroy (p->zoom_package);
ZOOM_connection_destroy (p->zoom_conn);
-#else
- xfree (p->host_port);
- xfree (p->local_databases);
- for (i = 0; i<p->num_databaseNames; i++)
- xfree (p->databaseNames[i]);
- xfree (p->databaseNames);
- if (p->cs)
- cs_close (p->cs);
- xfree (p->cookie_in);
- xfree (p->cookie_out);
- xfree (p->client_IP);
- xfree (p->user);
- xfree (p->group);
- xfree (p->pass);
- xfree (p->proxy);
- xfree (p->addinfo);
- odr_destroy (p->odr_in);
- odr_destroy (p->odr_out);
- odr_destroy (p->odr_scan);
- odr_destroy (p->odr_es);
- /* buf_out */
- /* buf_in */
- /* action */
- xfree (p->ill_buf_out);
- xfree (p->elementSetName);
- xfree (p->preferredRecordSyntax);
- xfree (p->schema);
-#endif
xfree (p->sort_criteria);
ccl_qual_rm(&p->ccl_parser->bibset);
ccl_parser_destroy(p->ccl_parser);
}
-#if USE_ZOOM
-#else
-static Yaz_ResultSet yaz_resultset_mk()
-{
- ODR odr = odr_createmem (ODR_ENCODE);
- Yaz_ResultSet p = odr_malloc (odr, sizeof(*p));
-
- p->query = 0;
- p->referenceId = 0;
- p->odr = odr;
- p->resultCount = 0;
- p->next = 0;
- p->recordList = 0;
- p->sorted = 0;
- return p;
-}
-
-static void yaz_resultset_destroy (Yaz_ResultSet p)
-{
- if (!p)
- return;
- if (p->odr)
- odr_destroy (p->odr);
-}
-#endif
-
#ifdef ZTS
static MUTEX_T yaz_mutex;
#endif
{NULL, NULL, NULL}
};
-static void get_assoc (INTERNAL_FUNCTION_PARAMETERS, pval **id, Yaz_Association *assocp)
+static void get_assoc (INTERNAL_FUNCTION_PARAMETERS, pval **id,
+ Yaz_Association *assocp)
{
Yaz_Association *as = 0;
#endif
}
-#if USE_ZOOM
-#else
-static void do_close (Yaz_Association p)
-{
- p->mask_select = 0;
- p->state = PHP_YAZ_STATE_CLOSED;
- if (p->cs)
- {
- cs_close (p->cs);
- p->cs = 0;
- }
-}
-
-static void do_connect (Yaz_Association p)
-{
- void *addr;
-
- p->reconnect_flag = 0;
- p->cs = cs_create (tcpip_type, 0, PROTO_Z3950);
-
- if (p->proxy)
- addr = tcpip_strtoaddr (p->proxy);
- else
- addr = tcpip_strtoaddr (p->host_port);
- if (!addr)
- {
- do_close(p);
- p->error = PHP_YAZ_ERROR_CONNECT;
- return;
- }
- cs_connect (p->cs, addr);
- p->state = PHP_YAZ_STATE_CONNECTING;
- p->mask_select = PHP_YAZ_SELECT_READ | PHP_YAZ_SELECT_WRITE;
-}
-
-static void response_diag (Yaz_Association t, Z_DiagRec *p)
-{
- Z_DefaultDiagFormat *r;
- char *addinfo = 0;
-
- xfree (t->addinfo);
- t->addinfo = 0;
- if (p->which != Z_DiagRec_defaultFormat)
- {
- t->error = PHP_YAZ_ERROR_DECODE;
- return;
- }
- r = p->u.defaultFormat;
- switch (r->which)
- {
- case Z_DefaultDiagFormat_v2Addinfo:
- addinfo = r->u.v2Addinfo;
- break;
- case Z_DefaultDiagFormat_v3Addinfo:
- addinfo = r->u.v3Addinfo;
- break;
- }
- if (addinfo)
- t->addinfo = xstrdup (addinfo);
- t->error = *r->condition;
-}
-#endif
-
static const char *array_lookup_string(HashTable *ht, const char *idx)
{
pval **pvalue;
static int send_sort_present (Yaz_Association t);
static int send_sort (Yaz_Association t);
-#if USE_ZOOM
const char *option_get (Yaz_Association as, const char *name)
{
if (!as)
ZOOM_connection_option_set (as->zoom_conn, name, s);
}
}
-#else
-
-static void handle_records (Yaz_Association t, Z_Records *sr,
- int present_phase)
-{
- if (sr && sr->which == Z_Records_NSD)
- {
- Z_DiagRec dr, *dr_p = &dr;
- dr.which = Z_DiagRec_defaultFormat;
- dr.u.defaultFormat = sr->u.nonSurrogateDiagnostic;
-
- response_diag (t, dr_p);
- }
- else if (sr && sr->which == Z_Records_multipleNSD)
- {
- if (sr->u.multipleNonSurDiagnostics->num_diagRecs >= 1)
- response_diag(t, sr->u.multipleNonSurDiagnostics->diagRecs[0]);
- else
- t->error = PHP_YAZ_ERROR_DECODE;
- }
- else
- {
- if (t->numberOfRecordsRequested > 0 && !t->resultSets->recordList)
- {
- int i;
-
- t->resultSets->recordList =
- odr_malloc (t->resultSets->odr,
- sizeof(*t->resultSets->recordList));
- t->resultSets->recordList->records =
- odr_malloc (t->resultSets->odr, t->numberOfRecordsRequested
- * sizeof(*t->resultSets->recordList->records));
- for (i = 0; i < t->numberOfRecordsRequested; i++)
- t->resultSets->recordList->records[i] = 0;
- if (t->numberOfRecordsRequested + t->resultSetStartPoint-1 >
- t->resultSets->resultCount)
- t->resultSets->recordList->num_records =
- t->resultSets->resultCount - t->resultSetStartPoint + 1;
- else
- t->resultSets->recordList->num_records =
- t->numberOfRecordsRequested;
- }
- if (sr && sr->which == Z_Records_DBOSD)
- {
- int j, i;
- NMEM nmem = odr_extract_mem (t->odr_in);
- Z_NamePlusRecordList *p =
- sr->u.databaseOrSurDiagnostics;
- if (t->resultSets->recordList)
- {
- for (j = 0; j < t->resultSets->recordList->num_records; j++)
- if (!t->resultSets->recordList->records[j])
- break;
- for (i = 0; i<p->num_records; i++)
- t->resultSets->recordList->records[i+j] = p->records[i];
- /* transfer our response to search_nmem .. we need it later */
- nmem_transfer (t->resultSets->odr->mem, nmem);
- nmem_destroy (nmem);
- }
- if (present_phase && p->num_records == 0)
- {
- /* present response and we didn't get any records! */
- t->error = PHP_YAZ_ERROR_DECODE;
- t->resultSets->recordList = 0;
- }
- }
- else if (present_phase)
- {
- /* present response and we didn't get any records! */
- t->error = PHP_YAZ_ERROR_DECODE;
- t->resultSets->recordList = 0;
- }
- }
-}
-
-static void search_response (Yaz_Association t, Z_SearchResponse *sr)
-{
- t->resultSets->resultCount = *sr->resultCount;
- handle_records (t, sr->records, 0);
-}
-
-static void present_response (Yaz_Association t, Z_PresentResponse *pr)
-{
- handle_records (t, pr->records, 1);
-}
-
-static void scan_response (Yaz_Association t, Z_ScanResponse *res)
-{
- NMEM nmem = odr_extract_mem (t->odr_in);
- if (res->entries && res->entries->nonsurrogateDiagnostics)
- response_diag(t, res->entries->nonsurrogateDiagnostics[0]);
- t->scan_response = res;
- nmem_transfer (t->odr_scan->mem, nmem);
- nmem_destroy (nmem);
-}
-
-static void sort_response (Yaz_Association t, Z_SortResponse *res)
-{
- if (t->resultSets)
- t->resultSets->sorted = 1;
- if (res->diagnostics && res->num_diagnostics > 0)
- response_diag (t, res->diagnostics[0]);
-}
-
-static void es_response (Yaz_Association t,
- Z_ExtendedServicesResponse *res)
-{
- NMEM nmem = odr_extract_mem (t->odr_in);
- if (res->diagnostics && res->num_diagnostics > 0)
- response_diag(t, res->diagnostics[0]);
- t->es_response = res;
- nmem_transfer (t->odr_es->mem, nmem);
- nmem_destroy (nmem);
-}
-
-static void handle_apdu (Yaz_Association t, Z_APDU *apdu)
-{
- Z_InitResponse *initrs;
-
- t->mask_select = 0;
-
- switch(apdu->which)
- {
- case Z_APDU_initResponse:
- initrs = apdu->u.initResponse;
- if (!*initrs->result)
- {
- t->error = PHP_YAZ_ERROR_INIT;
- }
- else
- {
- char *cookie =
- yaz_oi_get_string_oidval (&apdu->u.initResponse->otherInfo,
- VAL_COOKIE, 1, 0);
- if (cookie)
- {
- xfree(t->cookie_in);
- t->cookie_in = xstrdup(cookie);
- }
- if (t->action)
- (*t->action) (t);
- t->action = 0;
- }
- break;
- case Z_APDU_searchResponse:
- search_response (t, apdu->u.searchResponse);
- send_sort_present (t);
- break;
- case Z_APDU_presentResponse:
- present_response (t, apdu->u.presentResponse);
- send_present (t);
- break;
- case Z_APDU_scanResponse:
- scan_response (t, apdu->u.scanResponse);
- break;
- case Z_APDU_extendedServicesResponse:
- es_response (t, apdu->u.extendedServicesResponse);
- break;
- case Z_APDU_sortResponse:
- sort_response (t, apdu->u.sortResponse);
- send_present (t);
- break;
- case Z_APDU_close:
- do_close(t);
- if (t->reconnect_flag)
- do_connect (t);
- else
- t->error = PHP_YAZ_ERROR_CONNECTION_LOST;
- break;
- default:
- do_close (t);
- t->error = PHP_YAZ_ERROR_DECODE;
- break;
- }
-}
-
-static int do_read (Yaz_Association t)
-{
- int r;
- Z_APDU *apdu;
-
- r = cs_get (t->cs, &t->buf_in, &t->len_in);
- if (r == 1)
- return 0;
- if (r <= 0)
- {
- do_close (t);
- if (t->reconnect_flag)
- {
- do_connect (t);
- }
- else
- {
- do_close (t);
- t->error = PHP_YAZ_ERROR_CONNECTION_LOST;
- }
- }
- else
- {
- odr_reset (t->odr_in);
- odr_setbuf (t->odr_in, t->buf_in, r, 0);
- if (!z_APDU (t->odr_in, &apdu, 0, 0))
- {
- do_close (t);
- t->error = PHP_YAZ_ERROR_DECODE;
- }
- else
- {
- /* apdu_log(req, t->odr_print, apdu); */
- handle_apdu (t, apdu);
- }
- }
- return 1;
-}
-
-static int do_write_ex (Yaz_Association t, char *buf_out, int len_out)
-{
- int r;
-
- if ((r=cs_put (t->cs, buf_out, len_out)) < 0)
- {
- if (t->reconnect_flag)
- {
- do_close (t);
- do_connect (t);
- }
- else
- {
- if (t->state == PHP_YAZ_STATE_CONNECTING)
- t->error = PHP_YAZ_ERROR_CONNECT;
- else
- t->error = PHP_YAZ_ERROR_CONNECTION_LOST;
- do_close (t);
- return 1;
- }
- }
- else if (r == 1)
- {
- t->state = PHP_YAZ_STATE_ESTABLISHED;
- t->mask_select = PHP_YAZ_SELECT_READ|PHP_YAZ_SELECT_WRITE;
- }
- else
- {
- t->state = PHP_YAZ_STATE_ESTABLISHED;
- t->mask_select = PHP_YAZ_SELECT_READ;
- }
- return 0;
-}
-
-static int do_write(Yaz_Association t)
-{
- return do_write_ex (t, t->buf_out, t->len_out);
-}
-
-static int send_packet (Yaz_Association t)
-{
- return do_write_ex (t, t->ill_buf_out, t->ill_len_out);
-}
-
-static int encode_APDU(Yaz_Association t, Z_APDU *a, ODR out)
-{
- char str[120];
-
- if (a == 0)
- abort();
- sprintf (str, "send_APDU t=%p type=%d", t, a->which);
- if (t->client_IP)
- {
- Z_OtherInformation **oi;
- yaz_oi_APDU(a, &oi);
- yaz_oi_set_string_oidval(oi, out, VAL_CLIENT_IP, 1, t->client_IP);
- }
- if (t->cookie_out)
- {
- Z_OtherInformation **oi;
- yaz_oi_APDU(a, &oi);
- yaz_oi_set_string_oidval(oi, out, VAL_COOKIE, 1, t->cookie_out);
- }
- if (!z_APDU(out, &a, 0, 0))
- {
- FILE *outf = fopen("/tmp/apdu.txt", "w");
- if (outf)
- {
- ODR odr_pr = odr_createmem(ODR_PRINT);
- fprintf (outf, "a=%p\n", a);
- odr_setprint(odr_pr, outf);
- z_APDU(odr_pr, &a, 0, 0);
- odr_destroy(odr_pr);
- fclose (outf);
- }
- php_error (E_WARNING, "YAZ: Couldn't encode APDU");
- do_close (t);
- t->error = PHP_YAZ_ERROR_ENCODE;
- return -1;
- }
- return 0;
-}
-
-static int send_APDU (Yaz_Association t, Z_APDU *a)
-{
- encode_APDU(t, a, t->odr_out);
- t->buf_out = odr_getbuf(t->odr_out, &t->len_out, 0);
- odr_reset(t->odr_out);
- do_write (t);
- return 0;
-}
-
-/* set database names. Take local databases (if set); otherwise
- take databases given in ZURL (if set); otherwise use Default */
-static char **set_DatabaseNames (Yaz_Association t, int *num)
-{
- char **databaseNames;
- char *c;
- int no = 2;
- char *cp = t->local_databases;
-
- if (!cp || !*cp)
- {
- cp = strchr (t->host_port, '/');
- if (cp)
- cp++;
- }
- if (cp)
- {
- c = cp;
- while ((c = strchr(c, '+')))
- {
- c++;
- no++;
- }
- }
- else
- cp = "Default";
- databaseNames = odr_malloc (t->odr_out, no * sizeof(*databaseNames));
- no = 0;
- while (*cp)
- {
- c = strchr (cp, '+');
- if (!c)
- c = cp + strlen(cp);
- else if (c == cp)
- {
- cp++;
- continue;
- }
- /* cp ptr to first char of db name, c is char following db name */
- databaseNames[no] = odr_malloc (t->odr_out, 1+c-cp);
- memcpy (databaseNames[no], cp, c-cp);
- databaseNames[no++][c-cp] = '\0';
- cp = c;
- if (*cp)
- cp++;
- }
- databaseNames[no] = NULL;
- *num = no;
- return databaseNames;
-}
-
-static int send_search (Yaz_Association t)
-{
- Yaz_ResultSet r = t->resultSets;
- Z_APDU *apdu = zget_APDU(t->odr_out, Z_APDU_searchRequest);
- Z_SearchRequest *sreq = apdu->u.searchRequest;
-
- /* resultSetPrepare (req, t, req->cur_pa); */
- if (t->resultSetStartPoint == 1 && t->piggyback &&
- t->numberOfRecordsRequested &&
- (t->schema == 0 || *t->schema == 0) &&
- (t->sort_criteria == 0 || *t->sort_criteria == 0) )
- {
- sreq->largeSetLowerBound = odr_malloc (t->odr_out, sizeof(int));
- *sreq->largeSetLowerBound = 9999999;
- sreq->smallSetUpperBound = &t->numberOfRecordsRequested;
- sreq->mediumSetPresentNumber = &t->numberOfRecordsRequested;
- if (t->elementSetName && *t->elementSetName)
- {
- Z_ElementSetNames *esn = odr_malloc (t->odr_out, sizeof(*esn));
-
- esn->which = Z_ElementSetNames_generic;
- esn->u.generic = t->elementSetName;
- sreq->mediumSetElementSetNames = esn;
- sreq->smallSetElementSetNames = esn;
- }
- if (t->preferredRecordSyntax && *t->preferredRecordSyntax)
- sreq->preferredRecordSyntax =
- yaz_str_to_z3950oid (t->odr_out, CLASS_RECSYN,
- t->preferredRecordSyntax);
- }
- sreq->query = r->query;
- sreq->databaseNames = set_DatabaseNames (t, &sreq->num_databaseNames);
-
- send_APDU (t, apdu);
- return 1;
-}
-
-static int send_sort_present (Yaz_Association t)
-{
- if (!send_sort(t))
- return send_present (t);
- return 1;
-}
-
-static int send_present (Yaz_Association t)
-{
- Z_APDU *apdu = zget_APDU(t->odr_out, Z_APDU_presentRequest);
- Z_PresentRequest *req = apdu->u.presentRequest;
- int i = 0;
-
- if (t->error) /* don't continue on error */
- return 0;
- if (!t->resultSets) /* no result set yet? */
- return 0;
- while (t->resultSets->recordList)
- {
- if (i >= t->resultSets->recordList->num_records)
- { /* got all records ... */
- return 0;
- }
- if (!t->resultSets->recordList->records[i])
- break;
- i++;
- }
- /* got record(s) to retrieve */
-
- req->resultSetStartPoint = odr_malloc (t->odr_out, sizeof(int));
- *req->resultSetStartPoint = t->resultSetStartPoint + i;
-
- req->numberOfRecordsRequested = odr_malloc (t->odr_out, sizeof(int));
- if (t->resultSets->recordList)
- *req->numberOfRecordsRequested =
- t->resultSets->recordList->num_records - i;
- else
- *req->numberOfRecordsRequested = t->numberOfRecordsRequested;
-
- if (*req->numberOfRecordsRequested <= 0)
- return 0;
-
- if (t->preferredRecordSyntax && *t->preferredRecordSyntax)
- req->preferredRecordSyntax =
- yaz_str_to_z3950oid (t->odr_out, CLASS_RECSYN,
- t->preferredRecordSyntax);
- if (t->schema && *t->schema)
- {
- Z_RecordComposition *compo = (Z_RecordComposition *)
- odr_malloc (t->odr_out, sizeof(*compo));
-
- req->recordComposition = compo;
- compo->which = Z_RecordComp_complex;
- compo->u.complex = (Z_CompSpec *)
- odr_malloc(t->odr_out, sizeof(*compo->u.complex));
- compo->u.complex->selectAlternativeSyntax = (bool_t *)
- odr_malloc(t->odr_out, sizeof(bool_t));
- *compo->u.complex->selectAlternativeSyntax = 0;
-
- compo->u.complex->generic = (Z_Specification *)
- odr_malloc(t->odr_out, sizeof(*compo->u.complex->generic));
-
- compo->u.complex->generic->schema = (Odr_oid *)
- yaz_str_to_z3950oid (t->odr_out, CLASS_SCHEMA, t->schema);
-
- if (!compo->u.complex->generic->schema)
- {
- /* OID wasn't a schema! Try record syntax instead. */
-
- compo->u.complex->generic->schema = (Odr_oid *)
- yaz_str_to_z3950oid (t->odr_out, CLASS_RECSYN, t->schema);
- }
- if (t->elementSetName && *t->elementSetName)
- {
- compo->u.complex->generic->elementSpec = (Z_ElementSpec *)
- odr_malloc(t->odr_out, sizeof(Z_ElementSpec));
- compo->u.complex->generic->elementSpec->which =
- Z_ElementSpec_elementSetName;
- compo->u.complex->generic->elementSpec->u.elementSetName =
- odr_strdup (t->odr_out, t->elementSetName);
- }
- else
- compo->u.complex->generic->elementSpec = 0;
- compo->u.complex->num_dbSpecific = 0;
- compo->u.complex->dbSpecific = 0;
- compo->u.complex->num_recordSyntax = 0;
- compo->u.complex->recordSyntax = 0;
- }
- else if (t->elementSetName && *t->elementSetName)
- {
- Z_ElementSetNames *esn = odr_malloc (t->odr_out, sizeof(*esn));
- Z_RecordComposition *compo = odr_malloc (t->odr_out, sizeof(*compo));
-
- esn->which = Z_ElementSetNames_generic;
- esn->u.generic = t->elementSetName;
- compo->which = Z_RecordComp_simple;
- compo->u.simple = esn;
- req->recordComposition = compo;
- }
- send_APDU (t, apdu);
- return 1;
-}
-
-static int send_sort (Yaz_Association t)
-{
- if (t->error)
- return 0;
- if (!t->resultSets || t->resultSets->sorted)
- return 0;
- if (t->sort_criteria && *t->sort_criteria)
- {
- Z_APDU *apdu = zget_APDU(t->odr_out, Z_APDU_sortRequest);
- Z_SortRequest *req = apdu->u.sortRequest;
-
- req->num_inputResultSetNames = 1;
- req->inputResultSetNames = (Z_InternationalString **)
- odr_malloc (t->odr_out, sizeof(*req->inputResultSetNames));
- req->inputResultSetNames[0] = odr_strdup (t->odr_out, "default");
- req->sortedResultSetName = odr_strdup (t->odr_out, "default");
- req->sortSequence = yaz_sort_spec (t->odr_out, t->sort_criteria);
- if (!req->sortSequence)
- {
- t->resultSets->sorted = 1;
- return 0;
- }
- send_APDU (t, apdu);
- return 1;
- }
- return 0;
-}
-
-static void send_init(Yaz_Association t)
-{
- Z_APDU *apdu = zget_APDU(t->odr_out, Z_APDU_initRequest);
- Z_InitRequest *ireq = apdu->u.initRequest;
- Z_IdAuthentication *auth = odr_malloc(t->odr_out, sizeof(*auth));
- const char *auth_groupId = t->group;
- const char *auth_userId = t->user;
- const char *auth_password = t->pass;
-
- ODR_MASK_SET(ireq->options, Z_Options_search);
- ODR_MASK_SET(ireq->options, Z_Options_present);
- ODR_MASK_SET(ireq->options, Z_Options_namedResultSets);
- ODR_MASK_SET(ireq->options, Z_Options_scan);
- ODR_MASK_SET(ireq->options, Z_Options_sort);
- ODR_MASK_SET(ireq->options, Z_Options_extendedServices);
-
- ODR_MASK_SET(ireq->protocolVersion, Z_ProtocolVersion_1);
- ODR_MASK_SET(ireq->protocolVersion, Z_ProtocolVersion_2);
- ODR_MASK_SET(ireq->protocolVersion, Z_ProtocolVersion_3);
-
- ireq->implementationName = "PHP/YAZ";
-
- *ireq->maximumRecordSize = 1024*1024;
- *ireq->preferredMessageSize = 1024*1024;
-
- if (auth_groupId || auth_password)
- {
-
- Z_IdPass *pass = odr_malloc(t->odr_out, sizeof(*pass));
- int i = 0;
- pass->groupId = 0;
- if (auth_groupId && *auth_groupId)
- {
- pass->groupId = odr_malloc(t->odr_out, strlen(auth_groupId)+1);
- strcpy(pass->groupId, auth_groupId);
- i++;
- }
- pass->userId = 0;
- if (auth_userId && *auth_userId)
- {
- pass->userId = odr_malloc(t->odr_out, strlen(auth_userId)+1);
- strcpy(pass->userId, auth_userId);
- i++;
- }
- pass->password = 0;
- if (auth_password && *auth_password)
- {
- pass->password = odr_malloc(t->odr_out, strlen(auth_password)+1);
- strcpy(pass->password, auth_password);
- i++;
- }
- if (i)
- {
- auth->which = Z_IdAuthentication_idPass;
- auth->u.idPass = pass;
- ireq->idAuthentication = auth;
- }
- }
- else if (auth_userId)
- {
- auth->which = Z_IdAuthentication_open;
- auth->u.open = odr_malloc(t->odr_out, strlen(auth_userId)+1);
- strcpy(auth->u.open, auth_userId);
- ireq->idAuthentication = auth;
- }
- if (t->proxy)
- yaz_oi_set_string_oidval(&ireq->otherInfo, t->odr_out,
- VAL_PROXY, 1, t->host_port);
- send_APDU (t, apdu);
-}
-
-static int do_event (int *id, int timeout TSRMLS_DC)
-{
- fd_set input, output;
- int i;
- int no = 0;
- int max_fd = 0;
- struct timeval tv;
-
- tv.tv_sec = timeout;
- tv.tv_usec = 0;
-
-#ifdef ZTS
- tsrm_mutex_lock (yaz_mutex);
-#endif
- FD_ZERO (&input);
- FD_ZERO (&output);
- for (i = 0; i < YAZSG(max_links); i++)
- {
- Yaz_Association p = shared_associations[i];
- int fd;
- if (!p || p->order != YAZSG(assoc_seq) || !p->cs)
- continue;
- fd = cs_fileno (p->cs);
- if (max_fd < fd)
- max_fd = fd;
- if (p->mask_select & PHP_YAZ_SELECT_READ)
- {
- FD_SET (fd, &input);
- no++;
- }
- if (p->mask_select & PHP_YAZ_SELECT_WRITE)
- {
- FD_SET (fd, &output);
- no++;
- }
- }
-#ifdef ZTS
- tsrm_mutex_unlock (yaz_mutex);
-#endif
- if (!no)
- return 0;
- no = select (max_fd+1, &input, &output, 0, &tv);
-#ifdef ZTS
- tsrm_mutex_lock (yaz_mutex);
-#endif
- for (i = 0; i<YAZSG(max_links); i++)
- {
- int fd;
- Yaz_Association p = shared_associations[i];
- if (!p || p->order != YAZSG(assoc_seq) || !p->cs)
- continue;
- *id = i+1;
- fd =cs_fileno(p->cs);
- if (no <= 0)
- {
- if (p->mask_select) /* only mark for those still pending */
- {
- p->error = PHP_YAZ_ERROR_TIMEOUT;
- do_close (p);
- }
- }
- else if (p->state == PHP_YAZ_STATE_CONNECTING)
- {
- if (FD_ISSET (fd, &output))
- {
- send_init(p);
- }
- else if (FD_ISSET (fd, &input))
- {
- do_close(p);
- p->error = PHP_YAZ_ERROR_CONNECT;
- }
- }
- else if (p->state == PHP_YAZ_STATE_ESTABLISHED)
- {
- if (FD_ISSET (fd, &input))
- do_read (p);
- if (p->cs && FD_ISSET (fd, &output))
- do_write (p);
- }
- else
- {
- do_close (p);
- p->error = PHP_YAZ_ERROR_CONNECTION_LOST;
- }
- }
-#ifdef ZTS
- tsrm_mutex_unlock (yaz_mutex);
-#endif
- return no;
-}
-
-/* USE_ZOOM */
-#endif
static int strcmp_null(const char *s1, const char *s2)
{
for (i = 0; i<YAZSG(max_links); i++)
{
as = shared_associations[i];
-#if USE_ZOOM
if (persistent && as && !as->in_use &&
!strcmp_null(option_get(as, "host"), zurl_str) &&
!strcmp_null(option_get(as, "proxy"), proxy_str) &&
option_set (as, "otherInfo0", otherInfo[0]);
option_set (as, "otherInfo1", otherInfo[1]);
option_set (as, "otherInfo2", otherInfo[2]);
- option_set (as, "proxy", proxy_str);
option_set (as, "piggyback", piggyback ? "1" : "0");
- option_set (as, "charset", charset_str);
ZOOM_connection_connect (as->zoom_conn, zurl_str, 0);
break;
- }
-#else
- if (persistent && as && !as->in_use &&
- !strcmp_null (as->host_port, zurl_str) &&
- !strcmp_null (as->user, user_str) &&
- !strcmp_null (as->group, group_str) &&
- !strcmp_null (as->pass, pass_str) &&
- !strcmp_null (as->proxy, proxy_str) &&
- !strcmp_null (as->cookie_out, cookie_str))
- break;
-#endif
+ }
}
if (i == YAZSG(max_links))
{
yaz_association_destroy(shared_associations[i]);
}
shared_associations[i] = as = yaz_association_mk ();
-#if USE_ZOOM
+
option_set (as, "user", user_str);
option_set (as, "group", group_str);
option_set (as, "pass", pass_str);
option_set (as, "charset", charset_str);
ZOOM_connection_connect (as->zoom_conn, zurl_str, 0);
-#else
- as->host_port = xstrdup (zurl_str);
- if (cookie_str)
- as->cookie_out = xstrdup (cookie_str);
- if (user_str)
- as->user = xstrdup (user_str);
- if (group_str)
- as->group = xstrdup (group_str);
- if (pass_str)
- as->pass = xstrdup (pass_str);
- if (proxy_str)
- as->proxy = xstrdup (proxy_str);
-#endif
}
as->in_use = 1;
as->persistent = persistent;
as->order = YAZSG(assoc_seq);
-#if USE_ZOOM
-#else
- as->action = 0;
- as->error = 0;
- xfree (as->sort_criteria);
- as->sort_criteria = 0;
-
- as->piggyback = piggyback;
- as->numberOfRecordsRequested = 10;
- as->resultSetStartPoint = 1;
-
- xfree (as->local_databases);
- as->local_databases = 0;
-
- xfree (as->client_IP);
- as->client_IP = 0;
- if (client_IP)
- as->client_IP = xstrdup (client_IP);
-#endif
#ifdef ZTS
tsrm_mutex_unlock (yaz_mutex);
char *query_str, *type_str;
pval **id, **type, **query;
Yaz_Association p;
-#if USE_ZOOM
-#else
- Yaz_ResultSet r;
-#endif
if (ZEND_NUM_ARGS() == 3)
{
if (zend_get_parameters_ex(3, &id, &type, &query) == FAILURE)
type_str = (*type)->value.str.val;
convert_to_string_ex (query);
query_str = (*query)->value.str.val;
-#if USE_ZOOM
+
ZOOM_resultset_destroy (p->zoom_set);
p->zoom_set = 0;
if (!strcmp (type_str, "rpn"))
{
RETVAL_FALSE;
}
-#else
- p->action = 0;
- yaz_resultset_destroy (p->resultSets);
- r = p->resultSets = yaz_resultset_mk();
- r->query = odr_malloc (r->odr, sizeof(*r->query));
- if (!strcmp (type_str, "rpn"))
- {
- r->query->which = Z_Query_type_1;
- r->query->u.type_1 = p_query_rpn (r->odr, PROTO_Z3950, query_str);
- if (!r->query->u.type_1)
- {
- yaz_resultset_destroy(r);
- p->resultSets = 0;
- RETVAL_FALSE;
- }
- else
- {
- RETVAL_TRUE;
- }
- }
- else if (!strcmp(type_str, "ccl"))
- {
- r->query->which = Z_Query_type_2;
- r->query->u.type_2 = odr_malloc (r->odr, sizeof(*r->query->u.type_2));
- r->query->u.type_2->buf = odr_strdup(r->odr, query_str);
- r->query->u.type_2->len = strlen(query_str);
- }
- else
- {
- yaz_resultset_destroy(r);
- p->resultSets = 0;
- RETVAL_FALSE;
- }
- if (p->resultSets)
- p->action = send_search;
-#endif
release_assoc (p);
}
/* }}} */
{
RETURN_FALSE;
}
-#if USE_ZOOM
if (p->zoom_set)
{
size_t start = option_get_int (p, "start", 0);
if (count > 0)
ZOOM_resultset_records (p->zoom_set, 0 /* recs */, start, count);
}
-#else
- p->action = 0;
- if (p->resultSets)
- {
- p->resultSets->recordList = 0;
- p->action = send_sort_present;
- }
-#endif
release_assoc (p);
RETURN_TRUE;
}
Process events. */
PHP_FUNCTION(yaz_wait)
{
-#if USE_ZOOM
int no = 0;
ZOOM_connection conn_ar[MAX_ASSOC];
-#endif
int i, id, timeout = 15;
if (ZEND_NUM_ARGS() == 1)
#endif
for (i = 0; i<YAZSG(max_links); i++)
{
-#if USE_ZOOM
Yaz_Association p = shared_associations[i];
if (p && p->order == YAZSG(assoc_seq))
{
ZOOM_connection_option_set (p->zoom_conn, "timeout", str);
conn_ar[no++] = p->zoom_conn;
}
-#else
- Yaz_Association p = shared_associations[i];
- if (!p || p->order != YAZSG(assoc_seq) || !p->action
- || p->mask_select)
- continue;
- if (!p->cs)
- {
- do_connect (p);
- }
- else
- {
- p->reconnect_flag = 1;
- (*p->action)(p);
- }
-#endif
}
#ifdef ZTS
tsrm_mutex_unlock (yaz_mutex);
#endif
-#if USE_ZOOM
if (no)
while (ZOOM_event (no, conn_ar))
;
-#else
- while (do_event(&id, timeout TSRMLS_CC))
- ;
-#endif
RETURN_TRUE;
}
/* }}} */
{
RETURN_LONG(0);
}
-#if USE_ZOOM
RETVAL_LONG(ZOOM_connection_errcode (p->zoom_conn));
-#else
- RETVAL_LONG(p->error);
-#endif
release_assoc (p);
}
/* }}} */
WRONG_PARAM_COUNT;
}
get_assoc (INTERNAL_FUNCTION_PARAM_PASSTHRU, id, &p);
-#if USE_ZOOM
if (p)
{
int code = ZOOM_connection_errcode (p->zoom_conn);
estrndup(msg, return_value->value.str.len);
return_value->type = IS_STRING;
}
-#else
- if (p && p->error)
- {
- const char *msg = 0;
- if (p->error < 0)
- {
- switch (p->error)
- {
- case PHP_YAZ_ERROR_CONNECTION_LOST:
- msg = "connection lost";
- break;
- case PHP_YAZ_ERROR_DECODE:
- msg = "decoding failure";
- break;
- case PHP_YAZ_ERROR_ENCODE:
- msg = "encoding failure";
- break;
- case PHP_YAZ_ERROR_CONNECT:
- msg = "connect failed";
- break;
- case PHP_YAZ_ERROR_INIT:
- msg = "initialization failed";
- break;
- case PHP_YAZ_ERROR_TIMEOUT:
- msg = "timeout failure";
- break;
- default:
- msg = "unknown failure";
- break;
- }
- }
- else
- {
- msg = diagbib1_str (p->error);
- if (!msg)
- msg = "unknown diagnostic";
- }
- /* Not macro using because RETURN_STRING throws away const */
- return_value->value.str.len = strlen(msg);
- return_value->value.str.val =
- estrndup(msg, return_value->value.str.len);
- return_value->type = IS_STRING;
- }
-#endif
release_assoc (p);
}
/* }}} */
WRONG_PARAM_COUNT;
}
get_assoc (INTERNAL_FUNCTION_PARAM_PASSTHRU, id, &p);
-#if USE_ZOOM
if (p)
{
const char *addinfo = ZOOM_connection_addinfo (p->zoom_conn);
estrndup(addinfo, return_value->value.str.len);
return_value->type = IS_STRING;
}
-#else
- if (p && p->error > 0 && p->addinfo && *p->addinfo)
- {
- RETVAL_STRING(p->addinfo, 1);
- }
-#endif
release_assoc (p);
}
/* }}} */
WRONG_PARAM_COUNT;
}
get_assoc (INTERNAL_FUNCTION_PARAM_PASSTHRU, id, &p);
-#if USE_ZOOM
if (p && p->zoom_set)
{
RETVAL_LONG(ZOOM_resultset_size (p->zoom_set));
{
RETVAL_LONG(0);
}
-#else
- if (!p || !p->resultSets)
- {
- RETVAL_LONG(0);
- }
- else
- {
- RETVAL_LONG(p->resultSets->resultCount);
- }
-#endif
release_assoc (p);
}
/* }}} */
convert_to_string_ex(pval_type);
type = (*pval_type)->value.str.val;
-#if USE_ZOOM
if (p && p->zoom_set)
{
ZOOM_record r = ZOOM_resultset_record (p->zoom_set, pos-1);
}
}
}
-#else
- if (p && p->resultSets && p->resultSets->recordList &&
- pos >= p->resultSetStartPoint &&
- pos < p->resultSetStartPoint + p->resultSets->recordList->num_records)
- {
- Z_NamePlusRecord *npr;
- npr = p->resultSets->recordList->records[pos - p->resultSetStartPoint];
-
- if (npr && npr->which == Z_NamePlusRecord_databaseRecord)
- {
- Z_External *r = (Z_External *) npr->u.databaseRecord;
- oident *ent = oid_getentbyoid(r->direct_reference);
-
- if (!strcmp (type, "syntax"))
- {
- if (ent && ent->desc)
- RETVAL_STRING(ent->desc, 1);
- }
- else if (!strcmp (type, "database"))
- {
- if (npr->databaseName)
- RETVAL_STRING(npr->databaseName, 1);
- }
- else if (!strcmp (type, "string"))
- {
- if (r->which == Z_External_sutrs && ent->value == VAL_SUTRS)
- {
- RETVAL_STRINGL(r->u.sutrs->buf, r->u.sutrs->len, 1);
- }
- else if (r->which == Z_External_octet)
- {
- char *buf = (char *) (r->u.octet_aligned->buf);
- int len = r->u.octet_aligned->len;
-
- switch (ent->value)
- {
- case VAL_SOIF:
- case VAL_HTML:
- break;
- case VAL_TEXT_XML:
- case VAL_APPLICATION_XML:
- break;
- default:
- break;
- }
- RETVAL_STRINGL(buf, len, 1);
- }
- }
- else if (!strcmp (type, "array"))
- {
- if (r->which == Z_External_grs1 && ent->value == VAL_GRS1)
- {
- retval_grs1 (return_value, r->u.grs1);
- }
- else if (r->which == Z_External_octet)
- {
- char *buf = (char *) (r->u.octet_aligned->buf);
- ODR odr = odr_createmem (ODR_DECODE);
- Z_GenericRecord *rec = 0;
-
- switch (ent->value)
- {
- case VAL_SOIF:
- case VAL_HTML:
- break;
- case VAL_TEXT_XML:
- case VAL_APPLICATION_XML:
- /* text2grs1 (&buf, &len, t->odr_in, 0, 0); */
- break;
- default:
- rec = marc_to_grs1 (buf, odr);
- }
- if (rec)
- retval_grs1 (return_value, rec);
- odr_destroy (odr);
- }
- }
- }
- }
-#endif
release_assoc (p);
}
/* }}} */
}
get_assoc (INTERNAL_FUNCTION_PARAM_PASSTHRU, pval_id, &p);
convert_to_string_ex (pval_syntax);
-#if USE_ZOOM
option_set (p, "preferredRecordSyntax", (*pval_syntax)->value.str.val);
-#else
- if (p)
- {
- xfree (p->preferredRecordSyntax);
- p->preferredRecordSyntax = xstrdup ((*pval_syntax)->value.str.val);
- }
-#endif
release_assoc (p);
}
/* }}} */
}
get_assoc (INTERNAL_FUNCTION_PARAM_PASSTHRU, pval_id, &p);
convert_to_string_ex (pval_element);
-#if USE_ZOOM
option_set (p, "elementSetName", (*pval_element)->value.str.val);
-#else
- if (p)
- {
- xfree (p->elementSetName);
- p->elementSetName = xstrdup ((*pval_element)->value.str.val);
- }
-#endif
release_assoc (p);
}
/* }}} */
}
get_assoc (INTERNAL_FUNCTION_PARAM_PASSTHRU, pval_id, &p);
convert_to_string_ex (pval_element);
-#if USE_ZOOM
- option_set (p, "schema", (*pval_element)->value.str.val);
-#else
- if (p)
- {
- xfree (p->schema);
- p->schema = xstrdup ((*pval_element)->value.str.val);
- }
-#endif
+ option_set (p, "schema", (*pval_element)->value.str.val);
release_assoc (p);
}
/* }}} */
get_assoc (INTERNAL_FUNCTION_PARAM_PASSTHRU, pval_id, &p);
convert_to_long_ex (pval_start);
convert_to_long_ex (pval_number);
-#if USE_ZOOM
option_set_int (p, "start", (*pval_start)->value.lval - 1);
option_set_int (p, "count", (*pval_number)->value.lval);
-#else
- if (p)
- {
- p->resultSetStartPoint = (*pval_start)->value.lval;
- if (p->resultSetStartPoint < 1)
- p->resultSetStartPoint = 1;
- p->numberOfRecordsRequested = (*pval_number)->value.lval;
- }
-#endif
release_assoc (p);
}
/* }}} */
if (p)
{
convert_to_string_ex (pval_criteria);
-#if USE_ZOOM
-#else
- if (p->resultSets && p->resultSets->sorted)
- {
- if (!p->sort_criteria || strcmp (p->sort_criteria,
- (*pval_criteria)->value.str.val))
- p->resultSets->sorted = 0;
- }
-#endif
xfree (p->sort_criteria);
p->sort_criteria = xstrdup ((*pval_criteria)->value.str.val);
}
}
/* }}} */
-#if USE_ZOOM
const char *ill_array_lookup (void *handle, const char *name)
{
return array_lookup_string((HashTable *) handle, name);
}
-#else
-static const char *ill_array_lookup (void *clientData, const char *idx)
-{
- return array_lookup_string((HashTable *) clientData, idx+4);
-}
-
-static Z_External *encode_ill_request (Yaz_Association t, HashTable *ht)
-{
- ODR out = t->odr_out;
- ILL_Request *req;
- Z_External *r = 0;
- struct ill_get_ctl ctl;
-
- ctl.odr = t->odr_out;
- ctl.clientData = ht;
- ctl.f = ill_array_lookup;
-
- req = ill_get_ILLRequest(&ctl, "ill", 0);
-
- if (!ill_Request (out, &req, 0, 0))
- {
- int ill_request_size;
- char *ill_request_buf = odr_getbuf (out, &ill_request_size, 0);
- if (ill_request_buf)
- odr_setbuf (out, ill_request_buf, ill_request_size, 1);
- php_error(E_WARNING, "yaz_itemorder: Expected array parameter");
- return 0;
- }
- else
- {
- oident oid;
- int illRequest_size = 0;
- char *illRequest_buf = odr_getbuf (out, &illRequest_size, 0);
-
- oid.proto = PROTO_GENERAL;
- oid.oclass = CLASS_GENERAL;
- oid.value = VAL_ISO_ILL_1;
-
- r = (Z_External *) odr_malloc (out, sizeof(*r));
- r->direct_reference = odr_oiddup(out,oid_getoidbyent(&oid));
- r->indirect_reference = 0;
- r->descriptor = 0;
- r->which = Z_External_single;
-
- r->u.single_ASN1_type = (Odr_oct *)
- odr_malloc (out, sizeof(*r->u.single_ASN1_type));
- r->u.single_ASN1_type->buf = odr_malloc (out, illRequest_size);
- r->u.single_ASN1_type->len = illRequest_size;
- r->u.single_ASN1_type->size = illRequest_size;
- memcpy (r->u.single_ASN1_type->buf, illRequest_buf, illRequest_size);
- }
- return r;
-}
-
-static Z_ItemOrder *encode_item_order(Yaz_Association t,
- HashTable *ht)
-{
- Z_ItemOrder *req = odr_malloc (t->odr_out, sizeof(*req));
- const char *str;
-
- req->which=Z_IOItemOrder_esRequest;
- req->u.esRequest = (Z_IORequest *)
- odr_malloc(t->odr_out,sizeof(Z_IORequest));
-
- /* to keep part ... */
- req->u.esRequest->toKeep = (Z_IOOriginPartToKeep *)
- odr_malloc(t->odr_out,sizeof(Z_IOOriginPartToKeep));
- req->u.esRequest->toKeep->supplDescription = 0;
- req->u.esRequest->toKeep->contact =
- odr_malloc (t->odr_out, sizeof(*req->u.esRequest->toKeep->contact));
-
- str = array_lookup_string (ht, "contact-name");
- req->u.esRequest->toKeep->contact->name = str ?
- nmem_strdup (t->odr_out->mem, str) : 0;
-
- str = array_lookup_string (ht, "contact-phone");
- req->u.esRequest->toKeep->contact->phone = str ?
- nmem_strdup (t->odr_out->mem, str) : 0;
-
- str = array_lookup_string (ht, "contact-email");
- req->u.esRequest->toKeep->contact->email = str ?
- nmem_strdup (t->odr_out->mem, str) : 0;
-
- req->u.esRequest->toKeep->addlBilling = 0;
-
- /* not to keep part ... */
- req->u.esRequest->notToKeep = (Z_IOOriginPartNotToKeep *)
- odr_malloc(t->odr_out,sizeof(Z_IOOriginPartNotToKeep));
-
- req->u.esRequest->notToKeep->resultSetItem = (Z_IOResultSetItem *)
- odr_malloc(t->odr_out, sizeof(Z_IOResultSetItem));
- req->u.esRequest->notToKeep->resultSetItem->resultSetId = "default";
- req->u.esRequest->notToKeep->resultSetItem->item =
- (int *) odr_malloc(t->odr_out, sizeof(int));
-
- str = array_lookup_string (ht, "itemorder-item");
- *req->u.esRequest->notToKeep->resultSetItem->item =
- (str ? atoi(str) : 1);
-
- req->u.esRequest->notToKeep->itemRequest =
- encode_ill_request(t, ht);
-
- return req;
-}
-
-static Z_APDU *encode_es_itemorder (Yaz_Association t, HashTable *ht)
-{
- Z_APDU *apdu = zget_APDU(t->odr_out, Z_APDU_extendedServicesRequest);
- Z_ExtendedServicesRequest *req = apdu->u.extendedServicesRequest;
- const char *str;
- struct oident oident;
- int oid[OID_SIZE];
- Z_External *r = odr_malloc (t->odr_out, sizeof(*r));
-
- *req->function = Z_ExtendedServicesRequest_create;
- oident.proto = PROTO_Z3950;
- oident.oclass = CLASS_EXTSERV;
- oident.value = VAL_ITEMORDER;
- req->taskSpecificParameters = r;
- r->direct_reference =
- odr_oiddup(t->odr_out, oid_ent_to_oid(&oident, oid));
- r->indirect_reference = 0;
- r->descriptor = 0;
- r->which = Z_External_itemOrder;
- r->u.itemOrder = encode_item_order (t, ht);
- req->packageType = odr_oiddup(t->odr_out, oid_ent_to_oid(&oident, oid));
-
- str = array_lookup_string(ht, "package-name");
- if (str && *str)
- req->packageName = nmem_strdup (t->odr_out->mem, str);
-
- str = array_lookup_string(ht, "user-id");
- if (str)
- req->userId = nmem_strdup (t->odr_out->mem, str);
-
- return apdu;
-}
-#endif
/* {{{ proto int yaz_itemorder(int id, array package)
Sends Item Order request */
get_assoc (INTERNAL_FUNCTION_PARAM_PASSTHRU, pval_id, &p);
if (p)
{
-#if USE_ZOOM
ZOOM_options options = ZOOM_options_create();
ZOOM_options_set_callback (options, ill_array_lookup,
p->zoom_package = ZOOM_connection_package (p->zoom_conn, options);
ZOOM_package_send(p->zoom_package, "itemorder");
ZOOM_options_destroy (options);
-#else
- Z_APDU *apdu;
- p->action = 0;
-
- odr_reset (p->odr_es);
- p->es_response = 0;
-
- apdu = encode_es_itemorder (p, Z_ARRVAL_PP(pval_package));
- if (apdu)
- {
- char *buf;
- encode_APDU(p, apdu, p->odr_out);
- buf = odr_getbuf(p->odr_out, &p->ill_len_out, 0);
- xfree (p->ill_buf_out);
- p->ill_buf_out = xmalloc (p->ill_len_out);
- memcpy (p->ill_buf_out, buf, p->ill_len_out);
- p->action = send_packet;
- }
-#endif
}
release_assoc (p);
}
/* }}} */
-#if USE_ZOOM
-#else
-static Z_APDU *encode_scan (Yaz_Association t, const char *type,
- const char *query, HashTable *ht)
-{
- Z_APDU *apdu = zget_APDU(t->odr_out, Z_APDU_scanRequest);
- Z_ScanRequest *req = apdu->u.scanRequest;
- const char *val;
- if (!strcmp(type, "rpn"))
- {
- if (!(req->termListAndStartPoint =
- p_query_scan(t->odr_out, PROTO_Z3950, &req->attributeSet,
- query)))
- {
- char str[80];
- sprintf (str, "YAZ: Bad Scan query: '%.40s'", query);
- php_error (E_WARNING, str);
- return 0;
- }
- }
- else
- {
- char str[80];
- sprintf (str, "YAZ: Bad Scan query type: '%.40s'", type);
- php_error (E_WARNING, str);
- return 0;
- }
- val = array_lookup_string(ht, "number");
- if (val && *val)
- *req->numberOfTermsRequested = atoi(val);
- val = array_lookup_string(ht, "position");
- if (val && *val)
- {
- req->preferredPositionInResponse =
- odr_malloc (t->odr_out, sizeof(int));
- *req->preferredPositionInResponse = atoi(val);
- }
- val = array_lookup_string(ht, "stepsize");
- if (val && *val)
- {
- req->stepSize = odr_malloc (t->odr_out, sizeof(int));
- *req->stepSize = atoi(val);
- }
- req->databaseNames = set_DatabaseNames (t, &req->num_databaseNames);
- return apdu;
-}
-#endif
/* {{{ proto int yaz_scan(int id, type, query [, flags])
Sends Scan Request */
convert_to_string_ex (pval_query);
get_assoc (INTERNAL_FUNCTION_PARAM_PASSTHRU, pval_id, &p);
-#if USE_ZOOM
ZOOM_scanset_destroy (p->zoom_scan);
p->zoom_scan = 0;
if (p)
option_set (p, "stepSize", array_lookup_string (flags_ht, "stepsize"));
p->zoom_scan = ZOOM_connection_scan (p->zoom_conn,
Z_STRVAL_PP(pval_query));}
-#else
- if (p)
- {
- Z_APDU *apdu;
- p->action = 0;
- apdu = encode_scan (p, Z_STRVAL_PP(pval_type), Z_STRVAL_PP(pval_query),
- flags_ht);
- if (apdu)
- {
- char *buf;
- odr_reset(p->odr_scan);
- p->scan_response = 0;
- encode_APDU(p, apdu, p->odr_out);
- buf = odr_getbuf(p->odr_out, &p->ill_len_out, 0);
- xfree (p->ill_buf_out);
- p->ill_buf_out = xmalloc (p->ill_len_out);
- memcpy (p->ill_buf_out, buf, p->ill_len_out);
- p->action = send_packet;
- }
- }
-#endif
release_assoc (p);
}
/* }}} */
RETURN_FALSE;
}
get_assoc (INTERNAL_FUNCTION_PARAM_PASSTHRU, pval_id, &p);
-#if USE_ZOOM
if (p && p->zoom_package)
{
const char *str = ZOOM_package_option_get(p->zoom_package,
add_assoc_string (return_value, "targetReference",
(char*)str, 1);
}
-#else
- if (p && p->es_response)
- {
- Z_ExtendedServicesResponse *res = p->es_response;
-
- if (res->taskPackage &&
- res->taskPackage->which == Z_External_extendedService)
- {
- Z_TaskPackage *taskPackage = res->taskPackage->u.extendedService;
- Odr_oct *id = taskPackage->targetReference;
-
- if (id)
- add_assoc_stringl (return_value, "targetReference",
- id->buf, id->len, 1);
- }
- }
-#endif
release_assoc (p);
}
/* }}} */
RETURN_FALSE;
}
get_assoc (INTERNAL_FUNCTION_PARAM_PASSTHRU, pval_id, &p);
-#if USE_ZOOM
if (p && p->zoom_scan)
{
int pos = 0;
add_assoc_long(*pval_opt, "status", atoi(v));
}
}
-#else
- if (p && p->scan_response)
- {
- int i;
- Z_ScanResponse *res = p->scan_response;
- if (pval_opt)
- {
- if (res->numberOfEntriesReturned)
- add_assoc_long(*pval_opt, "number",
- *res->numberOfEntriesReturned);
- if (res->stepSize)
- add_assoc_long(*pval_opt, "stepsize", *res->stepSize);
- if (res->positionOfTerm)
- add_assoc_long(*pval_opt, "position", *res->positionOfTerm);
- if (res->scanStatus)
- add_assoc_long(*pval_opt, "status", *res->scanStatus);
- }
- for (i = 0; res->entries && i < res->entries->num_entries; i++)
- {
- zval *my_zval;
- ALLOC_ZVAL(my_zval);
- array_init(my_zval);
- INIT_PZVAL(my_zval);
-
- if (res->entries->entries[i]->which == Z_Entry_termInfo)
- {
- Z_TermInfo *t = res->entries->entries[i]->u.termInfo;
- add_next_index_string(my_zval, "term", 1);
-
- if (t->term->which == Z_Term_general)
- add_next_index_stringl (my_zval, t->term->u.general->buf,
- t->term->u.general->len, 1);
- else
- add_next_index_string (my_zval, "?", 1);
- add_next_index_long (my_zval, t->globalOccurrences ?
- *t->globalOccurrences : 0);
- }
- else
- add_next_index_string(my_zval, "unknown", 1);
-
- zend_hash_next_index_insert (
- return_value->value.ht, (void *) &my_zval, sizeof(zval *),
- NULL);
- }
-
- }
-#endif
release_assoc (p);
}
/* }}} */
}
convert_to_string_ex (pval_database);
get_assoc (INTERNAL_FUNCTION_PARAM_PASSTHRU, pval_id, &p);
-#if USE_ZOOM
option_set (p, "databaseName", (*pval_database)->value.str.val);
RETVAL_TRUE;
-#else
- if (p)
- {
- xfree (p->local_databases);
- p->local_databases = xstrdup ((*pval_database)->value.str.val);
- RETVAL_TRUE;
- }
- else
- RETVAL_FALSE;
-#endif
release_assoc (p);
}
/* }}} */
php_info_print_table_start();
php_info_print_table_row(2, "YAZ Support", "enabled");
php_info_print_table_row(2, "YAZ Version", YAZ_VERSION);
-#if USE_ZOOM
php_info_print_table_row(2, "ZOOM", "enabled");
-#endif
php_info_print_table_end();
}
projects / php / commitdiff