X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fcclqfile.c;h=0684dc3b5181b51551e989c3ab8ae80fa800210e;hp=a637b75326c88909cb04142bc3a92bbd7340cdfa;hb=05c274ef315384faafcc5900c17468f0ea2474e6;hpb=5655212777a8fe68bf5cc1e563287c0f075a0ae5

diff --git a/src/cclqfile.c b/src/cclqfile.c
index a637b75..0684dc3 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.2 2004-08-18 10:03:01 adam Exp $
+ * $Id: cclqfile.c,v 1.6 2004-10-15 00:19:00 adam Exp $
  *
  * Old Europagate Log:
  *
@@ -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':
@@ -186,7 +192,7 @@ void ccl_qual_field (CCL_bibset bibset, const char *cp, const char *qual_name)
 		    len = split - qual_value;
 		else
 		    len = strlen(qual_value);
-		svalue_ar[pair_no] = xmalloc(len+1);
+		svalue_ar[pair_no] = (char *) xmalloc(len+1);
 		memcpy(svalue_ar[pair_no], qual_value, len);
 		svalue_ar[pair_no][len] = '\0';
 	    }
@@ -214,6 +220,31 @@ void ccl_qual_fitem (CCL_bibset bibset, const char *cp, const char *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;