/* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2011 Index Data
+ * Copyright (C) 1995-2012 Index Data
* See the file LICENSE for details.
*/
/**
}
pr("#", client_data);
}
- else if (*cp == ' ')
+ else if (*cp == ' ' && stop_at_space)
break;
else
{
{
pr(ccl_field, client_data);
pr(ccl_rel, client_data);
+ if (!split_op)
+ ccl_rel = 0;
}
pr_term(&cp, split_op ? 1 : 0, pr, client_data);
- if (!split_op)
- break;
while (*cp == ' ')
cp++;
if (*cp == '\0')
break;
pr(" ", client_data);
- pr(split_op, client_data);
- pr(" ", client_data);
+ if (split_op)
+ {
+ pr(split_op, client_data);
+ pr(" ", client_data);
+ }
}
if (cn->u.st.extra_terms)
{
if (r)
return r;
- pr(" ", client_data);
+ pr(") ", client_data);
if (strcmp(value, "prox"))
{ /* not proximity. assuming boolean */
pr(x, client_data);
}
}
- pr(" ", client_data);
+ pr(" (", client_data);
r = cql_to_ccl_r(cn->u.boolean.right, pr, client_data);
pr(")", client_data);