X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fcharneg.c;h=8d6774e2478e74d893ff7f5df6e241fd8b4b534e;hb=8619c87efd449df46e51100488f7367e6832f4d4;hp=302e098eee2f8da48b16b6b761113f96e60ed4d5;hpb=05c274ef315384faafcc5900c17468f0ea2474e6;p=yaz-moved-to-github.git

diff --git a/src/charneg.c b/src/charneg.c
index 302e098..8d6774e 100644
--- a/src/charneg.c
+++ b/src/charneg.c
@@ -1,8 +1,8 @@
 /*
- * Copyright (c) 2002-2004, Index Data
+ * Copyright (C) 1995-2005, Index Data ApS
  * See the file LICENSE for details.
  *
- * $Id: charneg.c,v 1.2 2004-10-15 00:19:00 adam Exp $
+ * $Id: charneg.c,v 1.4 2005-05-18 12:38:40 adam Exp $
  */
 
 /** 
@@ -260,22 +260,22 @@ Z_External *yaz_set_response_charneg(ODR o, const char *charset,
 /* Get negotiation from OtherInformation. Client&Server side */
 Z_CharSetandLanguageNegotiation *yaz_get_charneg_record(Z_OtherInformation *p)
 {
-    Z_External *pext;
     int i;
 	
-    if(!p)
+    if (!p)
         return 0;
 	
-    for (i=0; i<p->num_elements; i++) {
-	
+    for (i = 0; i < p->num_elements; i++) {
+	Z_External *pext;
         if ((p->list[i]->which == Z_OtherInfo_externallyDefinedInfo) &&
             (pext = p->list[i]->information.externallyDefinedInfo)) {
-					
+	    
             oident *ent = oid_getentbyoid(pext->direct_reference);
-			
-            if (ent && ent->value == VAL_CHARNEG3 && ent->oclass == CLASS_NEGOT &&
-                pext->which == Z_External_charSetandLanguageNegotiation) {
-				
+	    
+            if (ent && ent->value == VAL_CHARNEG3 
+		&& ent->oclass == CLASS_NEGOT
+		&&  pext->which == Z_External_charSetandLanguageNegotiation)
+	    {
                 return pext->u.charNeg3;
             }
         }
@@ -283,6 +283,41 @@ Z_CharSetandLanguageNegotiation *yaz_get_charneg_record(Z_OtherInformation *p)
     return 0;
 }
 
+/* Delete negotiation from OtherInformation. Client&Server side */
+int yaz_del_charneg_record(Z_OtherInformation **p)
+{
+    int i;
+	
+    if (!*p)
+        return 0;
+	
+    for (i = 0; i < (*p)->num_elements; i++) {
+	Z_External *pext;
+        if (((*p)->list[i]->which == Z_OtherInfo_externallyDefinedInfo) &&
+            (pext = (*p)->list[i]->information.externallyDefinedInfo)) {
+	    
+            oident *ent = oid_getentbyoid(pext->direct_reference);
+	    
+            if (ent && ent->value == VAL_CHARNEG3 
+		&& ent->oclass == CLASS_NEGOT
+		&& pext->which == Z_External_charSetandLanguageNegotiation)
+	    {
+		--((*p)->num_elements);
+		if ((*p)->num_elements == 0)
+		    *p = 0;
+		else
+		{
+		    for(; i < (*p)->num_elements; i++)
+			(*p)->list[i] = (*p)->list[i+1];
+		}
+		return 1;
+            }
+        }
+    }
+    return 0;
+}
+
+
 /* Get charsets, langs, selected from negotiation.. Server side */
 void yaz_get_proposal_charneg(NMEM mem, Z_CharSetandLanguageNegotiation *p,
                               char ***charsets, int *num_charsets,