X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fcclqfile.c;h=a2bb33610659d3e57263d9573351e1eed6df7a08;hp=d46b730f875edbe05b660fd5d606f7b1527d347c;hb=9773a01f6dae65e5f9c424b3f2bc7454b8270cfc;hpb=1b7116b57dee317a8ccc2d53401b629fabd8b9d8 diff --git a/src/cclqfile.c b/src/cclqfile.c index d46b730..a2bb336 100644 --- a/src/cclqfile.c +++ b/src/cclqfile.c @@ -1,217 +1,236 @@ -/* - * 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. */ -/* CCL qualifiers - * Europagate, 1995 - * - * $Id: cclqfile.c,v 1.3 2004-09-22 11:21:51 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. - * +/** + * \file cclqfile.c + * \brief Implements parsing of CCL qualifier specs in files */ #include #include #include +#include #include +#include -void ccl_qual_field (CCL_bibset bibset, const char *cp, const char *qual_name) +#define MAX_QUAL 128 + +int ccl_qual_field2(CCL_bibset bibset, const char *cp, const char *qual_name, + const char **addinfo) { - char qual_spec[128]; - int type_ar[128]; - int value_ar[128]; - char *svalue_ar[128]; - char *attsets[128]; + yaz_tok_cfg_t yt = yaz_tok_cfg_create(); + + int type_ar[MAX_QUAL]; + int value_ar[MAX_QUAL]; + char *svalue_ar[MAX_QUAL]; + char *attsets[MAX_QUAL]; int pair_no = 0; + char *type_str = 0; + int t; + yaz_tok_parse_t tp; - while (pair_no < 128) + yaz_tok_cfg_single_tokens(yt, ",="); + + tp = yaz_tok_parse_buf(yt, cp); + + yaz_tok_cfg_destroy(yt); + *addinfo = 0; + + t = yaz_tok_move(tp); + while (t == YAZ_TOK_STRING) { - char *qual_value, *qual_type; - char *split, *setp; - int no_scan = 0; - - if (sscanf (cp, "%100s%n", qual_spec, &no_scan) < 1) - break; + /* we don't know what lead is yet */ + char *lead_str = xstrdup(yaz_tok_parse_string(tp)); + const char *value_str = 0; + int type = 0, value = 0; /* indicates attribute value UNSET */ - if (!(split = strchr (qual_spec, '='))) + t = yaz_tok_move(tp); + if (t == ',') { - /* alias specification .. */ - if (pair_no == 0) + /* full attribute spec: set, type = value */ + /* lead is attribute set */ + attsets[pair_no] = lead_str; + t = yaz_tok_move(tp); + if (t != YAZ_TOK_STRING) { - ccl_qual_add_combi (bibset, qual_name, cp); - return; + *addinfo = "token expected"; + goto out; + } + xfree(type_str); + type_str = xstrdup(yaz_tok_parse_string(tp)); + if (yaz_tok_move(tp) != '=') + { + *addinfo = "= expected"; + goto out; } - break; } - /* [set,]type=value ... */ - cp += no_scan; - - *split++ = '\0'; - - setp = strchr (qual_spec, ','); - if (setp) - { - /* set,type=value ... */ - *setp++ = '\0'; - qual_type = setp; - } - else - { - /* type=value ... */ - qual_type = qual_spec; - } - while (pair_no < 128) + else if (t == '=') + { + /* lead is attribute type */ + /* attribute set omitted: type = value */ + attsets[pair_no] = 0; + xfree(type_str); + type_str = lead_str; + } + else { - int type, value; + /* lead is first of a list of qualifier aliaeses */ + /* qualifier alias: q1 q2 ... */ + char *qlist[10]; + size_t i = 0; - qual_value = split; - if ((split = strchr (qual_value, ','))) - *split++ = '\0'; + qlist[i++] = lead_str; - value = 0; - switch (qual_type[0]) + while (t == YAZ_TOK_STRING) { - case 'u': - case 'U': - type = CCL_BIB1_USE; - break; - case 'r': - case 'R': - type = CCL_BIB1_REL; - if (!ccl_stricmp (qual_value, "o")) - value = CCL_BIB1_REL_ORDER; - break; - case 'p': - case 'P': - type = CCL_BIB1_POS; - break; - case 's': - case 'S': - type = CCL_BIB1_STR; - if (!ccl_stricmp (qual_value, "pw")) - value = CCL_BIB1_STR_WP; - if (!ccl_stricmp (qual_value, "al")) - value = CCL_BIB1_STR_AND_LIST; - if (!ccl_stricmp (qual_value, "ol")) - value = CCL_BIB1_STR_OR_LIST; - break; - case 't': - case 'T': - type = CCL_BIB1_TRU; - if (!ccl_stricmp (qual_value, "l")) - value = CCL_BIB1_TRU_CAN_LEFT; - else if (!ccl_stricmp (qual_value, "r")) - value = CCL_BIB1_TRU_CAN_RIGHT; - else if (!ccl_stricmp (qual_value, "b")) - value = CCL_BIB1_TRU_CAN_BOTH; - else if (!ccl_stricmp (qual_value, "n")) - value = CCL_BIB1_TRU_CAN_NONE; - break; - case 'c': - case 'C': - type = CCL_BIB1_COM; - break; - default: - type = atoi (qual_type); + 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_tok_move(tp); + /* must have a value now */ + if (t != YAZ_TOK_STRING) + { + *addinfo = "value token expected"; + goto out; + } + value_str = yaz_tok_parse_string(tp); + + if (sscanf(type_str, "%d", &type) == 1) + ; + else if (strlen(type_str) != 1) + { + *addinfo = "bad attribute type"; + goto out; + } + else + { + switch (*type_str) + { + case 'u': + case 'U': + type = CCL_BIB1_USE; + break; + case 'r': + case 'R': + type = CCL_BIB1_REL; + if (!ccl_stricmp (value_str, "o")) + value = CCL_BIB1_REL_ORDER; + else if (!ccl_stricmp (value_str, "r")) + value = CCL_BIB1_REL_PORDER; + break; + case 'p': + case 'P': + type = CCL_BIB1_POS; + break; + case 's': + case 'S': + type = CCL_BIB1_STR; + if (!ccl_stricmp (value_str, "pw")) + value = CCL_BIB1_STR_WP; + if (!ccl_stricmp (value_str, "al")) + value = CCL_BIB1_STR_AND_LIST; + if (!ccl_stricmp (value_str, "ol")) + value = CCL_BIB1_STR_OR_LIST; + break; + case 't': + case 'T': + type = CCL_BIB1_TRU; + if (!ccl_stricmp (value_str, "l")) + value = CCL_BIB1_TRU_CAN_LEFT; + else if (!ccl_stricmp (value_str, "r")) + value = CCL_BIB1_TRU_CAN_RIGHT; + else if (!ccl_stricmp (value_str, "b")) + value = CCL_BIB1_TRU_CAN_BOTH; + else if (!ccl_stricmp (value_str, "n")) + value = CCL_BIB1_TRU_CAN_NONE; + break; + case 'c': + case 'C': + type = CCL_BIB1_COM; + break; + } + } + if (type == 0) + { + /* type was not set in switch above */ + *addinfo = "bad attribute type"; + goto out; } - type_ar[pair_no] = type; - - if (value) - { - value_ar[pair_no] = value; - svalue_ar[pair_no] = 0; - } - else if (*qual_value >= '0' && *qual_value <= '9') - { - value_ar[pair_no] = atoi (qual_value); - svalue_ar[pair_no] = 0; - } - else - { - size_t len; - if (split) - len = split - qual_value; - else - len = strlen(qual_value); - svalue_ar[pair_no] = xmalloc(len+1); - memcpy(svalue_ar[pair_no], qual_value, len); - svalue_ar[pair_no][len] = '\0'; - } - if (setp) - { - attsets[pair_no] = (char*) xmalloc (strlen(qual_spec)+1); - strcpy (attsets[pair_no], qual_spec); - } - else - attsets[pair_no] = 0; + if (value) + { + value_ar[pair_no] = value; + svalue_ar[pair_no] = 0; + } + else if (*value_str >= '0' && *value_str <= '9') + { + value_ar[pair_no] = atoi (value_str); + svalue_ar[pair_no] = 0; + } + else + { + value_ar[pair_no] = 0; + svalue_ar[pair_no] = xstrdup(value_str); + } pair_no++; - if (!split) + if (pair_no == MAX_QUAL) + { + *addinfo = "too many attribute values"; + goto out; + } + t = yaz_tok_move(tp); + if (t != ',') break; + attsets[pair_no] = attsets[pair_no-1]; } } - ccl_qual_add_set (bibset, qual_name, pair_no, type_ar, value_ar, svalue_ar, - attsets); + out: + xfree(type_str); + type_str = 0; + + yaz_tok_parse_destroy(tp); + + if (*addinfo) + { + int i; + for (i = 0; i 0) - { - if (len >= (sizeof(line)-1)) - len = sizeof(line)-1; - memcpy(line, cp1, len); - line[len] = '\0'; - ccl_qual_line(bibset, line); - } - if (!*cp2) - break; - cp1 = cp2+1; + const char *cp2 = cp1; + size_t len; + while (*cp2 && !strchr("\r\n", *cp2)) + cp2++; + len = cp2 - cp1; + if (len > 0) + { + if (len >= (sizeof(line)-1)) + len = sizeof(line)-1; + memcpy(line, cp1, len); + line[len] = '\0'; + ccl_qual_line(bibset, line); + } + if (!*cp2) + break; + cp1 = cp2+1; } } @@ -246,13 +265,13 @@ void ccl_qual_line(CCL_bibset bibset, char *line) char *cp1, *cp = line; if (*cp == '#') - return; /* ignore lines starting with # */ + return; /* ignore lines starting with # */ if (sscanf (cp, "%100s%n", qual_name, &no_scan) < 1) - return; /* also ignore empty lines */ + return; /* also ignore empty lines */ cp += no_scan; cp1 = strchr(cp, '#'); if (cp1) - *cp1 = '\0'; + *cp1 = '\0'; ccl_qual_fitem (bibset, cp, qual_name); } @@ -274,7 +293,7 @@ void ccl_qual_file (CCL_bibset bibset, FILE *inf) char line[256]; while (fgets (line, 255, inf)) - ccl_qual_line(bibset, line); + ccl_qual_line(bibset, line); } int ccl_qual_fname (CCL_bibset bibset, const char *fname) @@ -287,3 +306,12 @@ int ccl_qual_fname (CCL_bibset bibset, const char *fname) fclose (inf); return 0; } +/* + * Local variables: + * c-basic-offset: 4 + * c-file-style: "Stroustrup" + * indent-tabs-mode: nil + * End: + * vim: shiftwidth=4 tabstop=8 expandtab + */ +