Happy new year

[yaz-moved-to-github.git] / src / solrtransform.c

diff --git a/src/solrtransform.c b/src/solrtransform.c
index b800ca9..7e54519 100644 (file)
--- a/src/solrtransform.c
+++ b/src/solrtransform.c
@@ -1,27 +1,18 @@
 /* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2010 Index Data
+ * Copyright (C) 1995-2012 Index Data
  * See the file LICENSE for details.
  */
-
 /**
  * \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 <ctype.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);
 }
@@ -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)
 {
@@ -168,7 +159,7 @@ static int solr_transform_parse_tok_line(solr_transform_t ct,
             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 =
@@ -639,11 +630,11 @@ static int has_modifier(struct solr_node *cn, const char *name) {
 }
 
 
-void emit_term(solr_transform_t ct,
-               struct solr_node *cn,
-               const char *term, int length,
-               void (*pr)(const char *buf, void *client_data),
-               void *client_data)
+static void emit_term(solr_transform_t ct,
+                      struct solr_node *cn,
+                      const char *term, int length,
+                      void (*pr)(const char *buf, void *client_data),
+                      void *client_data)
 {
     int i;
     const char *ns = cn->u.st.index_uri;
@@ -780,11 +771,11 @@ void emit_term(solr_transform_t ct,
     xfree(z3958_mem);
 }
 
-void emit_terms(solr_transform_t ct,
-                struct solr_node *cn,
-                void (*pr)(const char *buf, void *client_data),
-                void *client_data,
-                const char *op)
+static void emit_terms(solr_transform_t ct,
+                       struct solr_node *cn,
+                       void (*pr)(const char *buf, void *client_data),
+                       void *client_data,
+                       const char *op)
 {
     struct solr_node *ne = cn->u.st.extra_terms;
     if (ne)
@@ -808,11 +799,11 @@ void emit_terms(solr_transform_t ct,
     }
 }
 
-void emit_wordlist(solr_transform_t ct,
-                   struct solr_node *cn,
-                   void (*pr)(const char *buf, void *client_data),
-                   void *client_data,
-                   const char *op)
+static void emit_wordlist(solr_transform_t ct,
+                          struct solr_node *cn,
+                          void (*pr)(const char *buf, void *client_data),
+                          void *client_data,
+                          const char *op)
 {
     const char *cp0 = cn->u.st.term;
     const char *cp1;