/*
- * Copyright (C) 1995-2005, Index Data ApS
+ * Copyright (C) 1995-2006, Index Data ApS
* See the file LICENSE for details.
*
- * $Id: srwutil.c,v 1.45 2006-07-06 10:17:54 adam Exp $
+ * $Id: srwutil.c,v 1.47 2006-08-18 06:30:05 adam Exp $
*/
/**
* \file srwutil.c
}
}
-void yaz_array_to_uri(char **path, ODR o, char **name, char **value)
+static void yaz_array_to_uri_ex(char **path, ODR o, char **name, char **value,
+ const char *extra_args)
{
- size_t i, szp = 0, sz = 0;
+ size_t i, szp = 0, sz = extra_args ? 1+strlen(extra_args) : 1;
for(i = 0; name[i]; i++)
sz += strlen(name[i]) + 3 + strlen(value[i]) * 3;
*path = odr_malloc(o, sz);
szp += vlen;
}
}
+ if (extra_args)
+ {
+ if (i)
+ (*path)[szp++] = '&';
+ memcpy(*path + szp, extra_args, strlen(extra_args));
+ szp += strlen(extra_args);
+ }
(*path)[szp] = '\0';
}
+void yaz_array_to_uri(char **path, ODR o, char **name, char **value)
+{
+ return yaz_array_to_uri_ex(path, o, name, value, 0);
+}
+
int yaz_uri_array(const char *path, ODR o, char ***name, char ***val)
{
int no = 2;
* Look for authentication tokens in HTTP Basic parameters or in x-username/x-password
* parameters. Added by SH.
*/
-static void yaz_srw_decodeauth(Z_SRW_PDU *sr, Z_HTTP_Request *hreq, char *username,
- char *password, ODR decode)
+static void yaz_srw_decodeauth(Z_SRW_PDU *sr, Z_HTTP_Request *hreq,
+ char *username, char *password, ODR decode)
{
const char *basic = z_HTTP_header_lookup(hreq->headers, "Authorization");
return res;
}
-Z_SRW_PDU *yaz_srw_get(ODR o, int which)
+Z_SRW_PDU *yaz_srw_get_core_v_1_1(ODR o)
{
- Z_SRW_PDU *sr = (Z_SRW_PDU *) odr_malloc(o, sizeof(*o));
+ Z_SRW_PDU *p = (Z_SRW_PDU *) odr_malloc(o, sizeof(*p));
+ p->srw_version = odr_strdup(o, "1.1");
+ p->username = 0;
+ p->password = 0;
+ p->extra_args = 0;
+ return p;
+}
- sr->username = 0;
- sr->password = 0;
- sr->srw_version = odr_strdup(o, "1.1");
+Z_SRW_PDU *yaz_srw_get(ODR o, int which)
+{
+ Z_SRW_PDU *sr = yaz_srw_get_core_v_1_1(o);
sr->which = which;
switch(which)
{
if (yaz_get_sru_parms(srw_pdu, encode, name, value))
return -1;
- yaz_array_to_uri(&uri_args, encode, name, value);
+ yaz_array_to_uri_ex(&uri_args, encode, name, value, srw_pdu->extra_args);
hreq->method = "GET";
- path = odr_malloc(encode, strlen(hreq->path) + strlen(uri_args) + 3);
+ path = odr_malloc(encode, strlen(hreq->path) + strlen(uri_args) + 4
+ +(srw_pdu->extra_args ? strlen(srw_pdu->extra_args) : 0)
+ );
sprintf(path, "%s?%s", hreq->path, uri_args);
hreq->path = path;
if (yaz_get_sru_parms(srw_pdu, encode, name, value))
return -1;
- yaz_array_to_uri(&uri_args, encode, name, value);
+ yaz_array_to_uri_ex(&uri_args, encode, name, value, srw_pdu->extra_args);
hreq->method = "POST";