projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move yaz_record_conv_type to XML2-only area
[yaz-moved-to-github.git]
/
src
/
cclqfile.c
diff --git
a/src/cclqfile.c
b/src/cclqfile.c
index
79e85c2
..
678514c
100644
(file)
--- a/
src/cclqfile.c
+++ b/
src/cclqfile.c
@@
-1,11
+1,14
@@
/* This file is part of the YAZ toolkit.
/* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2010 Index Data
+ * Copyright (C) 1995-2012 Index Data
* See the file LICENSE for details.
*/
/**
* \file cclqfile.c
* \brief Implements parsing of CCL qualifier specs in files
*/
* See the file LICENSE for details.
*/
/**
* \file cclqfile.c
* \brief Implements parsing of CCL qualifier specs in files
*/
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <stdio.h>
#include <stdlib.h>
#include <stdio.h>
#include <stdlib.h>
@@
-79,14
+82,15
@@
int ccl_qual_field2(CCL_bibset bibset, const char *cp, const char *qual_name,
/* lead is first of a list of qualifier aliaeses */
/* qualifier alias: q1 q2 ... */
char *qlist[10];
/* lead is first of a list of qualifier aliaeses */
/* qualifier alias: q1 q2 ... */
char *qlist[10];
- int i = 0;
+ size_t i = 0;
qlist[i++] = lead_str;
qlist[i++] = lead_str;
- while ((t=yaz_tok_move(tp)) == YAZ_TOK_STRING)
+ while (t == YAZ_TOK_STRING)
{
if (i < sizeof(qlist)/sizeof(*qlist)-1)
qlist[i++] = xstrdup(yaz_tok_parse_string(tp));
{
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);
}
qlist[i] = 0;
yaz_tok_parse_destroy(tp);
@@
-154,6
+158,10
@@
int ccl_qual_field2(CCL_bibset bibset, const char *cp, const char *qual_name,
value = CCL_BIB1_TRU_CAN_BOTH;
else if (!ccl_stricmp (value_str, "n"))
value = CCL_BIB1_TRU_CAN_NONE;
value = CCL_BIB1_TRU_CAN_BOTH;
else if (!ccl_stricmp (value_str, "n"))
value = CCL_BIB1_TRU_CAN_NONE;
+ else if (!ccl_stricmp (value_str, "x"))
+ value = CCL_BIB1_TRU_CAN_REGEX;
+ else if (!ccl_stricmp (value_str, "z"))
+ value = CCL_BIB1_TRU_CAN_Z3958;
break;
case 'c':
case 'C':
break;
case 'c':
case 'C':
@@
-239,7
+247,7
@@
void ccl_qual_buf(CCL_bibset bibset, const char *buf)
while (1)
{
const char *cp2 = cp1;
while (1)
{
const char *cp2 = cp1;
- int len;
+ size_t len;
while (*cp2 && !strchr("\r\n", *cp2))
cp2++;
len = cp2 - cp1;
while (*cp2 && !strchr("\r\n", *cp2))
cp2++;
len = cp2 - cp1;