X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=zutil%2Fzoom-c.c;h=59b051d6aa47095ce235ce1c90438c8a8611f4c1;hb=29a22396d7d7b1219f5b83c35983c8fb1cd79e8f;hp=d67461aee1cfd937d42bbb8bf39303e8297e1cca;hpb=ee083e1994e399ceb209780ff4bce7168c8bc82b;p=yaz-moved-to-github.git

diff --git a/zutil/zoom-c.c b/zutil/zoom-c.c
index d67461a..59b051d 100644
--- a/zutil/zoom-c.c
+++ b/zutil/zoom-c.c
@@ -2,7 +2,7 @@
  * Copyright (c) 2000-2003, Index Data
  * See the file LICENSE for details.
  *
- * $Id: zoom-c.c,v 1.38 2003-06-03 13:59:28 adam Exp $
+ * $Id: zoom-c.c,v 1.41 2003-08-19 12:32:29 adam Exp $
  *
  * ZOOM layer for C, connections, result sets, queries.
  */
@@ -604,6 +604,8 @@ ZOOM_resultset_destroy(ZOOM_resultset r)
                 wrbuf_free (rc->rec.wrbuf_marc, 1);
             if (rc->rec.wrbuf_iconv)
                 wrbuf_free (rc->rec.wrbuf_iconv, 1);
+            if (rc->rec.wrbuf_opac)
+                wrbuf_free (rc->rec.wrbuf_opac, 1);
 	}
 	if (r->connection)
 	{
@@ -868,6 +870,7 @@ static zoom_ret send_APDU (ZOOM_connection c, Z_APDU *a)
     assert (a);
     if (encode_APDU(c, a, c->odr_out))
 	return zoom_complete;
+    yaz_log(LOG_DEBUG, "send APDU type=%d", a->which);
     c->buf_out = odr_getbuf(c->odr_out, &c->len_out, 0);
     event = ZOOM_Event_create (ZOOM_EVENT_SEND_APDU);
     ZOOM_connection_put_event (c, event);
@@ -1197,7 +1200,7 @@ static zoom_ret ZOOM_connection_send_search (ZOOM_connection c)
     {
 	/* Regular piggyback - do it unless we're going to do sort */
 	*search_req->largeSetLowerBound = 2000000000;
-	*search_req->smallSetUpperBound = 0;
+	*search_req->smallSetUpperBound = 1;
 	*search_req->mediumSetPresentNumber = r->step>0 ? r->step : r->count;
     }
     else
@@ -1304,6 +1307,7 @@ ZOOM_record_clone (ZOOM_record srec)
     nrec->odr = odr_createmem(ODR_DECODE);
     nrec->wrbuf_marc = 0;
     nrec->wrbuf_iconv = 0;
+    nrec->wrbuf_opac = 0;
     odr_setbuf (nrec->odr, buf, size, 0);
     z_NamePlusRecord (nrec->odr, &nrec->npr, 0, 0);
     
@@ -1337,6 +1341,10 @@ ZOOM_record_destroy (ZOOM_record rec)
 	return;
     if (rec->wrbuf_marc)
 	wrbuf_free (rec->wrbuf_marc, 1);
+    if (rec->wrbuf_iconv)
+	wrbuf_free (rec->wrbuf_iconv, 1);
+    if (rec->wrbuf_opac)
+	wrbuf_free (rec->wrbuf_opac, 1);
     odr_destroy (rec->odr);
     xfree (rec);
 }
