X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=zoom%2Fzoom-c.c;h=3fbd46b1fbf58383c349852d5e5375b40e98affb;hb=32ff7687bdfe5b972d54b1ba4f3078cee011fadf;hp=cbcb0289f0c528bd208c81837acc883d3eab4f87;hpb=c3b984a6d1cf19b1731b7e783ae2c0fd539277ac;p=yaz-moved-to-github.git

diff --git a/zoom/zoom-c.c b/zoom/zoom-c.c
index cbcb028..3fbd46b 100644
--- a/zoom/zoom-c.c
+++ b/zoom/zoom-c.c
@@ -1,5 +1,5 @@
 /*
- * $Id: zoom-c.c,v 1.35 2002-07-03 13:36:55 adam Exp $
+ * $Id: zoom-c.c,v 1.38 2002-07-29 19:51:34 adam Exp $
  *
  * ZOOM layer for C, connections, result sets, queries.
  */
@@ -634,6 +634,39 @@ int z3950_connection_mask(ZOOM_connection c)
     return 0;
 }
 
+static void otherInfo_attach (ZOOM_connection c, Z_APDU *a, ODR out)
+{
+    int i;
+    for (i = 0; i<200; i++)
+    {
+        size_t len;
+	Z_OtherInformation **oi;
+        char buf[20];
+        const char *val;
+        const char *cp;
+        int oidval;
+
+        sprintf (buf, "otherInfo%d", i);
+        val = ZOOM_options_get (c->options, buf);
+        if (!val)
+            break;
+        cp = strchr (val, ':');
+        if (!cp)
+            continue;
+        len = cp - val;
+        if (len >= sizeof(buf))
+            len = sizeof(buf)-1;
+        memcpy (buf, val, len);
+        buf[len] = '\0';
+        oidval = oid_getvalbyname (buf);
+        if (oidval == VAL_NONE)
+            continue;
+        
+	yaz_oi_APDU(a, &oi);
+	yaz_oi_set_string_oidval(oi, out, oidval, 1, cp+1);
+    }
+}
+
 static int encode_APDU(ZOOM_connection c, Z_APDU *a, ODR out)
 {
     assert (a);
@@ -649,6 +682,7 @@ static int encode_APDU(ZOOM_connection c, Z_APDU *a, ODR out)
 	yaz_oi_APDU(a, &oi);
 	yaz_oi_set_string_oidval(oi, out, VAL_CLIENT_IP, 1, c->client_IP);
     }
+    otherInfo_attach (c, a, out);
     if (!z_APDU(out, &a, 0, 0))
     {
 	FILE *outf = fopen("/tmp/apdu.txt", "a");
@@ -775,13 +809,14 @@ static int ZOOM_connection_send_init (ZOOM_connection c)
     	
     	if ((oi_unit = yaz_oi_update(oi, c->odr_out, NULL, 0, 0)))
     	{
-    		ODR_MASK_SET(ireq->options, Z_Options_negotiationModel);
-    		
-    		oi_unit->which = Z_OtherInfo_externallyDefinedInfo;
-    		oi_unit->information.externallyDefinedInfo =
-    			yaz_set_proposal_charneg(c->odr_out,
-    				(const char **)&c->charset, (c->charset) ? 1:0,
-    				(const char **)&c->lang, (c->lang) ? 1:0, 1);
+            ODR_MASK_SET(ireq->options, Z_Options_negotiationModel);
+            
+            oi_unit->which = Z_OtherInfo_externallyDefinedInfo;
+            oi_unit->information.externallyDefinedInfo =
+                yaz_set_proposal_charneg
+                (c->odr_out,
+                 (const char **)&c->charset, (c->charset) ? 1:0,
+                 (const char **)&c->lang, (c->lang) ? 1:0, 1);
     	}
     }
     assert (apdu);
@@ -1116,6 +1151,30 @@ ZOOM_record_get (ZOOM_record rec, const char *type, int *len)
     else if (!strcmp (type, "raw"))
     {
 	if (npr->which == Z_NamePlusRecord_databaseRecord)
+	{
+	    Z_External *r = (Z_External *) npr->u.databaseRecord;
+	    
+	    if (r->which == Z_External_sutrs)
+	    {
+		if (len) *len = r->u.sutrs->len;
+		return (const char *) r->u.sutrs->buf;
+	    }
+	    else if (r->which == Z_External_octet)
+	    {
+		if (len) *len = r->u.octet_aligned->len;
+		return (const char *) r->u.octet_aligned->buf;
+	    }
+	    else /* grs-1, explain, ... */
+	    {
+		if (len) *len = -1;
+                return (const char *) npr->u.databaseRecord;
+	    }
+	}
+	return 0;
+    }
+    else if (!strcmp (type, "ext"))
+    {
+	if (npr->which == Z_NamePlusRecord_databaseRecord)
             return (const char *) npr->u.databaseRecord;
 	return 0;
     }
@@ -2279,7 +2338,7 @@ ZOOM_event (int no, ZOOM_connection *cs)
 #if HAVE_SYS_POLL_H
 
 #else
-    tv.tv_sec = 15;
+    tv.tv_sec = 25;
     tv.tv_usec = 0;
     
     FD_ZERO (&input);
@@ -2340,7 +2399,7 @@ ZOOM_event (int no, ZOOM_connection *cs)
     if (!nfds)
         return 0;
 #if HAVE_SYS_POLL_H
-    r = poll (pollfds, nfds, 15000);
+    r = poll (pollfds, nfds, 25000);
     for (i = 0; i<nfds; i++)
     {
         ZOOM_connection c = poll_cs[i];