-/*
- * Copyright (c) 1995, the EUROPAGATE consortium (see below).
- *
- * The EUROPAGATE consortium members are:
- *
- * University College Dublin
- * Danmarks Teknologiske Videnscenter
- * An Chomhairle Leabharlanna
- * Consejo Superior de Investigaciones Cientificas
- *
- * Permission to use, copy, modify, distribute, and sell this software and
- * its documentation, in whole or in part, for any purpose, is hereby granted,
- * provided that:
- *
- * 1. This copyright and permission notice appear in all copies of the
- * software and its documentation. Notices of copyright or attribution
- * which appear at the beginning of any file must remain unchanged.
- *
- * 2. The names of EUROPAGATE or the project partners may not be used to
- * endorse or promote products derived from this software without specific
- * prior written permission.
- *
- * 3. Users of this software (implementors and gateway operators) agree to
- * inform the EUROPAGATE consortium of their use of the software. This
- * information will be used to evaluate the EUROPAGATE project and the
- * software, and to plan further developments. The consortium may use
- * the information in later publications.
- *
- * 4. Users of this software agree to make their best efforts, when
- * documenting their use of the software, to acknowledge the EUROPAGATE
- * consortium, and the role played by the software in their work.
- *
- * THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS, IMPLIED, OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
- * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
- * IN NO EVENT SHALL THE EUROPAGATE CONSORTIUM OR ITS MEMBERS BE LIABLE
- * FOR ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF
- * ANY KIND, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA
- * OR PROFITS, WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND
- * ON ANY THEORY OF LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE
- * USE OR PERFORMANCE OF THIS SOFTWARE.
- *
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2010 Index Data
+ * See the file LICENSE for details.
*/
/**
* \file cclqfile.c
* \brief Implements parsing of CCL qualifier specs in files
*/
-/* CCL qualifiers
- * Europagate, 1995
- *
- * $Id: cclqfile.c,v 1.9 2007-04-26 21:45:17 adam Exp $
- *
- * Old Europagate Log:
- *
- * Revision 1.3 1995/05/16 09:39:26 adam
- * LICENSE.
- *
- * Revision 1.2 1995/05/11 14:03:56 adam
- * Changes in the reading of qualifier(s). New function: ccl_qual_fitem.
- * New variable ccl_case_sensitive, which controls whether reserved
- * words and field names are case sensitive or not.
- *
- * Revision 1.1 1995/04/17 09:31:45 adam
- * Improved handling of qualifiers. Aliases or reserved words.
- *
- */
#include <stdio.h>
#include <stdlib.h>
int ccl_qual_field2(CCL_bibset bibset, const char *cp, const char *qual_name,
const char **addinfo)
{
- yaz_tokenizer_t yt = yaz_tokenizer_create();
+ yaz_tok_cfg_t yt = yaz_tok_cfg_create();
int type_ar[MAX_QUAL];
int value_ar[MAX_QUAL];
int pair_no = 0;
char *type_str = 0;
int t;
+ yaz_tok_parse_t tp;
+
+ yaz_tok_cfg_single_tokens(yt, ",=");
- yaz_tokenizer_single_tokens(yt, ",=");
- yaz_tokenizer_read_buf(yt, cp);
+ tp = yaz_tok_parse_buf(yt, cp);
+
+ yaz_tok_cfg_destroy(yt);
*addinfo = 0;
- t = yaz_tokenizer_move(yt);
- while (t == YAZ_TOKENIZER_STRING)
+ t = yaz_tok_move(tp);
+ while (t == YAZ_TOK_STRING)
{
/* we don't know what lead is yet */
- char *lead_str = xstrdup(yaz_tokenizer_string(yt));
+ char *lead_str = xstrdup(yaz_tok_parse_string(tp));
const char *value_str = 0;
int type = 0, value = 0; /* indicates attribute value UNSET */
- t = yaz_tokenizer_move(yt);
+ t = yaz_tok_move(tp);
if (t == ',')
{
/* full attribute spec: set, type = value */
/* lead is attribute set */
attsets[pair_no] = lead_str;
- t = yaz_tokenizer_move(yt);
- if (t != YAZ_TOKENIZER_STRING)
+ t = yaz_tok_move(tp);
+ if (t != YAZ_TOK_STRING)
{
*addinfo = "token expected";
goto out;
}
xfree(type_str);
- type_str = xstrdup(yaz_tokenizer_string(yt));
- if (yaz_tokenizer_move(yt) != '=')
+ type_str = xstrdup(yaz_tok_parse_string(tp));
+ if (yaz_tok_move(tp) != '=')
{
*addinfo = "= expected";
goto out;
{
/* lead is first of a list of qualifier aliaeses */
/* qualifier alias: q1 q2 ... */
- xfree(lead_str);
- yaz_tokenizer_destroy(yt);
- ccl_qual_add_combi (bibset, qual_name, cp);
+ char *qlist[10];
+ size_t i = 0;
+
+ qlist[i++] = lead_str;
+
+ while (t == YAZ_TOK_STRING)
+ {
+ if (i < sizeof(qlist)/sizeof(*qlist)-1)
+ qlist[i++] = xstrdup(yaz_tok_parse_string(tp));
+ t = yaz_tok_move(tp);
+ }
+ qlist[i] = 0;
+ yaz_tok_parse_destroy(tp);
+ ccl_qual_add_combi (bibset, qual_name, (const char **) qlist);
+ for (i = 0; qlist[i]; i++)
+ xfree(qlist[i]);
return 0;
}
while (1) /* comma separated attribute value list */
{
- t = yaz_tokenizer_move(yt);
+ t = yaz_tok_move(tp);
/* must have a value now */
- if (t != YAZ_TOKENIZER_STRING)
+ if (t != YAZ_TOK_STRING)
{
*addinfo = "value token expected";
goto out;
}
- value_str = yaz_tokenizer_string(yt);
+ value_str = yaz_tok_parse_string(tp);
if (sscanf(type_str, "%d", &type) == 1)
;
*addinfo = "too many attribute values";
goto out;
}
- t = yaz_tokenizer_move(yt);
+ t = yaz_tok_move(tp);
if (t != ',')
break;
attsets[pair_no] = attsets[pair_no-1];
xfree(type_str);
type_str = 0;
- yaz_tokenizer_destroy(yt);
+ yaz_tok_parse_destroy(tp);
if (*addinfo)
{
while (1)
{
const char *cp2 = cp1;
- int len;
+ size_t len;
while (*cp2 && !strchr("\r\n", *cp2))
cp2++;
len = cp2 - cp1;
/*
* Local variables:
* c-basic-offset: 4
+ * c-file-style: "Stroustrup"
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab
projects / yaz-moved-to-github.git / blobdiff