Rename serachresult options a bit

diff --git a/doc/zoom.xml b/doc/zoom.xml
index d625e58..570eea2 100644 (file)
--- a/doc/zoom.xml
+++ b/doc/zoom.xml
@@ -1,4 +1,4 @@
-<!-- $Id: zoom.xml,v 1.39 2005-11-01 15:08:01 adam Exp $ -->
+<!-- $Id: zoom.xml,v 1.40 2005-11-02 10:19:46 adam Exp $ -->
  <chapter id="zoom"><title>ZOOM</title>
   <para>
     &zoom; is an acronym for 'Z39.50 Object-Orientation Model' and is
@@ -428,7 +428,7 @@
     are prefixed by 
     <literal>SearchResult.</literal><replaceable>no</replaceable>
     where no presents the item number (0=first, 1=second). 
-    Read <literal>SearchResult.size</literal> to determine the
+    Read <literal>searchresult.size</literal> to determine the
     number of items.
    </para>
    <table frame="top"><title>Search Info Report options</title>
@@ -443,33 +443,33 @@
      </thead>
      <tbody>
       <row>
-       <entry>SearchResult.size</entry>
+       <entry>searchresult.size</entry>
        <entry>
        number of search result entries. This option is-nonexistant
        if no entries are returned by the server.
        </entry>
       </row>
       <row>
-       <entry>SearchResult.<replaceable>no</replaceable>.subqueryId</entry>
+       <entry>searchresult.<replaceable>no</replaceable>.id</entry>
        <entry>sub query ID</entry>
       </row>
       <row>
-       <entry>SearchResult.<replaceable>no</replaceable>.subqueryCount</entry>
+       <entry>searchresult.<replaceable>no</replaceable>.count</entry>
        <entry>result count for item (number of hits)</entry>
       </row>
       <row>
-       <entry>SearchResult.<replaceable>no</replaceable>.subquery.term</entry>
+       <entry>searchresult.<replaceable>no</replaceable>.subquery.term</entry>
        <entry>subquery term</entry>
       </row>
       <row>
        <entry>
-       SearchResult.<replaceable>no</replaceable>.interpretation.term
+       searchresult.<replaceable>no</replaceable>.interpretation.term
        </entry>
        <entry>interpretation term</entry>
       </row>
       <row>
        <entry>
-       SearchResult.<replaceable>no</replaceable>.recommendation.term
+       searchresult.<replaceable>no</replaceable>.recommendation.term
        </entry>
        <entry>recommendation term</entry>
       </row>

diff --git a/src/zoom-c.c b/src/zoom-c.c
index 3e5c65e..2655b73 100644 (file)
--- 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.49 2005-11-02 10:19:46 adam Exp $
  */
 /**
  * \file zoom-c.c
@@ -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.49 $");
     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);
                     }