Changes in the reading of qualifier(s). New function: ccl_qual_fitem.

[egate.git] / ccl / cclqfile.c

diff --git a/ccl/cclqfile.c b/ccl/cclqfile.c
index dd6f63c..888707d 100644 (file)
--- a/ccl/cclqfile.c
+++ b/ccl/cclqfile.c
@@ -2,7 +2,12 @@
  * Europagate, 1995
  *
  * $Log: cclqfile.c,v $
- * Revision 1.1  1995/04/17 09:31:45  adam
+ * Revision 1.2  1995/05/11 14:03:56  adam
+ * Changes in the reading of qualifier(s). New function: ccl_qual_fitem.
+ * New variable ccl_case_sensitive, which controls whether reserved
+ * words and field names are case sensitive or not.
+ *
+ * Revision 1.1  1995/04/17  09:31:45  adam
  * Improved handling of qualifiers. Aliases or reserved words.
  *
  */
@@ -14,6 +19,85 @@
 
 #include <ccl.h>
 
+void ccl_qual_fitem (CCL_bibset bibset, const char *cp, const char *qual_name)
+{
+    char qual_type[128];
+    int no_scan;
+    int pair[128];
+    int pair_no = 0;
+
+    while (1)
+    {
+        char *qual_value;
+        char *split;
+        
+        if (sscanf (cp, "%s%n", qual_type, &no_scan) != 1)
+            break;
+        
+        if (!(split = strchr (qual_type, '=')))
+            break;
+        cp += no_scan;
+        
+        *split++ = '\0';
+        while (1)
+        {
+            int type, value;
+
+            qual_value = split;
+            if ((split = strchr (qual_value, ',')))
+                *split++ = '\0';
+            value = atoi (qual_value);
+            switch (qual_type[0])
+            {
+            case 'u':
+            case 'U':
+                type = CCL_BIB1_USE;
+                break;
+            case 'r':
+            case 'R':
+                type = CCL_BIB1_REL;
+                if (!ccl_stricmp (qual_value, "o"))
+                    value = CCL_BIB1_REL_ORDER;
+                break;                
+            case 'p':
+            case 'P':
+                type = CCL_BIB1_POS;
+                break;
+            case 's':
+            case 'S':
+                type = CCL_BIB1_STR;
+                if (!ccl_stricmp (qual_value, "pw"))
+                    value = CCL_BIB1_STR_WP;
+                break;                
+            case 't':
+            case 'T':
+                type = CCL_BIB1_TRU;
+                if (!ccl_stricmp (qual_value, "l"))
+                    value = CCL_BIB1_TRU_CAN_LEFT;
+                else if (!ccl_stricmp (qual_value, "r"))
+                    value = CCL_BIB1_TRU_CAN_RIGHT;
+                else if (!ccl_stricmp (qual_value, "b"))
+                    value = CCL_BIB1_TRU_CAN_BOTH;
+                else if (!ccl_stricmp (qual_value, "n"))
+                    value = CCL_BIB1_TRU_CAN_NONE;
+                break;                
+            case 'c':
+            case 'C':
+                type = CCL_BIB1_COM;
+                break;                
+            default:
+                type = atoi (qual_type);
+            }
+            pair[pair_no*2] = type;
+            pair[pair_no*2+1] = value;
+            pair_no++;
+            if (!split)
+                break;
+        }
+    }
+    ccl_qual_add (bibset, qual_name, pair_no, pair);
+}
+
 /*
  * ccl_qual_file: Read bibset definition from file.
  * bibset:  Bibset
@@ -32,7 +116,6 @@ void ccl_qual_file (CCL_bibset bibset, FILE *inf)
     char line[256];
     char *cp;
     char qual_name[128];
-    char qual_des[128];
     int  no_scan;
 
     while (fgets (line, 255, inf))
@@ -43,68 +126,6 @@ void ccl_qual_file (CCL_bibset bibset, FILE *inf)
         if (sscanf (cp, "%s%n", qual_name, &no_scan) != 1)
             continue;        /* also ignore empty lines */
         cp += no_scan;
-        while (1)
-        {
-            int pair[2];
-            char *qual_type;
-            char *qual_value;
-            char *split;
-
-            if (sscanf (cp, "%s%n", qual_des, &no_scan) != 1)
-                break;
-
-            if (!(split = strchr (qual_des, '=')))
-                break;
-            cp += no_scan;
-
-            *split++ = '\0';
-            qual_type = qual_des;
-            qual_value = split;
-            while (1)
-            {
-                if ((split = strchr (qual_value, ',')))
-                    *split++ = '\0';
-                pair[1] = atoi (qual_value);
-                switch (qual_type[0])
-                {
-                case 'u':
-                    pair[0] = CCL_BIB1_USE;
-                    break;
-                case 'r':
-                    pair[0] = CCL_BIB1_REL;
-                    if (!strcmp (qual_value, "o"))
-                        pair[1] = CCL_BIB1_REL_ORDER;
-                    break;                
-                case 'p':
-                    pair[0] = CCL_BIB1_POS;
-                    break;
-                case 's':
-                    pair[0] = CCL_BIB1_STR;
-                    if (!strcmp (qual_value, "pw"))
-                        pair[1] = CCL_BIB1_STR_WP;
-                    break;                
-                case 't':
-                    pair[0] = CCL_BIB1_TRU;
-                    if (!strcmp (qual_value, "l"))
-                        pair[1] = CCL_BIB1_TRU_CAN_LEFT;
-                    else if (!strcmp (qual_value, "r"))
-                        pair[1] = CCL_BIB1_TRU_CAN_RIGHT;
-                    else if (!strcmp (qual_value, "b"))
-                        pair[1] = CCL_BIB1_TRU_CAN_BOTH;
-                    else if (!strcmp (qual_value, "n"))
-                        pair[1] = CCL_BIB1_TRU_CAN_NONE;
-                    break;                
-                case 'c':
-                    pair[0] = CCL_BIB1_COM;
-                    break;                
-                default:
-                    pair[0] = atoi (qual_type);
-                }
-                ccl_qual_add (bibset, qual_name, 1, pair);
-                if (!split)
-                    break;
-                qual_value = split;
-            }
-        }
+        ccl_qual_fitem (bibset, cp, qual_name);
     }
 }