Changeset 195

Timestamp:

01/21/10 22:19:43 (8 months ago)

Author:

ol

Message:

Use PostGIS 1.5 GeomFromGML to parse GML instead of TinyOWS one. Add check_schema and check_valid_geom config properties to allow to bypass schema and is_valid check, cf #44.

Files:

• configure.in (modified) (1 diff)
• demo/install.sh.in (modified) (1 diff)
• src/fe/fe_filter.c (modified) (3 diffs)
• src/fe/fe_spatial_ops.c (modified) (7 diffs)
• src/ows/ows.h (modified) (1 diff)
• src/ows/ows_config.c (modified) (4 diffs)
• src/ows/ows_psql.c (modified) (1 diff)
• src/ows/ows_request.c (modified) (2 diffs)
• src/ows_api.h (modified) (2 diffs)
• src/wfs/wfs_transaction.c (modified) (5 diffs)
• test/install.sh.in (modified) (1 diff)

configure.in

@@ -86 +86 @@
 
 echo "------------------------"
-echo "This TinyOWS version will need at least PostGIS 1.4.x"
+echo "This TinyOWS version will need at least PostGIS 1.5.x"
 echo "------------------------"

demo/install.sh.in

@@ -5 +5 @@
 
 PGBIN=@POSTGIS_BIN@
-PGSHARE=@POSTGIS_SHARE@/contrib/
+PGSHARE=@POSTGIS_SHARE@/contrib/postgis-1.5
 PGUSER=postgres
 DB=tinyows_demo

src/fe/fe_filter.c

@@ -40 +40 @@
     assert(fe != NULL);
 
-    fe->sql = NULL;
+    fe->sql = buffer_init();
     fe->error_code = FE_NO_ERROR;
 
@@ -56 +56 @@
     if (fe->sql != NULL)
         buffer_free(fe->sql);
-
+    
     free(fe);
     fe = NULL;
@@ -443 +443 @@
     xmlInitParser();
     LIBXML_TEST_VERSION 
-    fe->sql = buffer_init();
 
     xmldoc = xmlParseMemory(xmlchar->buf, xmlchar->use);

src/fe/fe_spatial_ops.c

@@ -57 +57 @@
 
 /*
+ * Transform syntax coordinates from GML 2.1.2 (x1,y1 x2,y2) into Postgis (x1 y1,x2 y2)
+ */
+static  buffer *fe_transform_coord_gml_to_psql(buffer * coord)
+{
+    size_t i;
+    assert(coord != NULL);
+
+    /*check if the first separator is a comma else do nothing */
+    if (check_regexp(coord->buf, "^[0-9.-]+,")) {
+        for (i = 0; i < coord->use; i++) {
+            if (coord->buf[i] == ' ')       coord->buf[i] = ',';
+            else if (coord->buf[i] == ',')  coord->buf[i] = ' ';
+        }
+    }
+
+    return coord;
+}
+
+
+/*
  * Write a polygon geometry according to postgresql syntax from GML bbox
  */
