X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fcclqfile.c;h=210be935ea5b1af20eb1e2f9f21ef18bae151864;hb=cf3ff0df41755297543b14f007842e1dc216ec25;hp=b562bac2535b057cc684878c6e48d7d1af94c509;hpb=c6e47cbbff56f39f6d81b079ebaeac41d793d4d9;p=yaz-moved-to-github.git diff --git a/src/cclqfile.c b/src/cclqfile.c index b562bac..210be93 100644 --- a/src/cclqfile.c +++ b/src/cclqfile.c @@ -41,10 +41,14 @@ * USE OR PERFORMANCE OF THIS SOFTWARE. * */ +/** + * \file cclqfile.c + * \brief Implements parsing of CCL qualifier specs in files + */ /* CCL qualifiers * Europagate, 1995 * - * $Id: cclqfile.c,v 1.1 2003-10-27 12:21:30 adam Exp $ + * $Id: cclqfile.c,v 1.7 2005-06-25 15:46:03 adam Exp $ * * Old Europagate Log: * @@ -83,11 +87,11 @@ void ccl_qual_field (CCL_bibset bibset, const char *cp, const char *qual_name) int no_scan = 0; if (sscanf (cp, "%100s%n", qual_spec, &no_scan) < 1) - break; + break; if (!(split = strchr (qual_spec, '='))) { - /* alias specification .. */ + /* alias specification .. */ if (pair_no == 0) { ccl_qual_add_combi (bibset, qual_name, cp); @@ -95,23 +99,23 @@ void ccl_qual_field (CCL_bibset bibset, const char *cp, const char *qual_name) } break; } - /* [set,]type=value ... */ + /* [set,]type=value ... */ cp += no_scan; *split++ = '\0'; - setp = strchr (qual_spec, ','); - if (setp) - { - /* set,type=value ... */ - *setp++ = '\0'; + setp = strchr (qual_spec, ','); + if (setp) + { + /* set,type=value ... */ + *setp++ = '\0'; qual_type = setp; - } - else - { - /* type=value ... */ + } + else + { + /* type=value ... */ qual_type = qual_spec; - } + } while (pair_no < 128) { int type, value; @@ -120,7 +124,7 @@ void ccl_qual_field (CCL_bibset bibset, const char *cp, const char *qual_name) if ((split = strchr (qual_value, ','))) *split++ = '\0'; - value = 0; + value = 0; switch (qual_type[0]) { case 'u': @@ -132,6 +136,8 @@ void ccl_qual_field (CCL_bibset bibset, const char *cp, const char *qual_name) type = CCL_BIB1_REL; if (!ccl_stricmp (qual_value, "o")) value = CCL_BIB1_REL_ORDER; + else if (!ccl_stricmp (qual_value, "r")) + value = CCL_BIB1_REL_PORDER; break; case 'p': case 'P': @@ -169,49 +175,91 @@ void ccl_qual_field (CCL_bibset bibset, const char *cp, const char *qual_name) 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 (*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] = (char *) 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; pair_no++; if (!split) break; } } ccl_qual_add_set (bibset, qual_name, pair_no, type_ar, value_ar, svalue_ar, - attsets); + attsets); } void ccl_qual_fitem (CCL_bibset bibset, const char *cp, const char *qual_name) { if (*qual_name == '@') - ccl_qual_add_special(bibset, qual_name+1, cp); + ccl_qual_add_special(bibset, qual_name+1, cp); else - ccl_qual_field(bibset, cp, qual_name); + ccl_qual_field(bibset, cp, qual_name); +} + +void ccl_qual_buf(CCL_bibset bibset, const char *buf) +{ + const char *cp1 = buf; + char line[256]; + while (1) + { + const char *cp2 = cp1; + int 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; + } +} + +void ccl_qual_line(CCL_bibset bibset, char *line) +{ + int no_scan = 0; + char qual_name[128]; + char *cp1, *cp = line; + + if (*cp == '#') + return; /* ignore lines starting with # */ + if (sscanf (cp, "%100s%n", qual_name, &no_scan) < 1) + return; /* also ignore empty lines */ + cp += no_scan; + cp1 = strchr(cp, '#'); + if (cp1) + *cp1 = '\0'; + ccl_qual_fitem (bibset, cp, qual_name); } /* @@ -230,24 +278,9 @@ void ccl_qual_fitem (CCL_bibset bibset, const char *cp, const char *qual_name) void ccl_qual_file (CCL_bibset bibset, FILE *inf) { char line[256]; - char *cp, *cp1; - char qual_name[128]; while (fgets (line, 255, inf)) - { - int no_scan = 0; - - cp = line; - if (*cp == '#') - continue; /* ignore lines starting with # */ - if (sscanf (cp, "%100s%n", qual_name, &no_scan) < 1) - continue; /* also ignore empty lines */ - cp += no_scan; - cp1 = strchr(cp, '#'); - if (cp1) - *cp1 = '\0'; - ccl_qual_fitem (bibset, cp, qual_name); - } + ccl_qual_line(bibset, line); } int ccl_qual_fname (CCL_bibset bibset, const char *fname) @@ -260,3 +293,11 @@ int ccl_qual_fname (CCL_bibset bibset, const char *fname) fclose (inf); return 0; } +/* + * Local variables: + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + * vim: shiftwidth=4 tabstop=8 expandtab + */ +