projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update news
[yaz-moved-to-github.git]
/
src
/
solrtransform.c
diff --git
a/src/solrtransform.c
b/src/solrtransform.c
index
2d41044
..
11843db
100644
(file)
--- a/
src/solrtransform.c
+++ b/
src/solrtransform.c
@@
-1,27
+1,18
@@
/* This file is part of the YAZ toolkit.
/* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2010 Index Data
+ * Copyright (C) 1995-2011 Index Data
* See the file LICENSE for details.
*/
* See the file LICENSE for details.
*/
-
/**
* \file solrtransform.c
* \brief Implements SOLR transform (SOLR to RPN conversion).
/**
* \file solrtransform.c
* \brief Implements SOLR transform (SOLR to RPN conversion).
- *
- * Evaluation order of rules:
- *
- * always
- * relation
- * structure
- * position
- * truncation
- * index
- * relationModifier
*/
*/
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <assert.h>
#include <stdlib.h>
#include <string.h>
#include <assert.h>
#include <stdlib.h>
#include <string.h>
-#include <ctype.h>
#include <yaz/rpn2solr.h>
#include <yaz/xmalloc.h>
#include <yaz/diagsrw.h>
#include <yaz/rpn2solr.h>
#include <yaz/xmalloc.h>
#include <yaz/diagsrw.h>
@@
-50,7
+41,7
@@
struct solr_transform_t_ {
};
};
-/* TODO Utility functions, evt. split out int separate file */
+/* TODO Utility functions, split out into separate file */
int solr_strcmp(const char *s1, const char *s2) {
return cql_strcmp(s1, s2);
}
int solr_strcmp(const char *s1, const char *s2) {
return cql_strcmp(s1, s2);
}
@@
-79,7
+70,7
@@
void solr_buf_write_handler (const char *b, void *client_data)
}
}
-/* Utillity functions end */
+/* Utility functions end */
solr_transform_t solr_transform_create(void)
{
solr_transform_t solr_transform_create(void)
{
@@
-168,7
+159,7
@@
static int solr_transform_parse_tok_line(solr_transform_t ct,
break;
}
value_str = yaz_tok_parse_string(tp);
break;
}
value_str = yaz_tok_parse_string(tp);
- if (isdigit(*value_str))
+ if (yaz_isdigit(*value_str))
{
elem->which = Z_AttributeValue_numeric;
elem->value.numeric =
{
elem->which = Z_AttributeValue_numeric;
elem->value.numeric =