cql_transform_t cql_transform_open_FILE(FILE *f)
{
char line[1024];
- cql_transform_t ct = (cql_transform_t) xmalloc (sizeof(*ct));
+ cql_transform_t ct = (cql_transform_t) xmalloc(sizeof(*ct));
struct cql_prop_entry **pp = &ct->entry;
ct->error = 0;
if (cp_value_end != cp_value_start &&
strchr(" \t\r\n", cp_value_end[-1]))
cp_value_end--;
- *pp = (struct cql_prop_entry *) xmalloc (sizeof(**pp));
+ *pp = (struct cql_prop_entry *) xmalloc(sizeof(**pp));
(*pp)->pattern = (char *) xmalloc(cp_pattern_end-cp_pattern_start + 1);
- memcpy ((*pp)->pattern, cp_pattern_start,
- cp_pattern_end-cp_pattern_start);
+ memcpy((*pp)->pattern, cp_pattern_start,
+ cp_pattern_end-cp_pattern_start);
(*pp)->pattern[cp_pattern_end-cp_pattern_start] = '\0';
- (*pp)->value = (char *) xmalloc (cp_value_end-cp_value_start + 1);
+ (*pp)->value = (char *) xmalloc(cp_value_end-cp_value_start + 1);
if (cp_value_start != cp_value_end)
- memcpy ((*pp)->value, cp_value_start, cp_value_end-cp_value_start);
+ memcpy((*pp)->value, cp_value_start, cp_value_end-cp_value_start);
(*pp)->value[cp_value_end - cp_value_start] = '\0';
pp = &(*pp)->next;
}
while (pe)
{
struct cql_prop_entry *pe_next = pe->next;
- xfree (pe->pattern);
- xfree (pe->value);
- xfree (pe);
+ xfree(pe->pattern);
+ xfree(pe->value);
+ xfree(pe);
pe = pe_next;
}
- if (ct->addinfo)
- xfree (ct->addinfo);
- xfree (ct);
+ xfree(ct->addinfo);
+ xfree(ct);
}
cql_transform_t cql_transform_open_fname(const char *fname)
struct cql_prop_entry *e;
if (pat1 && pat2 && pat3)
- sprintf (pattern, "%.39s.%.39s.%.39s", pat1, pat2, pat3);
+ sprintf(pattern, "%.39s.%.39s.%.39s", pat1, pat2, pat3);
else if (pat1 && pat2)
- sprintf (pattern, "%.39s.%.39s", pat1, pat2);
+ sprintf(pattern, "%.39s.%.39s", pat1, pat2);
else if (pat1 && pat3)
- sprintf (pattern, "%.39s.%.39s", pat1, pat3);
+ sprintf(pattern, "%.39s.%.39s", pat1, pat3);
else if (pat1)
- sprintf (pattern, "%.39s", pat1);
+ sprintf(pattern, "%.39s", pat1);
else
return 0;
cp1++;
if (cp1 - cp0 >= sizeof(buf))
break;
- memcpy (buf, cp0, cp1 - cp0);
+ memcpy(buf, cp0, cp1 - cp0);
buf[cp1-cp0] = 0;
(*pr)("@attr ", client_data);
}
-static void cql_pr_int (int val,
- void (*pr)(const char *buf, void *client_data),
- void *client_data)
+static void cql_pr_int(int val,
+ void (*pr)(const char *buf, void *client_data),
+ void *client_data)
{
char buf[21]; /* enough characters to 2^64 */
sprintf(buf, "%d", val);
int proxrel = 2; /* less than or equal */
int unit = 2; /* word */
- while (mods != 0) {
- char *name = mods->u.st.index;
- char *term = mods->u.st.term;
- char *relation = mods->u.st.relation;
+ while (mods)
+ {
+ const char *name = mods->u.st.index;
+ const char *term = mods->u.st.term;
+ const char *relation = mods->u.st.relation;
if (!strcmp(name, "distance")) {
distance = strtol(term, (char**) 0, 0);
distance_defined = 1;
- if (!strcmp(relation, "=")) {
+ if (!strcmp(relation, "="))
proxrel = 3;
- } else if (!strcmp(relation, ">")) {
+ else if (!strcmp(relation, ">"))
proxrel = 5;
- } else if (!strcmp(relation, "<")) {
+ else if (!strcmp(relation, "<"))
proxrel = 1;
- } else if (!strcmp(relation, ">=")) {
+ else if (!strcmp(relation, ">="))
proxrel = 4;
- } else if (!strcmp(relation, "<=")) {
+ else if (!strcmp(relation, "<="))
proxrel = 2;
- } else if (!strcmp(relation, "<>")) {
+ else if (!strcmp(relation, "<>"))
proxrel = 6;
- } else {
+ else
+ {
ct->error = YAZ_SRW_UNSUPP_PROX_RELATION;
ct->addinfo = xstrdup(relation);
return 0;
}
- } else if (!strcmp(name, "ordered")) {
+ }
+ else if (!strcmp(name, "ordered"))
ordered = 1;
- } else if (!strcmp(name, "unordered")) {
+ else if (!strcmp(name, "unordered"))
ordered = 0;
- } else if (!strcmp(name, "unit")) {
- if (!strcmp(term, "word")) {
+ else if (!strcmp(name, "unit"))
+ {
+ if (!strcmp(term, "word"))
unit = 2;
- } else if (!strcmp(term, "sentence")) {
+ else if (!strcmp(term, "sentence"))
unit = 3;
- } else if (!strcmp(term, "paragraph")) {
+ else if (!strcmp(term, "paragraph"))
unit = 4;
- } else if (!strcmp(term, "element")) {
+ else if (!strcmp(term, "element"))
unit = 8;
- } else {
+ else
+ {
ct->error = YAZ_SRW_UNSUPP_PROX_UNIT;
ct->addinfo = xstrdup(term);
return 0;
}
- } else {
+ }
+ else
+ {
ct->error = YAZ_SRW_UNSUPP_BOOLEAN_MODIFIER;
ct->addinfo = xstrdup(name);
return 0;
}
-
mods = mods->u.st.modifiers;
}
cql_pr_attr(ct, "structure", cn->u.st.relation, 0,
pr, client_data, YAZ_SRW_UNSUPP_COMBI_OF_RELATION_AND_TERM);
if (cn->u.st.relation && !cql_strcmp(cn->u.st.relation, "all"))
- {
emit_wordlist(ct, cn, pr, client_data, "and");
- }
else if (cn->u.st.relation && !cql_strcmp(cn->u.st.relation, "any"))
- {
emit_wordlist(ct, cn, pr, client_data, "or");
- }
else
- {
emit_terms(ct, cn, pr, client_data, "and");
- }
break;
case CQL_NODE_BOOL:
(*pr)("@", client_data);
(*pr)(cn->u.boolean.value, client_data);
(*pr)(" ", client_data);
mods = cn->u.boolean.modifiers;
- if (!strcmp(cn->u.boolean.value, "prox")) {
+ if (!strcmp(cn->u.boolean.value, "prox"))
+ {
if (!cql_pr_prox(ct, mods, pr, client_data))
return;
- } else if (mods) {
+ }
+ else if (mods)
+ {
/* Boolean modifiers other than on proximity not supported */
ct->error = YAZ_SRW_UNSUPP_BOOLEAN_MODIFIER;
ct->addinfo = xstrdup(mods->u.st.index);
}
}
-int cql_transform(cql_transform_t ct,
- struct cql_node *cn,
+int cql_transform(cql_transform_t ct, struct cql_node *cn,
void (*pr)(const char *buf, void *client_data),
void *client_data)
{
NMEM nmem = nmem_create();
ct->error = 0;
- if (ct->addinfo)
- xfree (ct->addinfo);
+ xfree(ct->addinfo);
ct->addinfo = 0;
for (e = ct->entry; e ; e = e->next)
else if (!cql_strcmp(e->pattern, "set"))
cql_apply_prefix(nmem, cn, 0, e->value);
}
- cql_transform_r (ct, cn, pr, client_data);
+ cql_transform_r(ct, cn, pr, client_data);
nmem_destroy(nmem);
return ct->error;
}
return cql_transform(ct, cn, cql_fputs, f);
}
-int cql_transform_buf(cql_transform_t ct, struct cql_node *cn,
- char *out, int max)
+int cql_transform_buf(cql_transform_t ct, struct cql_node *cn, char *out, int max)
{
struct cql_buf_write_info info;
int r;
--- /dev/null
+# CQL queries for testing.
+# from http://www.loc.gov/z3950/agency/zing/cql/sample-queries.html
+# Simple Term
+
+cat
+"cat"
+comp.os.linux
+ml:element
+"<xml:element>"
+"="
+"prox/distance<3/unit=word"
+("cat")
+((dog))
+all
+prox
+
+# Index Relation Term
+
+title = "fish"
+title == fish
+title any fish
+title all fish
+title > 9
+title >= 23
+dc.title any "fish chips"
+dc.title any/stem fish
+dc.fish all/stem/fuzzy "fish chips"
+(title any frog)
+((dc.title any/stem "frog pond"))
+dc.title = "fish frog chicken"
+dc.title =/rel.algorithm=CORI squid
+creator any/f.foo/b.bar>1 "sanderson taylor"
+
+# Simple Boolean
+
+cat or dog
+cat and fish
+cat not frog
+(cat not frog)
+"cat" not "fish food"
+xml and "prox///"
+fred and any
+((fred or all))
+a or b and c not d
+
+# Index Relation Term plus Boolean
+
+bath.uniformTitle any fish and dc.title any "cat dog"
+(title any/stem "fish dog" or and)
+
+# Proximity and Boolean Modifiers
+
+cat prox hat
+cat prox/distance=3/unit=word/ordered hat
+cat prox/distance<3 hat
+"fish food" prox/unit=sentence and
+title all "chips frog" prox/distance<=5 exact
+(dc.author == "jones" prox/distance>5/unit=element title >= "smith")
+a and/rel.SumOfScores b
+a and/rel.algorithm=CORI b
+
+# Special Characters
+
+(cat^)
+"cat"
+"^cat says \"fish\""
+"cat*fish"
+cat?dog
+(("^cat*fishdog\"horse?"))
+
+# Nesting Parentheses
+
+(((cat or dog) or horse) and frog)
+(cat and dog) or (horse and frog)
+(cat and (horse or frog)) and chips
+
+# Prefix Maps
+
+> foo="info:srw/cql-context-set/1/dc-v1.1" dc.title="fish"
+> "info:srw/cql-context-set/1/dc-v1.1" title="fish"
+> foo="info:srw/cql-context-set/1/dc-v1.1" > ccg = "http://srw.cheshire3.org/contextSets/ccg/1.1/" foo.title="fish" and ccg.force=3
+
+# Lame Searches
+
+any or all:stem and all == any prox prox=fuzzy
+(((((((((any)))))))))
+""
+> any > any = exact any > any
+
+# Invalid searches [should error]
+
+<
+===
+missingClause or
+missingTerm any
+()
+(missingParen
+missingParen any fish)
+(emptyParens or ())
+title = ("illegal parentheses")
+> illegal="urn:missingQuery"
+
+# free-form term OK)
+a b
+a b c
+a.b c
+and b c
+all a
+a any b
+dc.title a b c and d
+
+# free-form term (Syntax error)
+a b.c
+a and
+++ /dev/null
-# CQL queries for testing.
-# from http://www.loc.gov/z3950/agency/zing/cql/sample-queries.html
-# Simple Term
-
-cat
-"cat"
-comp.os.linux
-ml:element
-"<xml:element>"
-"="
-"prox/distance<3/unit=word"
-("cat")
-((dog))
-all
-prox
-
-# Index Relation Term
-
-title = "fish"
-title == fish
-title any fish
-title all fish
-title > 9
-title >= 23
-dc.title any "fish chips"
-dc.title any/stem fish
-dc.fish all/stem/fuzzy "fish chips"
-(title any frog)
-((dc.title any/stem "frog pond"))
-dc.title = "fish frog chicken"
-dc.title =/rel.algorithm=CORI squid
-creator any/f.foo/b.bar>1 "sanderson taylor"
-
-# Simple Boolean
-
-cat or dog
-cat and fish
-cat not frog
-(cat not frog)
-"cat" not "fish food"
-xml and "prox///"
-fred and any
-((fred or all))
-a or b and c not d
-
-# Index Relation Term plus Boolean
-
-bath.uniformTitle any fish and dc.title any "cat dog"
-(title any/stem "fish dog" or and)
-
-# Proximity and Boolean Modifiers
-
-cat prox hat
-cat prox/distance=3/unit=word/ordered hat
-cat prox/distance<3 hat
-"fish food" prox/unit=sentence and
-title all "chips frog" prox/distance<=5 exact
-(dc.author == "jones" prox/distance>5/unit=element title >= "smith")
-a and/rel.SumOfScores b
-a and/rel.algorithm=CORI b
-
-# Special Characters
-
-(cat^)
-"cat"
-"^cat says \"fish\""
-"cat*fish"
-cat?dog
-(("^cat*fishdog\"horse?"))
-
-# Nesting Parentheses
-
-(((cat or dog) or horse) and frog)
-(cat and dog) or (horse and frog)
-(cat and (horse or frog)) and chips
-
-# Prefix Maps
-
-> foo="info:srw/cql-context-set/1/dc-v1.1" dc.title="fish"
-> "info:srw/cql-context-set/1/dc-v1.1" title="fish"
-> foo="info:srw/cql-context-set/1/dc-v1.1" > ccg = "http://srw.cheshire3.org/contextSets/ccg/1.1/" foo.title="fish" and ccg.force=3
-
-# Lame Searches
-
-any or all:stem and all == any prox prox=fuzzy
-(((((((((any)))))))))
-""
-> any > any = exact any > any
-
-# Invalid searches [should error]
-
-<
-===
-missingClause or
-missingTerm any
-()
-(missingParen
-missingParen any fish)
-(emptyParens or ())
-title = ("illegal parentheses")
-> illegal="urn:missingQuery"
-
-# free-form term OK)
-a b
-a b c
-a.b c
-and b c
-all a
-a any b
-dc.title a b c and d
-
-# free-form term (Syntax error)
-a b.c
-a and
projects / yaz-moved-to-github.git / commitdiff