X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fyaz-z-query.cpp;fp=src%2Fyaz-z-query.cpp;h=b852f9f5fd9dc21163a19cfa8a8e40107df05060;hb=7411ed6df7fc0b535f83503f73d70e80f390e295;hp=641934cfb5fc61e36b55228f3abc5e9cd583cd1a;hpb=75f7c460d6d10961f3d2ed841b757d6d6b7725d7;p=yazpp-moved-to-github.git

diff --git a/src/yaz-z-query.cpp b/src/yaz-z-query.cpp
index 641934c..b852f9f 100644
--- a/src/yaz-z-query.cpp
+++ b/src/yaz-z-query.cpp
@@ -2,7 +2,7 @@
  * Copyright (c) 1998-2003, Index Data.
  * See the file LICENSE for details.
  * 
- * $Id: yaz-z-query.cpp,v 1.16 2005-06-02 06:40:21 adam Exp $
+ * $Id: yaz-z-query.cpp,v 1.17 2005-06-25 15:53:19 adam Exp $
  */
 
 #include <yaz++/z-query.h>
@@ -25,9 +25,9 @@ int Yaz_Z_Query::set_rpn (const char *rpn)
     query->which = Z_Query_type_1;
     query->u.type_1 = p_query_rpn (odr_encode, PROTO_Z3950, rpn);
     if (!query->u.type_1)
-	return -1;
+        return -1;
     if (!z_Query (odr_encode, &query, 0, 0))
-	return -1;
+        return -1;
     // z_Query(odr_print, &query, 0, 0);
     m_buf = odr_getbuf (odr_encode, &m_len, 0);
     return m_len;
@@ -38,7 +38,7 @@ void Yaz_Z_Query::set_Z_Query(Z_Query *z_query)
     m_buf = 0;
     odr_reset (odr_encode);
     if (!z_Query (odr_encode, &z_query, 0, 0))
-	return;
+        return;
     m_buf = odr_getbuf (odr_encode, &m_len, 0);
 }
 
@@ -53,11 +53,11 @@ Z_Query *Yaz_Z_Query::get_Z_Query ()
 {
     Z_Query *query;
     if (!m_buf)
-	return 0;
+        return 0;
     odr_reset(odr_decode);
     odr_setbuf(odr_decode, m_buf, m_len, 0);
     if (!z_Query(odr_decode, &query, 0, 0))
-	return 0;
+        return 0;
     return query;
 }
 
@@ -66,21 +66,21 @@ void Yaz_Z_Query::print(char *str, int len)
     Z_Query *query;
     *str = 0;
     if (!m_buf)
-	return;
+        return;
     odr_setbuf (odr_decode, m_buf, m_len, 0);
     if (!z_Query(odr_decode, &query, 0, 0))
-	return;
+        return;
     WRBUF wbuf = zquery2pquery(query);
     if (wbuf)
     {
-	if (wrbuf_len(wbuf) > len-1)
-	{
-	    memcpy(str, wrbuf_buf(wbuf), len-1);
-	    str[len-1] = '\0';
-	}
-	else
-	    strcpy(str, wrbuf_buf(wbuf));
-	wrbuf_free(wbuf,1);
+        if (wrbuf_len(wbuf) > len-1)
+        {
+            memcpy(str, wrbuf_buf(wbuf), len-1);
+            str[len-1] = '\0';
+        }
+        else
+            strcpy(str, wrbuf_buf(wbuf));
+        wrbuf_free(wbuf,1);
     }
     odr_reset(odr_decode);
 }
@@ -88,22 +88,22 @@ void Yaz_Z_Query::print(char *str, int len)
 int Yaz_Z_Query::match(Yaz_Z_Query *other)
 {
     if (m_len != other->m_len)
-	return 0;
+        return 0;
     if (!m_buf || !other->m_buf)
-	return 0;
+        return 0;
     if (memcmp(m_buf, other->m_buf, m_len))
-	return 0;
+        return 0;
     return 1;
 }
 
 void Yaz_Z_Query::oid2str(Odr_oid *o, WRBUF buf)
 {
     for (; *o >= 0; o++) {
-	char ibuf[16];
-	sprintf(ibuf, "%d", *o);
-	wrbuf_puts(buf, ibuf);
-	if (o[1] > 0)
-	    wrbuf_putc(buf, '.');
+        char ibuf[16];
+        sprintf(ibuf, "%d", *o);
+        wrbuf_puts(buf, ibuf);
+        if (o[1] > 0)
+            wrbuf_putc(buf, '.');
     }
 }
 
@@ -113,10 +113,10 @@ void Yaz_Z_Query::pr_term(WRBUF wbuf, char *buf, int len)
     wrbuf_putc(wbuf, '"');
     for (i = 0; i<len; i++)
     {
-	int ch = buf[i];
-	if (ch == '"')
-	    wrbuf_putc(wbuf, '\\');
-	wrbuf_putc(wbuf, ch);
+        int ch = buf[i];
+        if (ch == '"')
+            wrbuf_putc(wbuf, '\\');
+        wrbuf_putc(wbuf, ch);
     }
     wrbuf_puts(wbuf, "\" ");
 }
