Changeset 208

Timestamp:

04/23/10 17:01:18 (22 months ago)

Author:

ol

Message:

escape XML entities on char and varchar column also, and not only on text columns. Related to #45

Location:

src

Files:

• ows_api.h (modified) (1 diff)
• struct/buffer.c (modified) (1 diff)
• wfs/wfs_get_feature.c (modified) (1 diff)

src/ows_api.h

@@ -17 +17 @@
 void buffer_add_int (buffer * buf, int i);
 void buffer_add_str (buffer * buf, const char *str);
+bool buffer_cmp (const buffer * buf, const char *str);
+bool buffer_ncmp(const buffer * buf, const char *str, size_t n);
 bool buffer_case_cmp (const buffer * buf, const char *str);
-bool buffer_cmp (const buffer * buf, const char *str);
 void buffer_copy (buffer * dest, const buffer * src);
 void buffer_empty (buffer * buf);

src/struct/buffer.c

@@ -307 +307 @@
 
 /*
+ * Check if a buffer string is the same than another, on the n first char
+ */
+bool buffer_ncmp(const buffer * buf, const char *str, size_t n)
+{
+    size_t i;
+
+    assert(buf != NULL);
+    assert(str != NULL);
+
+    if (buf->use < n) return false;
+
+    for (i = 0 ; i < n ; i++)
+        if (buf->buf[i] != str[i])
+            return false;
+
+    return true;
+}
+
+/*
  * Check if a buffer string is the same than anoter for a specified length
  * (insensitive case check)

src/wfs/wfs_get_feature.c

@@ -140 +140 @@
             fprintf(o->output, "false");
 
-    /* FIXME what about varchar or char postgreSQL type ? */ 
-    } else if (buffer_cmp(prop_type, "text")) {
-        value_encoded = buffer_encode_xml_entities(value);
+    } else if (buffer_cmp(prop_type, "text")
+            || buffer_ncmp(prop_type, "char", 4)
+            || buffer_ncmp(prop_type, "varchar", 7)) {
+            value_encoded = buffer_encode_xml_entities(value);
         fprintf(o->output, "%s", value_encoded->buf);
         buffer_free(value_encoded);
-    } else 
-        fprintf(o->output, "%s", value->buf);
+
+    } else fprintf(o->output, "%s", value->buf);
     
     if (gml_ns)