X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fquerytowrbuf.c;h=79a9b6ed62ad8dbc03a12e9de87dec35d701a48c;hp=d52e37fde8717f974cc93ffcf29c2dbfcd7caccd;hb=480f849f7e012d2d742d2d1dffbd1b0691dcd33a;hpb=cee361c60ab22518b0864d46d2c7b2b472ad797d

diff --git a/src/querytowrbuf.c b/src/querytowrbuf.c
index d52e37f..79a9b6e 100644
--- a/src/querytowrbuf.c
+++ b/src/querytowrbuf.c
@@ -1,5 +1,5 @@
 /* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2011 Index Data
+ * Copyright (C) Index Data
  * See the file LICENSE for details.
  */
 /** \file querytowrbuf.c
@@ -22,14 +22,23 @@ void yaz_encode_pqf_term(WRBUF b, const char *term, int len)
     for (i = 0; i < len; i++)
         if (strchr(" \"{", term[i]))
             break;
-    if (i == len && i)
-        wrbuf_write(b, term, len);
+    if (len > 0 && i == len)
+    {
+        if (term[0] == '@')
+            wrbuf_putc(b, '\\');
+        for (i = 0; i < len; i++)
+        {
+            if (term[i] == '\\')
+                wrbuf_putc(b, '\\');
+            wrbuf_putc(b, term[i]);
+        }
+    }
     else
     {
         wrbuf_putc(b, '"');
-        for (i = 0; i<len; i++)
+        for (i = 0; i < len; i++)
         {
-            if (term[i] == '"')
+            if (term[i] == '"' || term[i] == '\\')
                 wrbuf_putc(b, '\\');
             wrbuf_putc(b, term[i]);
         }
@@ -47,7 +56,7 @@ static void yaz_attribute_element_to_wrbuf(WRBUF b,
     if (element->attributeSet)
     {
         char oid_name_str[OID_STR_MAX];
-        const char *setname = yaz_oid_to_string_buf(element->attributeSet, 
+        const char *setname = yaz_oid_to_string_buf(element->attributeSet,
                                                     0, oid_name_str);
         if (setname)
         {
@@ -56,13 +65,13 @@ static void yaz_attribute_element_to_wrbuf(WRBUF b,
         }
     }
     wrbuf_printf(b, ODR_INT_PRINTF "=", *element->attributeType);
-    switch (element->which) 
+    switch (element->which)
     {
     case Z_AttributeValue_numeric:
         wrbuf_printf(b, ODR_INT_PRINTF, *element->value.numeric);
         break;
     case Z_AttributeValue_complex:
-        for (i = 0; i<element->value.complex->num_list; i++)
+        for (i = 0; i < element->value.complex->num_list; i++)
         {
             if (i)
                 wrbuf_puts(b, ",");
@@ -71,7 +80,7 @@ static void yaz_attribute_element_to_wrbuf(WRBUF b,
                 wrbuf_puts(b, element->value.complex->list[i]->u.string);
             else if (element->value.complex->list[i]->which ==
                      Z_StringOrNumeric_numeric)
-                wrbuf_printf(b, ODR_INT_PRINTF, 
+                wrbuf_printf(b, ODR_INT_PRINTF,
                              *element->value.complex->list[i]->u.numeric);
         }
         break;
@@ -98,13 +107,16 @@ static const char *complex_op_name(const Z_Operator *op)
     }
 }
 
-static void yaz_apt_to_wrbuf(WRBUF b, const Z_AttributesPlusTerm *zapt)
+static void yaz_attributes_to_wrbuf(WRBUF w, const Z_AttributeList *al)
 {
-    int num_attributes = zapt->attributes->num_attributes;
     int i;
-    for (i = 0; i<num_attributes; i++)
-        yaz_attribute_element_to_wrbuf(b,zapt->attributes->attributes[i]);
-    
+    for (i = 0; i < al->num_attributes; i++)
+        yaz_attribute_element_to_wrbuf(w, al->attributes[i]);
+}
+
+static void yaz_apt_to_wrbuf(WRBUF b, const Z_AttributesPlusTerm *zapt)
+{
+    yaz_attributes_to_wrbuf(b, zapt->attributes);
     switch (zapt->term->which)
     {
     case Z_Term_general:
@@ -143,7 +155,7 @@ static void yaz_rpnstructure_to_wrbuf(WRBUF b, const Z_RPNStructure *zs)
             else
                 wrbuf_putc(b, '0');
 
-            wrbuf_printf(b, " " ODR_INT_PRINTF " %d " 
+            wrbuf_printf(b, " " ODR_INT_PRINTF " %d "
                          ODR_INT_PRINTF " ", *op->u.prox->distance,
                          *op->u.prox->ordered,
                          *op->u.prox->relationType);
@@ -193,7 +205,7 @@ void yaz_rpnquery_to_wrbuf(WRBUF b, const Z_RPNQuery *rpn)
                                                      0, oid_name_str);
         if (oid_name)
             wrbuf_printf(b, "@attrset %s ", oid_name);
-    } 
+    }
     yaz_rpnstructure_to_wrbuf(b, rpn->RPNStructure);
     wrbuf_chop_right(b);
 }
@@ -204,7 +216,7 @@ void yaz_query_to_wrbuf(WRBUF b, const Z_Query *q)
     assert(b);
     switch (q->which)
     {
-    case Z_Query_type_1: 
+    case Z_Query_type_1:
     case Z_Query_type_101:
         wrbuf_puts(b,"RPN ");
         yaz_rpnquery_to_wrbuf(b, q->u.type_1);
@@ -244,7 +256,7 @@ void wrbuf_diags(WRBUF b, int num_diagnostics, Z_DiagRec **diags)
         wrbuf_puts(b,"(diag not in default format?)");
     else
     {
-        Z_DefaultDiagFormat *e=diags[0]->u.defaultFormat;
+        Z_DefaultDiagFormat *e = diags[0]->u.defaultFormat;
         if (e->condition)
             wrbuf_printf(b, ODR_INT_PRINTF " ",*e->condition);
         else
@@ -257,6 +269,19 @@ void wrbuf_diags(WRBUF b, int num_diagnostics, Z_DiagRec **diags)
     }
 }
 
+void yaz_facet_list_to_wrbuf(WRBUF w, const Z_FacetList *fl)
+{
+    int i;
+    for (i = 0; i < fl->num; i++)
+    {
+        Z_FacetField *ff = fl->elements[i];
+
+        if (i)
+            wrbuf_puts(w, ", ");
+        yaz_attributes_to_wrbuf(w, ff->attributes);
+    }
+}
+
 /*
  * Local variables:
  * c-basic-offset: 4