@@ -1478,7 +1486,15 @@ ZOOM_record_get (ZOOM_record rec, const char *type_spec, int *len)
     {
         Z_External *r = (Z_External *) npr->u.databaseRecord;
         oident *ent = oid_getentbyoid(r->direct_reference);
-        
+
+	/* render bibliographic record .. */
+	if (r->which == Z_External_OPAC)
+	{
+	    r = r->u.opac->bibliographicRecord;
+	    if (!r)
+		return 0;
+	    ent = oid_getentbyoid(r->direct_reference);
+	}
         if (r->which == Z_External_sutrs)
 	    return record_iconv_return(rec, len,
 				       r->u.sutrs->buf, r->u.sutrs->len,
@@ -1537,6 +1553,15 @@ ZOOM_record_get (ZOOM_record rec, const char *type_spec, int *len)
     {
         Z_External *r = (Z_External *) npr->u.databaseRecord;
         oident *ent = oid_getentbyoid(r->direct_reference);
+
+	/* render bibliographic record .. */
+	if (r->which == Z_External_OPAC)
+	{
+	    r = r->u.opac->bibliographicRecord;
+	    if (!r)
+		return 0;
+	    ent = oid_getentbyoid(r->direct_reference);
+	}
         
         if (r->which == Z_External_sutrs)
 	    return record_iconv_return(rec, len,
@@ -1589,11 +1614,6 @@ ZOOM_record_get (ZOOM_record rec, const char *type_spec, int *len)
             if (len) *len = 5;
             return "GRS-1";
         }
-	else if (r->which == Z_External_OPAC)
-        {
-            if (len) *len = 4;
-            return "OPAC";
-        }
 	return 0;
     }
     else if (!strcmp (type, "raw"))
@@ -1612,7 +1632,7 @@ ZOOM_record_get (ZOOM_record rec, const char *type_spec, int *len)
 		if (len) *len = r->u.octet_aligned->len;
 		return (const char *) r->u.octet_aligned->buf;
 	    }
-	    else /* grs-1, explain, ... */
+	    else /* grs-1, explain, OPAC, ... */
 	    {
 		if (len) *len = -1;
                 return (const char *) npr->u.databaseRecord;
@@ -1626,6 +1646,23 @@ ZOOM_record_get (ZOOM_record rec, const char *type_spec, int *len)
             return (const char *) npr->u.databaseRecord;
 	return 0;
     }
+    else if (npr->which == Z_NamePlusRecord_databaseRecord &&
+             !strcmp (type, "opac"))
+	     
+    {
+	Z_External *r = (Z_External *) npr->u.databaseRecord;
+	if (r->which == Z_External_OPAC)
+	{
+	    if (!rec->wrbuf_opac)
+		rec->wrbuf_opac = wrbuf_alloc();
+	    wrbuf_rewind (rec->wrbuf_opac);
+	    yaz_display_OPAC(rec->wrbuf_opac, r->u.opac, 0);
+	    return record_iconv_return(rec, len,
+				       wrbuf_buf(rec->wrbuf_opac),
+				       wrbuf_len(rec->wrbuf_opac),
+				       charset);
+	}
+    }
     return 0;
 }
 
@@ -1671,6 +1708,7 @@ static void record_cache_add (ZOOM_resultset r, Z_NamePlusRecord *npr,
     rc->rec.odr = 0;
     rc->rec.wrbuf_marc = 0;
     rc->rec.wrbuf_iconv = 0;
+    rc->rec.wrbuf_opac = 0;
     if (elementSetName)
 	rc->elementSetName = odr_strdup (r->odr, elementSetName);
     else
@@ -2468,7 +2506,7 @@ static void handle_apdu (ZOOM_connection c, Z_APDU *apdu)
     Z_InitResponse *initrs;
     
     c->mask = 0;
-    yaz_log (LOG_DEBUG, "handle_apdu type=%d", apdu->which);
+    yaz_log (LOG_DEBUG, "recv APDU type=%d", apdu->which);
     switch(apdu->which)
     {
     case Z_APDU_initResponse:
@@ -2711,15 +2749,16 @@ static void handle_http(ZOOM_connection c, Z_HTTP_Response *hres)
 
 static int do_read (ZOOM_connection c)
 {
-    int r;
+    int r, more;
     ZOOM_Event event;
     
     event = ZOOM_Event_create (ZOOM_EVENT_RECV_DATA);
     ZOOM_connection_put_event (c, event);
     
-    yaz_log (LOG_DEBUG, "do_read len=%d", c->len_in);
 
     r = cs_get (c->cs, &c->buf_in, &c->len_in);
+    more = cs_more(c->cs);
+    yaz_log (LOG_DEBUG, "do_read len=%d more=%d", r, more);
     if (r == 1)
 	return 0;
     if (r <= 0)