* Copyright (C) 1995-2007, Index Data ApS
* See the file LICENSE for details.
*
- * $Id: srwutil.c,v 1.55 2007-01-03 08:42:15 adam Exp $
+ * $Id: srwutil.c,v 1.59 2007-05-24 10:18:36 adam Exp $
*/
/**
* \file srwutil.c
{
if (ch == ' ')
strcpy(dst, "+");
+ /* mark = "-" | "_" | "." | "!" | "~" | "*" | "'" | "(" | ")" */
else if ((ch >= 'A' && ch <= 'Z') || (ch >= 'a' && ch <= 'z') ||
- (ch >= '0' && ch <= '9'))
+ (ch >= '0' && ch <= '9') || strchr("-_.!~*'(|)", ch))
{
dst[0] = ch;
dst[1] = '\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);
+ *path = (char *) odr_malloc(o, sz);
for(i = 0; name[i]; i++)
{
cp++;
no++;
}
- *name = odr_malloc(o, no * sizeof(char*));
- *val = odr_malloc(o, no * sizeof(char*));
+ *name = (char **) odr_malloc(o, no * sizeof(char*));
+ *val = (char **) odr_malloc(o, no * sizeof(char*));
for (no = 0; *path; no++)
{
if (!p1)
break;
- (*name)[no] = odr_malloc(o, (p1-path)+1);
+ (*name)[no] = (char *) odr_malloc(o, (p1-path)+1);
memcpy((*name)[no], path, p1-path);
(*name)[no][p1-path] = '\0';
p1 = strchr(path, '&');
if (!p1)
p1 = strlen(path) + path;
- (*val)[no] = ret = odr_malloc(o, p1 - path + 1);
+ (*val)[no] = ret = (char *) odr_malloc(o, p1 - path + 1);
while (*path && *path != '&')
{
if (*path == '+')
return olen;
}
+int yaz_srw_check_content_type(Z_HTTP_Response *hres)
+{
+ const char *content_type = z_HTTP_header_lookup(hres->headers,
+ "Content-Type");
+ if (content_type)
+ {
+ if (!yaz_strcmp_del("text/xml", content_type, "; "))
+ return 1;
+ if (!yaz_strcmp_del("application/xml", content_type, "; "))
+ return 1;
+ }
+ return 0;
+}
+
/**
* Look for authentication tokens in HTTP Basic parameters or in x-username/x-password
* parameters. Added by SH.
sr->u.request->database = db;
- (*soap_package) = odr_malloc(decode, sizeof(**soap_package));
+ (*soap_package) = (Z_SOAP *)
+ odr_malloc(decode, sizeof(**soap_package));
(*soap_package)->which = Z_SOAP_generic;
- (*soap_package)->u.generic =
+ (*soap_package)->u.generic = (Z_SOAP_Generic *)
odr_malloc(decode, sizeof(*(*soap_package)->u.generic));
(*soap_package)->u.generic->p = sr;
sr->u.explain_request->stylesheet = stylesheet;
- (*soap_package) = odr_malloc(decode, sizeof(**soap_package));
+ (*soap_package) = (Z_SOAP *)
+ odr_malloc(decode, sizeof(**soap_package));
(*soap_package)->which = Z_SOAP_generic;
- (*soap_package)->u.generic =
+ (*soap_package)->u.generic = (Z_SOAP_Generic *)
odr_malloc(decode, sizeof(*(*soap_package)->u.generic));
(*soap_package)->u.generic->p = sr;
sr->u.scan_request->stylesheet = stylesheet;
- (*soap_package) = odr_malloc(decode, sizeof(**soap_package));
+ (*soap_package) = (Z_SOAP *)
+ odr_malloc(decode, sizeof(**soap_package));
(*soap_package)->which = Z_SOAP_generic;
- (*soap_package)->u.generic =
+ (*soap_package)->u.generic = (Z_SOAP_Generic *)
odr_malloc(decode, sizeof(*(*soap_package)->u.generic));
(*soap_package)->u.generic->p = sr;
sr->u.explain_request->stylesheet = stylesheet;
- (*soap_package) = odr_malloc(decode, sizeof(**soap_package));
+ (*soap_package) = (Z_SOAP *)
+ odr_malloc(decode, sizeof(**soap_package));
(*soap_package)->which = Z_SOAP_generic;
- (*soap_package)->u.generic =
+ (*soap_package)->u.generic = (Z_SOAP_Generic *)
odr_malloc(decode, sizeof(*(*soap_package)->u.generic));
(*soap_package)->u.generic->p = sr;
if (val)
{
name[*i] = a_name;
- value[*i] = odr_malloc(o, 30);
+ value[*i] = (char *) odr_malloc(o, 30);
sprintf(value[*i], "%d", *val);
(*i)++;
}
hreq->method = "GET";
- path = odr_malloc(encode, strlen(hreq->path) + strlen(uri_args) + 4
- +(srw_pdu->extra_args ? strlen(srw_pdu->extra_args) : 0)
- );
+ path = (char *)
+ 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;
int yaz_srw_str_to_pack(const char *str)
{
- if (!strcmp(str, "string"))
+ if (!yaz_matchstr(str, "string"))
return Z_SRW_recordPacking_string;
- if (!strcmp(str, "xml"))
+ if (!yaz_matchstr(str, "xml"))
return Z_SRW_recordPacking_XML;
- if (!strcmp(str, "url"))
+ if (!yaz_matchstr(str, "url"))
return Z_SRW_recordPacking_URL;
return -1;
}