X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fzoom-c.c;h=3461431976090687bb93fbc489dbca2dce1a2da9;hb=cf3ff0df41755297543b14f007842e1dc216ec25;hp=3e5c65e1da7e14c19a30eaab7619b49e3ba02b3e;hpb=1b74d7ac0e734e7740dae73ea340d24334960bc5;p=yaz-moved-to-github.git diff --git a/src/zoom-c.c b/src/zoom-c.c index 3e5c65e..3461431 100644 --- a/src/zoom-c.c +++ b/src/zoom-c.c @@ -2,7 +2,7 @@ * Copyright (C) 1995-2005, Index Data ApS * See the file LICENSE for details. * - * $Id: zoom-c.c,v 1.48 2005-11-01 15:08:02 adam Exp $ + * $Id: zoom-c.c,v 1.50 2005-11-03 16:49:00 mike Exp $ */ /** * \file zoom-c.c @@ -645,8 +645,8 @@ ZOOM_connection_search(ZOOM_connection c, ZOOM_query q) } ZOOM_API(void) - ZOOM_resultset_sort(ZOOM_resultset r, - const char *sort_type, const char *sort_spec) +ZOOM_resultset_sort(ZOOM_resultset r, + const char *sort_type, const char *sort_spec) { ZOOM_connection c = r->connection; ZOOM_task task; @@ -1045,7 +1045,7 @@ static zoom_ret ZOOM_connection_send_init (ZOOM_connection c) ZOOM_options_get(c->options, "implementationName"), odr_prepend(c->odr_out, "ZOOM-C", ireq->implementationName)); - version = odr_strdup(c->odr_out, "$Revision: 1.48 $"); + version = odr_strdup(c->odr_out, "$Revision: 1.50 $"); if (strlen(version) > 10) /* check for unexpanded CVS strings */ version[strlen(version)-2] = '\0'; ireq->implementationVersion = odr_prepend(c->odr_out, @@ -2082,7 +2082,7 @@ static void handle_searchResult(ZOOM_connection c, ZOOM_resultset resultset, if (sr->num) ZOOM_options_set_int( - resultset->options, "SearchResult.size", sr->num); + resultset->options, "searchresult.size", sr->num); for (j = 0; j < sr->num; j++) { @@ -2090,12 +2090,12 @@ static void handle_searchResult(ZOOM_connection c, ZOOM_resultset resultset, ext->u.searchResult1->elements[j]; char pref[80]; - sprintf(pref, "SearchResult.%d", j); + sprintf(pref, "searchresult.%d", j); if (ent->subqueryId) { char opt_name[80]; - sprintf(opt_name, "%s.subqueryId", pref); + sprintf(opt_name, "%s.id", pref); ZOOM_options_set(resultset->options, opt_name, ent->subqueryId); } @@ -2123,7 +2123,7 @@ static void handle_searchResult(ZOOM_connection c, ZOOM_resultset resultset, if (ent->subqueryCount) { char opt_name[80]; - sprintf(opt_name, "%s.subqueryCount", pref); + sprintf(opt_name, "%s.count", pref); ZOOM_options_set_int(resultset->options, opt_name, *ent->subqueryCount); }