X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=ccl%2Fcclqfile.c;h=61cd463f00a74b31febc698a51d40aa7c28be193;hp=230492bdff9e9372510f951d589a44d825cdf7df;hb=c71d717ada2a9ef730d527f161eb5ba9aa641a9f;hpb=cb9bad819f13e44d7af6753bfa1bc8274ca37b9b

diff --git a/ccl/cclqfile.c b/ccl/cclqfile.c
index 230492b..61cd463 100644
--- a/ccl/cclqfile.c
+++ b/ccl/cclqfile.c
@@ -44,7 +44,7 @@
 /* CCL qualifiers
  * Europagate, 1995
  *
- * $Id: cclqfile.c,v 1.12 2001-11-27 22:38:50 adam Exp $
+ * $Id: cclqfile.c,v 1.14 2003-06-23 10:22:21 adam Exp $
  *
  * Old Europagate Log:
  *
@@ -70,7 +70,9 @@
 void ccl_qual_field (CCL_bibset bibset, const char *cp, const char *qual_name)
 {
     char qual_spec[128];
-    int pair[256];
+    int type_ar[128];
+    int value_ar[128];
+    char *svalue_ar[128];
     char *attsets[128];
     int pair_no = 0;
 
@@ -85,6 +87,7 @@ void ccl_qual_field (CCL_bibset bibset, const char *cp, const char *qual_name)
 
         if (!(split = strchr (qual_spec, '=')))
         {
+	    /* alias specification .. */
             if (pair_no == 0)
             {
                 ccl_qual_add_combi (bibset, qual_name, cp);
@@ -92,6 +95,7 @@ void ccl_qual_field (CCL_bibset bibset, const char *cp, const char *qual_name)
             }
             break;
         }
+	/* [set,]type=value ... */
         cp += no_scan;
         
         *split++ = '\0';
@@ -99,11 +103,15 @@ void ccl_qual_field (CCL_bibset bibset, const char *cp, const char *qual_name)
 	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)
         {
             int type, value;
@@ -111,7 +119,8 @@ void ccl_qual_field (CCL_bibset bibset, const char *cp, const char *qual_name)
             qual_value = split;
             if ((split = strchr (qual_value, ',')))
                 *split++ = '\0';
-            value = atoi (qual_value);
+
+	    value = 0;
             switch (qual_type[0])
             {
             case 'u':
@@ -157,11 +166,33 @@ void ccl_qual_field (CCL_bibset bibset, const char *cp, const char *qual_name)
             default:
                 type = atoi (qual_type);
             }
-            pair[pair_no*2] = type;
-            pair[pair_no*2+1] = value;
+
+            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*) malloc (strlen(qual_spec)+1);
+	        attsets[pair_no] = (char*) xmalloc (strlen(qual_spec)+1);
 	        strcpy (attsets[pair_no], qual_spec);
 	    }
 	    else
@@ -171,7 +202,8 @@ void ccl_qual_field (CCL_bibset bibset, const char *cp, const char *qual_name)
                 break;
         }
     }
-    ccl_qual_add_set (bibset, qual_name, pair_no, pair, attsets);
+    ccl_qual_add_set (bibset, qual_name, pair_no, type_ar, value_ar, svalue_ar,
+		      attsets);
 }
 
 void ccl_qual_fitem (CCL_bibset bibset, const char *cp, const char *qual_name)