Build packages for Ubuntu Trusty Tahr 14.04 LTS

[yaz-moved-to-github.git] / src / cclqfile.c

diff --git a/src/cclqfile.c b/src/cclqfile.c
index 024b84d..943f84d 100644 (file)
--- a/src/cclqfile.c
+++ b/src/cclqfile.c
@@ -1,8 +1,8 @@
 /* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2012 Index Data
+ * Copyright (C) Index Data
  * See the file LICENSE for details.
  */
-/** 
+/**
  * \file cclqfile.c
  * \brief Implements parsing of CCL qualifier specs in files
  */
@@ -40,7 +40,7 @@ int ccl_qual_field2(CCL_bibset bibset, const char *cp, const char *qual_name,
 
     yaz_tok_cfg_destroy(yt);
     *addinfo = 0;
-    
+
     t = yaz_tok_move(tp);
     while (t == YAZ_TOK_STRING)
     {
@@ -109,7 +109,7 @@ int ccl_qual_field2(CCL_bibset bibset, const char *cp, const char *qual_name,
                 goto out;
             }
             value_str = yaz_tok_parse_string(tp);
-            
+
             if (sscanf(type_str, "%d", &type) == 1)
                 ;
             else if (strlen(type_str) != 1)
@@ -132,7 +132,7 @@ int ccl_qual_field2(CCL_bibset bibset, const char *cp, const char *qual_name,
                         value = CCL_BIB1_REL_ORDER;
                     else if (!ccl_stricmp (value_str, "r"))
                         value = CCL_BIB1_REL_PORDER;
-                    break;                
+                    break;
                 case 'p':
                 case 'P':
                     type = CCL_BIB1_POS;
@@ -148,7 +148,7 @@ int ccl_qual_field2(CCL_bibset bibset, const char *cp, const char *qual_name,
                         value = CCL_BIB1_STR_OR_LIST;
                     if (!ccl_stricmp (value_str, "ag"))
                         value = CCL_BIB1_STR_AUTO_GROUP;
-                    break;                
+                    break;
                 case 't':
                 case 'T':
                     type = CCL_BIB1_TRU;
@@ -164,7 +164,7 @@ int ccl_qual_field2(CCL_bibset bibset, const char *cp, const char *qual_name,
                         value = CCL_BIB1_TRU_CAN_REGEX;
                     else if (!ccl_stricmp (value_str, "z"))
                         value = CCL_BIB1_TRU_CAN_Z3958;
-                    break;                
+                    break;
                 case 'c':
                 case 'C':
                     type = CCL_BIB1_COM;
@@ -234,12 +234,24 @@ void ccl_qual_field(CCL_bibset bibset, const char *cp, const char *qual_name)
         yaz_log(YLOG_WARN, "ccl_qual_field2 fail: %s", addinfo);
 }
 
-void ccl_qual_fitem (CCL_bibset bibset, const char *cp, const char *qual_name)
+int ccl_qual_fitem2(CCL_bibset bibset, const char *cp, const char *qual_name,
+                    const char **addinfo)
 {
     if (*qual_name == '@')
+    {
+        /* ccl_qual_add_special can not return error (yet) */
         ccl_qual_add_special(bibset, qual_name+1, cp);
+        *addinfo = 0;
+        return 0;
+    }
     else
-        ccl_qual_field(bibset, cp, qual_name);
+        return ccl_qual_field2(bibset, cp, qual_name, addinfo);
+}
+
+void ccl_qual_fitem(CCL_bibset bibset, const char *cp, const char *qual_name)
+{
+    const char *addinfo = 0;
+    ccl_qual_fitem2(bibset, cp, qual_name, &addinfo);
 }
 
 void ccl_qual_buf(CCL_bibset bibset, const char *buf)
@@ -272,7 +284,7 @@ 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)
@@ -292,8 +304,8 @@ void ccl_qual_line(CCL_bibset bibset, char *line)
  * Each line format is:
  *  <name> <t>=<v> <t>=<v> ....
  *  Where <name> is name of qualifier;
- *  <t>=<v> is a attribute definition pair where <t> is one of: 
- *     u(use), r(relation), p(position), t(truncation), c(completeness) 
+ *  <t>=<v> is a attribute definition pair where <t> is one of:
+ *     u(use), r(relation), p(position), t(truncation), c(completeness)
  *     or plain integer.
  *  <v> is an integer or special pseudo-value.
  */