Lots of changes. They aren't visible though.

[egate.git] / ccl / cclfind.c

diff --git a/ccl/cclfind.c b/ccl/cclfind.c
index cbbe75d..98b99be 100644 (file)
--- a/ccl/cclfind.c
+++ b/ccl/cclfind.c
@@ -1,8 +1,61 @@
+/*
+ * Copyright (c) 1995, the EUROPAGATE consortium (see below).
+ *
+ * The EUROPAGATE consortium members are:
+ *
+ *    University College Dublin
+ *    Danmarks Teknologiske Videnscenter
+ *    An Chomhairle Leabharlanna
+ *    Consejo Superior de Investigaciones Cientificas
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and
+ * its documentation, in whole or in part, for any purpose, is hereby granted,
+ * provided that:
+ *
+ * 1. This copyright and permission notice appear in all copies of the
+ * software and its documentation. Notices of copyright or attribution
+ * which appear at the beginning of any file must remain unchanged.
+ *
+ * 2. The names of EUROPAGATE or the project partners may not be used to
+ * endorse or promote products derived from this software without specific
+ * prior written permission.
+ *
+ * 3. Users of this software (implementors and gateway operators) agree to
+ * inform the EUROPAGATE consortium of their use of the software. This
+ * information will be used to evaluate the EUROPAGATE project and the
+ * software, and to plan further developments. The consortium may use
+ * the information in later publications.
+ * 
+ * 4. Users of this software agree to make their best efforts, when
+ * documenting their use of the software, to acknowledge the EUROPAGATE
+ * consortium, and the role played by the software in their work.
+ *
+ * THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS, IMPLIED, OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ * IN NO EVENT SHALL THE EUROPAGATE CONSORTIUM OR ITS MEMBERS BE LIABLE
+ * FOR ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF
+ * ANY KIND, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA
+ * OR PROFITS, WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND
+ * ON ANY THEORY OF LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE
+ * USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ */
 /* CCL find (to rpn conversion)
  * Europagate, 1995
  *
  * $Log: cclfind.c,v $
- * Revision 1.13  1995/04/17 09:31:42  adam
+ * Revision 1.16  1996/01/08 08:41:13  adam
+ * Removed unused function.
+ *
+ * Revision 1.15  1995/07/20  08:14:34  adam
+ * Qualifiers were observed too often. Instead tokens are treated as
+ * qualifiers only when separated by comma.
+ *
+ * Revision 1.14  1995/05/16  09:39:26  adam
+ * LICENSE.
+ *
+ * Revision 1.13  1995/04/17  09:31:42  adam
  * Improved handling of qualifiers. Aliases or reserved words.
  *
  * Revision 1.12  1995/03/20  15:27:43  adam
@@ -65,33 +118,6 @@ static CCL_bibset bibset;
 #define ADVANCE look_token = look_token->next
 
 /* 
- * qual_val_range: search for attribute of type with range
- * qa:     Attribute array
- * type:   Type of attribute to search for
- * vmin:   Lower bound of value to search for
- * vmax:   Upper bound of value to search for
- * return: Return pointer to integer of attribute value found; NULL
- *         otherwise.
- */
-static int *qual_val_range (struct ccl_rpn_attr **qa, int type,
-                            int vmin, int vmax)
-{
-    int i;
-    struct ccl_rpn_attr *q;
-
-    if (!qa)
-        return NULL;
-    for (i = 0; (q=qa[i]); i++)
-        while (q)
-       {
-            if (q->type == type && q->value >= vmin && q->value <= vmax)
-               return &q->value;
-           q = q->next;
-       }
-    return NULL;
-}
-
-/* 
  * qual_val_type: test for existance of attribute type/value pair.
  * qa:     Attribute array
  * type:   Type of attribute to search for
@@ -660,10 +686,15 @@ static struct ccl_rpn_node *search_elements (struct ccl_rpn_attr **qa)
     }
     lookahead = look_token;
 
-    while (lookahead->kind==CCL_TOK_TERM || lookahead->kind==CCL_TOK_COMMA)
-       lookahead = lookahead->next;
-    if (lookahead->kind == CCL_TOK_REL || lookahead->kind == CCL_TOK_EQ)
-       return qualifiers (lookahead, qa);
+    while (lookahead->kind==CCL_TOK_TERM)
+    {
+        lookahead = lookahead->next;
+        if (lookahead->kind == CCL_TOK_REL || lookahead->kind == CCL_TOK_EQ)
+           return qualifiers (lookahead, qa);
+        if (lookahead->kind != CCL_TOK_COMMA)
+            break;
+        lookahead = lookahead->next;
+    }
     return search_terms (qa);
 }