X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fyaz-ccl.c;h=4bffebebb7a42f1d28a672994c8cdd27cb00cd1c;hp=41ab879052f5233cf84ad1c7945722c7f08a22a1;hb=5e1889250160764822014ce89ee19dc84e5ce310;hpb=c6e47cbbff56f39f6d81b079ebaeac41d793d4d9 diff --git a/src/yaz-ccl.c b/src/yaz-ccl.c index 41ab879..4bffebe 100644 --- a/src/yaz-ccl.c +++ b/src/yaz-ccl.c @@ -1,8 +1,10 @@ -/* - * Copyright (c) 1996-2003, Index Data. +/* This file is part of the YAZ toolkit. + * Copyright (C) 1995-2010 Index Data * See the file LICENSE for details. - * - * $Id: yaz-ccl.c,v 1.1 2003-10-27 12:21:36 adam Exp $ + */ +/** + * \file yaz-ccl.c + * \brief Implements CCL node tree to RPN converson. */ #include @@ -21,9 +23,9 @@ Z_RPNQuery *ccl_rpn_query (ODR o, struct ccl_rpn_node *p) ccl_pquery(wr, p); - q = yaz_pqf_parse(parser, o, wrbuf_buf(wr)); + q = yaz_pqf_parse(parser, o, wrbuf_cstr(wr)); - wrbuf_free(wr, 1); + wrbuf_destroy(wr); yaz_pqf_destroy(parser); return q; } @@ -37,10 +39,19 @@ Z_AttributesPlusTerm *ccl_scan_query (ODR o, struct ccl_rpn_node *p) ccl_pquery(wr, p); - q = yaz_pqf_scan(parser, o, &setp, wrbuf_buf(wr)); + q = yaz_pqf_scan(parser, o, &setp, wrbuf_cstr(wr)); - wrbuf_free(wr, 1); + wrbuf_destroy(wr); yaz_pqf_destroy(parser); return q; } +/* + * Local variables: + * c-basic-offset: 4 + * c-file-style: "Stroustrup" + * indent-tabs-mode: nil + * End: + * vim: shiftwidth=4 tabstop=8 expandtab + */ +