@@ -125,56 +125,56 @@ int Yaz_Z_Query::rpn2pquery(Z_RPNStructure *s, WRBUF buf)
 {
     if (s->which == Z_RPNStructure_simple)
     {
-	Z_Operand *o = s->u.simple;
-	
-	if (o->which == Z_Operand_APT) 
-	{
-	    Z_AttributesPlusTerm *at = s->u.simple->u.attributesPlusTerm;
-	    if (at->attributes) {
-		int i;
-		for (i = 0; i < at->attributes->num_attributes; i++) {
-		    wrbuf_puts(buf, "@attr ");
-		    if (at->attributes->attributes[i]->attributeSet) {
-			oid2str(at->attributes->attributes[i]->attributeSet, buf);
-			wrbuf_putc(buf, ' ');
-		    }
-		    wrbuf_printf(buf, "%d=", *at->attributes->attributes[i]->attributeType);
-		    wrbuf_printf(buf, "%d ", *at->attributes->attributes[i]->value.numeric);
-		}
-	    }
-	    if (at->term->which == Z_Term_general)
-	    {
-		pr_term(buf, (char*) at->term->u.general->buf,
-			at->term->u.general->len);
-	    }
-	    else if (at->term->which == Z_Term_characterString)
-	    {
-		wrbuf_puts(buf, "@term string ");
-		pr_term(buf, at->term->u.characterString,
-			strlen(at->term->u.characterString));
-
-	    }
-	}
-	else if (o->which == Z_Operand_resultSetId)
-	{
-	    wrbuf_printf(buf, "@set %s ", o->u.resultSetId);
-	}
+        Z_Operand *o = s->u.simple;
+        
+        if (o->which == Z_Operand_APT) 
+        {
+            Z_AttributesPlusTerm *at = s->u.simple->u.attributesPlusTerm;
+            if (at->attributes) {
+                int i;
+                for (i = 0; i < at->attributes->num_attributes; i++) {
+                    wrbuf_puts(buf, "@attr ");
+                    if (at->attributes->attributes[i]->attributeSet) {
+                        oid2str(at->attributes->attributes[i]->attributeSet, buf);
+                        wrbuf_putc(buf, ' ');
+                    }
+                    wrbuf_printf(buf, "%d=", *at->attributes->attributes[i]->attributeType);
+                    wrbuf_printf(buf, "%d ", *at->attributes->attributes[i]->value.numeric);
+                }
+            }
+            if (at->term->which == Z_Term_general)
+            {
+                pr_term(buf, (char*) at->term->u.general->buf,
+                        at->term->u.general->len);
+            }
+            else if (at->term->which == Z_Term_characterString)
+            {
+                wrbuf_puts(buf, "@term string ");
+                pr_term(buf, at->term->u.characterString,
+                        strlen(at->term->u.characterString));
+
+            }
+        }
+        else if (o->which == Z_Operand_resultSetId)
+        {
+            wrbuf_printf(buf, "@set %s ", o->u.resultSetId);
+        }
     }
     else if (s->which == Z_RPNStructure_complex)
     {
-	Z_Complex *c = s->u.complex;
-	
-	switch (c->roperator->which) {
-	case Z_Operator_and: wrbuf_puts(buf, "@and "); break;
-	case Z_Operator_or: wrbuf_puts(buf, "@or "); break;
-	case Z_Operator_and_not: wrbuf_puts(buf, "@not "); break;
-	case Z_Operator_prox: wrbuf_puts(buf, "@prox "); break;
-	default: wrbuf_puts(buf, "@unknown ");
-	}
-	if (!rpn2pquery(c->s1, buf))
-	    return 0;
-	if (!rpn2pquery(c->s2, buf))
-	    return 0;
+        Z_Complex *c = s->u.complex;
+        
+        switch (c->roperator->which) {
+        case Z_Operator_and: wrbuf_puts(buf, "@and "); break;
+        case Z_Operator_or: wrbuf_puts(buf, "@or "); break;
+        case Z_Operator_and_not: wrbuf_puts(buf, "@not "); break;
+        case Z_Operator_prox: wrbuf_puts(buf, "@prox "); break;
+        default: wrbuf_puts(buf, "@unknown ");
+        }
+        if (!rpn2pquery(c->s1, buf))
+            return 0;
+        if (!rpn2pquery(c->s2, buf))
+            return 0;
     }
     return 1;
 }
@@ -182,15 +182,23 @@ int Yaz_Z_Query::rpn2pquery(Z_RPNStructure *s, WRBUF buf)
 WRBUF Yaz_Z_Query::zquery2pquery(Z_Query *q)
 {
     if (q->which != Z_Query_type_1 && q->which != Z_Query_type_101) 
-	return 0;
+        return 0;
     WRBUF buf = wrbuf_alloc();
     if (q->u.type_1->attributeSetId) {
-	/* Output attribute set ID */
-	wrbuf_puts(buf, "@attrset ");
-	oid2str(q->u.type_1->attributeSetId, buf);
-	wrbuf_putc(buf, ' ');
+        /* Output attribute set ID */
+        wrbuf_puts(buf, "@attrset ");
+        oid2str(q->u.type_1->attributeSetId, buf);
+        wrbuf_putc(buf, ' ');
     }
     return rpn2pquery(q->u.type_1->RPNStructure, buf) ? buf : 0;
 }
 
 
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+