@@ -161 +181 @@
 
 /*
- * Transform syntax coordinates from GML 2.1.2 (x1,y1 x2,y2) into Postgis (x1 y1,x2 y2)
- */
-buffer *fe_transform_coord_gml_to_psql(buffer * coord)
-{
-    size_t i;
-
-    assert(coord != NULL);
-
-    /*check if the first separator is a comma else do nothing */
-    if (check_regexp(coord->buf, "^[0-9.-]+,")) {
-        for (i = 0; i < coord->use; i++) {
-            if (coord->buf[i] == ' ')
-                coord->buf[i] = ',';
-            else if (coord->buf[i] == ',')
-                coord->buf[i] = ' ';
-        }
-    }
-
-    return coord;
-}
-
-
-/*
- * Transform syntax coordinates from GML 3.1.1 (x1 y1 x2 y2) into Postgis' (x1 y1,x2 y2)
- */
-buffer *fe_transform_coord_gml3_to_psql(buffer * coord)
-{
-    size_t i;
-    int nb_spaces;
-
-    assert(coord != NULL);
-
-    nb_spaces = 0;
-
-    for (i = 0; i < coord->use; i++) {
-        if (coord->buf[i] == ' ') {
-            nb_spaces++;
-
-            /* transform the second space separator into comma */
-            if (nb_spaces == 2) {
-                coord->buf[i] = ',';
-                nb_spaces = 0;
-            }
-        }
-    }
-
-    return coord;
-}
-
-
-/*
- * Transform a geometry expressed in GML into Postgis geometry syntax
- */
-buffer *fe_transform_geometry_gml_to_psql(ows * o, buffer * typename,
-        filter_encoding * fe, xmlNodePtr n)
-{
-    xmlChar *content;
-    xmlNodePtr node, node_coord;
-    buffer *tmp, *geom;
-    bool first_ring = true;
-    int bracket;
+ * Return the SQL request matching the spatial operator
+ */
+static buffer *fe_spatial_functions(ows * o, buffer * typename,
+                                    filter_encoding * fe, xmlNodePtr n)
+{
+    bool transform = false;
+    buffer *sql;
 
     assert(o != NULL);
@@ -228 +194 @@
     assert(n != NULL);
 
-    content = NULL;
-
-    /* jump to the next element if there are spaces */
-    while (n->type != XML_ELEMENT_NODE) n = n->next;
-
-    buffer_add_str(fe->sql, "setsrid('");
-
-    geom = buffer_init();
-    if (strcmp((char *) n->name, "MultiSurface") == 0)
-        buffer_add_str(geom, "MultiPolygon");
-    else
-        buffer_add_str(geom, (char *) n->name);
-
-    /* print the geometry type */
-    if (buffer_cmp(geom, "MultiPolygon") || buffer_cmp(geom, "MultiSurface")) {
-        buffer_add_str(geom, "(((");
-        bracket = 3;
-    } else if (buffer_cmp(geom, "MultiLineString")
-               || buffer_cmp(geom, "Polygon")) {
-        buffer_add_str(geom, "((");
-        bracket =2;
-    } else if (buffer_cmp(geom, "MultiPoint")
-               || buffer_cmp(geom, "Point") 
-               || buffer_cmp(geom, "LineString")) {
-        buffer_add_str(geom, "(");
-        bracket = 1;
-    } else {
-        fe->error_code = FE_ERROR_GEOMETRY;
-        buffer_free(geom);
-        return fe->sql;
-    }
-    n = n->children;
-
-    /* jump to the next element if there are spaces */
-    while (n->type != XML_ELEMENT_NODE) n = n->next;
-
-    /* print the coordinates */
-    for (node = n; node != NULL; node = node->next) {
-
-        /*
-         * Ignore GML properties if any
-         */
-        if ((strcmp((char *) node->name, "description") == 0 
-            || strcmp((char *) node->name, "name") == 0  
-            || strcmp((char *) node->name, "metaDataProperty") == 0)  
-                && strcmp((char *) node->ns->href, "http://www.opengis.net/gml")  == 0)
-            node = node->next;
-
-        if (node->type == XML_ELEMENT_NODE) {
-            node_coord = node;
-
-
-            /* go to node <coordinates> */
-            while (strcmp((char *) node_coord->name, "coordinates") != 0
-                    && strcmp((char *) node_coord->name, "posList") != 0
-                    && strcmp((char *) node_coord->name, "pos") != 0) {
-
-                while (node_coord != NULL && node_coord->type != XML_ELEMENT_NODE) {
-                    node_coord = node_coord->next;
-                }
-
-                if (node_coord == NULL) {
-                    fe->error_code = FE_ERROR_GEOMETRY;
-                    buffer_free(geom);
-                    return fe->sql;
-               }
-
-                if (node_coord != NULL && node_coord->type == XML_ELEMENT_NODE 
-                        && strcmp((char *) node_coord->name, "LinearRing") == 0) {
-                    buffer_pop(geom, 1); /* remove last coord comma or ( */
-                    if (!first_ring) buffer_add_str(geom, "),");
-                    buffer_add_str(geom, "(");
-                    first_ring = false;
-                }
-
-                /* jump to the next element if there are spaces */
-                if (strcmp((char *) node_coord->name, "coordinates") != 0
-                        && strcmp((char *) node_coord->name, "posList") != 0
-                        && strcmp((char *) node_coord->name, "pos") != 0)
-                    node_coord = node_coord->children;
-            }
-
-            tmp = buffer_init();
-
-            content = xmlNodeGetContent(node_coord);
-            buffer_add_str(tmp, (char *) content);
-
-            if (strcmp((char *) node_coord->name, "coordinates") == 0)
-                tmp = fe_transform_coord_gml_to_psql(tmp);
-            else
-                tmp = fe_transform_coord_gml3_to_psql(tmp);
-
-            buffer_copy(geom, tmp);
-            buffer_free(tmp);
-            xmlFree(content);
-        }
-
-        if (node->next != NULL) {
-            if (node->next->type == XML_ELEMENT_NODE) {
-                if (strcmp((char *) node->next->name,
-                           "lineStringMember") == 0)
-                    buffer_add_str(geom, "),(");
-                else if (strcmp((char *) node->next->name, "polygonMember") == 0
-                     || strcmp((char *) node->next->name, "surfaceMember") == 0)
-                    buffer_add_str(geom, ")),((");
-                else
-                    buffer_add_str(geom, ",");
-            }
-        }
-    }
-
-    /* print the geometry type */
-    if (bracket == 3) buffer_add_str(geom, ")))");
-    else if (bracket == 2) buffer_add_str(geom, "))");
-    else buffer_add_str(geom, ")");
-
-    if (!ows_psql_is_geometry_valid(o, geom)) {
-        fe->error_code = FE_ERROR_GEOMETRY;
-        buffer_free(geom);
-        return fe->sql;
-    }
-
-    buffer_add_str(geom, "'::geometry,");
-    buffer_copy(fe->sql, geom);
-
-    /* print the srid */
-    buffer_add_int(fe->sql, ows_srs_get_srid_from_layer(o, typename));
-    buffer_add_str(fe->sql, ")");
-
-    buffer_free(geom);
-
-    return fe->sql;
-}
-
-
-/*
- * Return the SQL request matching the spatial operator
- */
-static buffer *fe_spatial_functions(ows * o, buffer * typename,
-                                    filter_encoding * fe, xmlNodePtr n)
-{
-    bool transform = false;
-
-    assert(o != NULL);
-    assert(typename != NULL);
-    assert(fe != NULL);
-    assert(n != NULL);
-
     if (strcmp((char *) n->name, "Equals") == 0)
-        buffer_add_str(fe->sql, " Equals(");
+        buffer_add_str(fe->sql, " ST_Equals(");
 
     if (strcmp((char *) n->name, "Disjoint") == 0)
-        buffer_add_str(fe->sql, " Disjoint(");
+        buffer_add_str(fe->sql, " ST_Disjoint(");
 
     if (strcmp((char *) n->name, "Touches") == 0)
-        buffer_add_str(fe->sql, " Touches(");
+        buffer_add_str(fe->sql, " ST_Touches(");
 
     if (strcmp((char *) n->name, "Within") == 0)
-        buffer_add_str(fe->sql, " Within(");
+        buffer_add_str(fe->sql, " ST_Within(");
 
     if (strcmp((char *) n->name, "Overlaps") == 0)
-        buffer_add_str(fe->sql, " Overlaps(");
+        buffer_add_str(fe->sql, " ST_Overlaps(");
 
     if (strcmp((char *) n->name, "Crosses") == 0)
-        buffer_add_str(fe->sql, " Crosses(");
+        buffer_add_str(fe->sql, " ST_Crosses(");
 
     if (strcmp((char *) n->name, "Intersects") == 0)
-        buffer_add_str(fe->sql, " Intersects(");
+        buffer_add_str(fe->sql, " ST_Intersects(");
 
     if (strcmp((char *) n->name, "Contains") == 0)
-        buffer_add_str(fe->sql, " Contains(");
+        buffer_add_str(fe->sql, " ST_Contains(");
 
     n = n->children;
@@ -424 +242 @@
     while (n->type != XML_ELEMENT_NODE) n = n->next;
 
-    buffer_add(fe->sql, ',');
+    buffer_add_str(fe->sql, ",'");
 
     if (strcmp((char *) n->name, "Box") == 0
             || strcmp((char *) n->name, "Envelope") == 0)
         fe->sql = fe_envelope(o, typename, fe, n);
-    else
-        fe->sql = fe_transform_geometry_gml_to_psql(o, typename, fe, n);
-
-    buffer_add(fe->sql, ')');
+    else  {
+        sql = ows_psql_gml_to_sql(o, n);
+        if (sql != NULL) { 
+            buffer_copy(fe->sql, sql);
+            buffer_free(sql);
+        } /* TODO else case */
+    }
+
+    buffer_add_str(fe->sql, "')");
 
     return fe->sql;
@@ -446 +269 @@
 {
     xmlChar *content, *units;
+    buffer *tmp, *op, *sql;
     float km;
-    buffer *tmp, *op;
 
     assert(o != NULL);
@@ -482 +305 @@
     fe->sql = fe_property_name(o, typename, fe, fe->sql, n, true);
 
-    buffer_add_str(fe->sql, "),ST_centroid(");
+    buffer_add_str(fe->sql, "),ST_centroid('");
 
     n = n->next;
@@ -490 +313 @@
 
     /* display the geometry */
-    fe->sql = fe_transform_geometry_gml_to_psql(o, typename, fe, n);
-
-    buffer_add_str(fe->sql, "))");
+    sql = ows_psql_gml_to_sql(o, n);
+    if (sql != NULL) {
+        buffer_copy(fe->sql, sql);
+        buffer_free(sql);
+    } /* TODO else case */
+
+    buffer_add_str(fe->sql, "'))");
 
     n = n->next;

src/ows/ows.h

@@ -421 +421 @@
     bool wfs_display_bbox;
 
+    bool check_schema;
+    bool check_valid_geom;
+
     array * cgi;
     list * psql_requests;

src/ows/ows_config.c

@@ -42 +42 @@
 
     a = xmlTextReaderGetAttribute(r, (xmlChar *) "online_resource");
-
     if (a != NULL) {
         o->online_resource = buffer_init();
@@ -50 +49 @@
 
     a = xmlTextReaderGetAttribute(r, (xmlChar *) "schema_dir");
-
     if (a != NULL) {
         o->schema_dir = buffer_init();
@@ -58 +56 @@
 
     a = xmlTextReaderGetAttribute(r, (xmlChar *) "log");
-
     if (a != NULL) {
         o->log = buffer_init();
@@ -66 +63 @@
 
     a = xmlTextReaderGetAttribute(r, (xmlChar *) "degree_precision");
-
     if (a != NULL) {
         o->schema_dir = buffer_init();
         precision = atoi((char *) a);
-
         if (precision > 0 && precision < 12)
             o->degree_precision = precision;
-
         xmlFree(a);
     }
 
     a = xmlTextReaderGetAttribute(r, (xmlChar *) "meter_precision");
-
     if (a != NULL) {
         o->schema_dir = buffer_init();
         precision = atoi((char *) a);
-
         if (precision > 0 && precision < 12)
             o->meter_precision = precision;
-
         xmlFree(a);
     }
 
     a = xmlTextReaderGetAttribute(r, (xmlChar *) "wfs_display_bbox");
-
     o->wfs_display_bbox = true;
-
-    if (a != NULL) {
-        if (atoi((char *) a))
-            o->wfs_display_bbox = true;
-        else
-            o->wfs_display_bbox = false;
-
-        xmlFree(a);
-    }
-
+    if (a != NULL) {
+        if (atoi((char *) a)) o->wfs_display_bbox = true;
+        else                  o->wfs_display_bbox = false;
+        xmlFree(a);
+    }
+
+    a = xmlTextReaderGetAttribute(r, (xmlChar *) "check_schema");
+    o->check_schema = true;
+    if (a != NULL) {
+        if (atoi((char *) a)) o->check_schema = true;
+        else                  o->check_schema = false;
+        xmlFree(a);
+    }
+
+    a = xmlTextReaderGetAttribute(r, (xmlChar *) "check_valid_geom");
+    o->check_valid_geom = true;
+    if (a != NULL) {
+        if (atoi((char *) a)) o->check_valid_geom = true;
+        else                  o->check_valid_geom = false;
+        xmlFree(a);
+    }
 }
 

src/ows/ows_psql.c

@@ -434 +434 @@
 
 
-
-/*
- *  * Return the number of rows returned by the specified requests
- *   */
+/*
+ * Return the number of rows returned by the specified requests
+ */
 int ows_psql_number_features(ows * o, list * from, list * where)
 {
-        buffer *sql;
-        PGresult *res;
-        list_node *ln_from, *ln_where;
-        int nb;
-
-        assert(o != NULL);
-        assert(from != NULL);
-        assert(where != NULL);
-
-        nb = 0;
-
-        /* checks if from list and where list have the same size */
-        if (from->size != where->size) return nb;
-
-
-        for (ln_from = from->first, ln_where = where->first; ln_from != NULL;
-                 ln_from = ln_from->next, ln_where = ln_where->next) {
-                 sql = buffer_init();
-
-                 /* execute the request */
-                 buffer_add_str(sql, "SELECT count(*) FROM \"");
-                 buffer_copy(sql, ln_from->value);
-                 buffer_add_str(sql, "\" ");
-                 buffer_copy(sql, ln_where->value);
-                 res = PQexec(o->pg, sql->buf);
-                 buffer_free(sql);
-
-                 if (PQresultStatus(res) != PGRES_TUPLES_OK) {
-                     PQclear(res);
-                     return -1;
-                 }
-                 nb = nb + atoi(PQgetvalue(res, 0, 0));
+    buffer *sql;
+    PGresult *res;
+    list_node *ln_from, *ln_where;
+    int nb;
+
+    assert(o != NULL);
+    assert(from != NULL);
+    assert(where != NULL);
+
+    nb = 0;
+
+    /* checks if from list and where list have the same size */
+    if (from->size != where->size) return nb;
+
+
+    for (ln_from = from->first, ln_where = where->first; ln_from != NULL;
+             ln_from = ln_from->next, ln_where = ln_where->next) {
+             sql = buffer_init();
+
+             /* execute the request */
+             buffer_add_str(sql, "SELECT count(*) FROM \"");
+             buffer_copy(sql, ln_from->value);
+             buffer_add_str(sql, "\" ");
+             buffer_copy(sql, ln_where->value);
+             res = PQexec(o->pg, sql->buf);
+             buffer_free(sql);
+
+             if (PQresultStatus(res) != PGRES_TUPLES_OK) {
                  PQclear(res);
-         }
-
-        return nb;
-}
+                 return -1;
+             }
+             nb = nb + atoi(PQgetvalue(res, 0, 0));
+             PQclear(res);
+     }
+
+    return nb;
+}
+
+
+static xmlNodePtr ows_psql_recursive_parse_gml(ows * o, xmlNodePtr n)
+{
+    xmlNodePtr c;
+    static xmlNodePtr result=NULL;
+
+    assert(o != NULL);
+    assert(n != NULL);
+
+    if (result) return result;  /* avoid recursive loop */
+
+    /* We are looking for the geometry part inside GML doc */
+    for (; n ; n = n->next) {
+
+        if (n->type != XML_ELEMENT_NODE) continue;
+
+        /* GML SF Geometries Types */
+        if (   !strcmp((char *) n->name, "Point")
+            || !strcmp((char *) n->name, "LineString")
+            || !strcmp((char *) n->name, "Curve")
+            || !strcmp((char *) n->name, "Polygon")
+            || !strcmp((char *) n->name, "Surface")
+            || !strcmp((char *) n->name, "MultiPoint")
+            || !strcmp((char *) n->name, "MultiLineString")
+            || !strcmp((char *) n->name, "MultiCurve")
+            || !strcmp((char *) n->name, "MultiPolygon")
+            || !strcmp((char *) n->name, "MultiSurface")
+            || !strcmp((char *) n->name, "MultiGeometry")) {
+
+            return n;
+        }
+        /* TODO Add check on namespace GML 3 and GML 3.2 */
+
+        /* Recursive exploration */
+        if (n->children)
+            for (c = n->children ; c ; c = c->next)
+                if ((result = ows_psql_recursive_parse_gml(o, c)))
+                    return result;
+    }
+
+    return NULL;
+}
+
+
+/*
+ * Transform a GML geometry to PostGIS EWKT
+ * Return NULL on error
+ */
+buffer * ows_psql_gml_to_sql(ows * o, xmlNodePtr n)
+{
+    PGresult *res;
+    xmlNodePtr g;
+    buffer *result, *sql, *gml;
+
+    assert(o != NULL);
+    assert(n != NULL);
+
+    g = ows_psql_recursive_parse_gml(o, n);
+    if (!g) return NULL;    /* No Geometry founded in GML doc */
+
+    /* Retrieve the sub doc and launch GML parse via PostGIS */
+    gml = buffer_init();
+    cgi_add_xml_into_buffer(gml, g);
+    
+    sql = buffer_init();
+    buffer_add_str(sql, "SELECT ST_GeomFromGML('");
+    buffer_add_str(sql, gml->buf);
+    buffer_add_str(sql, "')");
+
+    res = PQexec(o->pg, sql->buf);
+    buffer_free(gml);
+
+
+    /* GML Parse errors cases */
+    if (PQresultStatus(res) != PGRES_TUPLES_OK || PQntuples(res) != 1) {
+        buffer_free(sql);
+        PQclear(res);
+        return NULL;
+    }
+
+    result = buffer_init();
+    buffer_add_str(result, PQgetvalue(res, 0, 0));
+    PQclear(res);
+
+    /* Check if geometry is valid */
+    if (o->check_valid_geom) {
+
+        buffer_empty(sql);
+        buffer_add_str(sql, "SELECT ST_IsValid('");
+        buffer_add_str(sql, result->buf);
+        buffer_add_str(sql, "')");
+
+        res = PQexec(o->pg, sql->buf);
+
+        if (   PQresultStatus(res) != PGRES_TUPLES_OK
+            || PQntuples(res) != 1
+            || (char) PQgetvalue(res, 0, 0)[0] !=  't') {
+            buffer_free(sql);
+            buffer_free(result);
+            PQclear(res);
+            return NULL;
+        }
+    }
+
+    buffer_free(sql);
+    PQclear(res);
+
+    return result;
+}
+
 
 /*

src/ows/ows_request.c

@@ -390 +390 @@
     if ((cgi_method_post() && strcmp(getenv("CONTENT_TYPE"), "application/x-www-form-urlencoded") != 0)
             || (!cgi_method_post() && !cgi_method_get() && query[0] == '<')) {
-        xmlstring = buffer_init();
-        buffer_add_str(xmlstring, query);
-
-        if (or->service == WFS) {
+
+        if (or->service == WFS && o->check_schema) {
+
+            xmlstring = buffer_init();
+            buffer_add_str(xmlstring, query);
 
             if (ows_version_get(or->version) == 100) {
@@ -418 +419 @@
 
             buffer_free(schema);
-        }
-
-        buffer_free(xmlstring);
-
-        if (valid != 0)
-            ows_error(o, OWS_ERROR_INVALID_PARAMETER_VALUE,
+            buffer_free(xmlstring);
+            
+            if (valid != 0)
+                ows_error(o, OWS_ERROR_INVALID_PARAMETER_VALUE,
                       "xml isn't valid", "request");
+        }
     }
 }

src/ows_api.h

@@ -55 +55 @@
 buffer *fe_property_name (ows * o, buffer * typename, filter_encoding * fe, buffer * sql, xmlNodePtr n, bool check_geom_column);
 buffer *fe_spatial_op (ows * o, buffer * typename, filter_encoding * fe, xmlNodePtr n);
-buffer *fe_transform_coord_gml3_to_psql (buffer * coord);
-buffer *fe_transform_coord_gml_to_psql (buffer * coord);
-buffer *fe_transform_geometry_gml_to_psql (ows * o, buffer * typename, filter_encoding * fe, xmlNodePtr n);
 buffer *fe_xpath_property_name (ows * o, buffer * typename, buffer * property);
 buffer *fill_fe_error (ows * o, filter_encoding * fe);
@@ -147 +144 @@
 buffer *ows_psql_generate_id (ows * o, buffer * layer_name);
 int ows_psql_number_features(ows * o, list * from, list * where);
+buffer * ows_psql_gml_to_sql(ows * o, xmlNodePtr n);
 void ows_request_check (ows * o, ows_request * or, const array * cgi, const char *query);
 void ows_request_flush (ows_request * or, FILE * output);

src/wfs/wfs_transaction.c

@@ -316 +316 @@
 static buffer *wfs_insert_xml(ows * o, wfs_request * wr, xmlDocPtr xmldoc, xmlNodePtr n)
 {
-    buffer *values, *column, *layer_name, *layer_prefix, *result, *sql;
+    buffer *values, *column, *layer_name, *layer_prefix, *result, *sql, *gml;
     buffer *id, *handle, *id_column, *fid_full_name, *dup_sql;
     filter_encoding *fe;
@@ -332 +332 @@
     sql = buffer_init();
     handle = buffer_init();
-    id =  buffer_init();
 
     /* retrieve handle attribute to report it in transaction response */
@@ -471 +470 @@
                     while (elemt->type != XML_ELEMENT_NODE) elemt = elemt->next;
 
-                    fe = filter_encoding_init();
-                    fe->sql = buffer_init();
-
                     if (strcmp((char *) elemt->name, "Box") == 0
                             || strcmp((char *) elemt->name, "Envelope") == 0) {
+
+                        fe = filter_encoding_init();
+                        fe->sql = buffer_init();
                         fe->sql = fe_envelope(o, layer_name, fe, elemt);
                         buffer_copy(values, fe->sql);
+                        filter_encoding_free(fe);
+
                     } else if (strcmp((char *) elemt->name, "Null") == 0) {
                         buffer_add_str(values, "''");
                     } else {
-                        fe->sql = fe_transform_geometry_gml_to_psql(o, layer_name, fe, elemt);
-
-                        /* FIXME is it really the right way to handle that ? 
-                         * What about an ows error instead ?
-                         */
-                        if (fe->error_code)
-                            buffer_add_str(values, "NULL");
-                        else
-                            buffer_copy(values, fe->sql);
+                        gml = ows_psql_gml_to_sql(o, n);
+                        if (gml != NULL) {
+                            buffer_add_str(values, "'");
+                            buffer_copy(values, gml);
+                            buffer_add_str(values, "'");
+                            buffer_free(gml);
+                        } /* TODO else case */
                     }
 
-                    filter_encoding_free(fe);
                 } else {
                     values = wfs_retrieve_value(o, wr, values, xmldoc, node);
@@ -726 +724 @@
 static buffer *wfs_update_xml(ows * o, wfs_request * wr, xmlDocPtr xmldoc, xmlNodePtr n)
 {
-    buffer *typename, *xmlstring, *result, *sql, *property_name, *values;
+    buffer *typename, *xmlstring, *result, *sql, *property_name, *values, *gml;
     filter_encoding *filter, *fe;
     xmlNodePtr node, elemt;
@@ -797 +795 @@
                             elemt = elemt->next;
 
-                        fe = filter_encoding_init();
-                        fe->sql = buffer_init();
-
                         if (strcmp((char *) elemt->name, "Box") == 0
                                 || strcmp((char *) elemt->name, "Envelope") == 0) {
+
+                            fe = filter_encoding_init();
+                            fe->sql = buffer_init();
                             fe->sql = fe_envelope(o, typename, fe, elemt);
                             buffer_copy(values, fe->sql);
+                            filter_encoding_free(fe);
+
                         } else if (strcmp((char *) elemt->name, "Null") == 0) {
                             buffer_add_str(values, "''");
                         } else {
-                            fe->sql = fe_transform_geometry_gml_to_psql(o, typename, fe, elemt);
-                            buffer_copy(values, fe->sql);
+                            gml = ows_psql_gml_to_sql(o, n);
+                            if (gml != NULL) {
+                                buffer_add_str(values, "'");
+                                buffer_copy(values, gml);
+                                buffer_add_str(values, "'");
+                                buffer_free(gml);
+                            } /* TODO else case */
                         }
 
-                        filter_encoding_free(fe);
                     } else {
                         values = wfs_retrieve_value(o, wr, values, xmldoc, node);

test/install.sh.in

@@ -5 +5 @@
 
 PG_BIN=@POSTGIS_BIN@
-PG_SHARE=@POSTGIS_SHARE@/contrib/
+PG_SHARE=@POSTGIS_SHARE@/contrib/postgis-1.5
 PG_USER=postgres
 DB=tinyows_test