X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Fclient.c;h=d3e09ba43fa7c6e9a7f98c68096c7b9bd157d351;hb=3d86f1101d468a7c3329b58fc5ba92adf2bebf35;hp=3ebf63b4a3ca01ea19093c0e7a79bdd167147290;hpb=5593520ab969b557e3ed991a6a749f4413b59f45;p=pazpar2-moved-to-github.git diff --git a/src/client.c b/src/client.c index 3ebf63b..d3e09ba 100644 --- a/src/client.c +++ b/src/client.c @@ -350,6 +350,11 @@ static int nativesyntax_to_type(struct session_database *sdb, char *type, { strcpy(type, "xml"); } + else if (!strncmp(s, "txml", 4)) + { + const char *cp = strchr(s, ';'); + yaz_snprintf(type, 80, "txml; charset=%s", cp ? cp+1 : "marc-8s"); + } else return -1; return 0; @@ -364,6 +369,11 @@ static int nativesyntax_to_type(struct session_database *sdb, char *type, strcpy(type, "xml"); return 0; } + else if (!strcmp(syntax, "TXML")) + { + strcpy(type, "txml"); + return 0; + } else if (!strcmp(syntax, "USmarc") || !strcmp(syntax, "MARC21")) { strcpy(type, "xml; charset=marc8-s"); @@ -470,9 +480,11 @@ void client_record_response(struct client *cl) if (cl->session == 0) ; else if (ZOOM_record_error(rec, &msg, &addinfo, 0)) + { yaz_log(YLOG_WARN, "Record error %s (%s): %s (rec #%d)", - error, addinfo, client_get_url(cl), + msg, addinfo, client_get_url(cl), cl->record_offset); + } else { struct session_database *sdb = client_get_database(cl);