Changeset 129

Timestamp:

04/20/09 19:14:20 (3 years ago)

Author:

ol

Message:

Handle idgen WFS 1.1.0 behaviour. Switch by default on Generate New? option. Still need to improve random id mechanism. Cf #15

Location:

src/wfs

Files:

• wfs_request.c (modified) (2 diffs)
• wfs_transaction.c (modified) (20 diffs)

src/wfs/wfs_request.c

@@ -141 +141 @@
     if (wr->insert_results != NULL) {
         fprintf(output, " insert_results -> ");
-        mlist_flush(wr->insert_results, output);
+        alist_flush(wr->insert_results, output);
         fprintf(output, "\n");
     }
-
 
     fprintf(output, "]\n");
@@ -189 +188 @@
 
     if (wr->insert_results != NULL)
-        mlist_free(wr->insert_results);
+        alist_free(wr->insert_results);
 
     free(wr);

src/wfs/wfs_transaction.c

@@ -27 +27 @@
 #include <string.h>
 #include <ctype.h>
+#include <time.h>
 
 #include "../ows/ows.h"
@@ -80 +81 @@
                                     buffer * result)
 {
-    mlist_node *mln;
-    int insert_nb;
+    int nb = 0; 
+    alist_node *an;
 
     assert(o != NULL);
@@ -87 +88 @@
     assert(result != NULL);
 
-    mln = NULL;
-    insert_nb = 0;
-
     fprintf(o->output, "<wfs:TransactionSummary>\n");
 
@@ -95 +93 @@
 
         if (wr->insert_results != NULL) {
-            for (mln = wr->insert_results->first; mln != NULL; mln = mln->next)
-                insert_nb = insert_nb + mln->value->size;
-
-            fprintf(o->output, " <wfs:totalInserted>%d</wfs:totalInserted>\n",
-                    insert_nb);
-        }
-
-        if (wr->delete_results != 0)
-            fprintf(o->output, " <wfs:totalDeleted>%d</wfs:totalDeleted>\n",
+            for (an = wr->insert_results->first; an != NULL; an = an->next)
+                nb += an->value->size;
+
+            fprintf(o->output, " <wfs:totalInserted>%d</wfs:totalInserted>\n", nb);
+        }
+
+        fprintf(o->output, " <wfs:totalDeleted>%d</wfs:totalDeleted>\n",
                     wr->delete_results);
 
-        if (wr->update_results != 0)
-            fprintf(o->output, "<wfs:totalUpdated>%d</wfs:totalUpdated>\n",
+        fprintf(o->output, "<wfs:totalUpdated>%d</wfs:totalUpdated>\n",
                     wr->update_results);
     }
@@ -118 +113 @@
  * Report newly created feature instances
  */
-static void wfs_transaction_insert_result(ows * o, wfs_request * wr,
-        buffer * result)
-{
-    mlist_node *mln;
-    list_node *hdl, *ln;
+static void wfs_transaction_insert_result(ows * o, wfs_request * wr, buffer * result)
+{
+    list_node *ln;
+    alist_node *an;
 
     assert(o != NULL);
@@ -128 +122 @@
     assert(result != NULL);
 
-    mln = NULL;
-    hdl = NULL;
     ln = NULL;
 
     /* check if there were Insert operations and if the command succeeded */
     if ((!cgi_method_get()) && (buffer_cmp(result, "PGRES_COMMAND_OK")
-                                && (wr->insert_results != NULL))) {
-        if (wr->handle != NULL)
-            hdl = wr->handle->first;
+            && (wr->insert_results != NULL))) {
 
         if (ows_version_get(o->request->version) == 110)
             fprintf(o->output, "<wfs:InsertResults>\n");
 
-        for (mln = wr->insert_results->first; mln != NULL; mln = mln->next) {
-            if (ows_version_get(o->request->version) == 100) {
-                if (wr->handle != NULL)
-                    fprintf(o->output, "<wfs:InsertResult handle=\"%s\">",
-                            hdl->value->buf);
-                else
-                    fprintf(o->output, "<wfs:InsertResult>");
-            } else {
-                if (wr->handle != NULL)
-                    fprintf(o->output, "<wfs:Feature handle=\"%s\">",
-                            hdl->value->buf);
-                else
-                    fprintf(o->output, "<wfs:Feature>");
-            }
-
-            for (ln = mln->value->first; ln != NULL; ln = ln->next)
-                fprintf(o->output, "<ogc:FeatureId fid=\"%s\"/>",
-                        ln->value->buf);
+        for (an = wr->insert_results->first; an != NULL; an = an->next) {
+
+            if (ows_version_get(o->request->version) == 100)
+                    fprintf(o->output, "<wfs:InsertResult handle=\"%s\">", an->key->buf);
+            else 
+                    fprintf(o->output, "<wfs:Feature handle=\"%s\">", an->key->buf);
+
+            for (ln = an->value->first; ln != NULL; ln = ln->next)
+                fprintf(o->output, "<ogc:FeatureId fid=\"%s\"/>", ln->value->buf);
 
             if (ows_version_get(o->request->version) == 100)
@@ -164 +145 @@
             else
                 fprintf(o->output, "</wfs:Feature>\n");
-
-            if (wr->handle != NULL)
-                hdl = hdl->next;
         }
 
         if (ows_version_get(o->request->version) == 110)
-            fprintf(o->output, "<wfs:InsertResults>");
+            fprintf(o->output, "</wfs:InsertResults>");
     }
 }
@@ -337 +315 @@
 static buffer *wfs_insert_xml(ows * o, wfs_request * wr, xmlNodePtr n)
 {
-    buffer *values, *column, *layer_name, *result, *sql, *id, *tmp, *id_column;
-    list *fid;
+    buffer *values, *column, *layer_name, *layer_prefix, *result, *sql;
+    buffer *id, *handle, *id_column, *fid_full_name;
     filter_encoding *fe;
     xmlNodePtr node, elemt;
-    xmlChar *content;
+    xmlChar *attr = NULL;
+    enum wfs_insert_idgen idgen = WFS_GENERATE_NEW;
 
     assert(o != NULL);
@@ -348 +327 @@
 
     sql = buffer_init();
-    fid = list_init();
-    content = NULL;
+    handle = buffer_init();
 
     /* retrieve handle attribute to report it in transaction response */
-    if (n->properties != NULL) {
-        if (strcmp((char *) n->properties->name, "handle") == 0) {
-            wr->handle = list_init();
-            content = xmlNodeGetContent(n->properties->children);
-            tmp = buffer_init();
-            buffer_add_str(tmp, (char *) content);
-            list_add_by_copy(wr->handle, tmp);
-            xmlFree(content);
-            buffer_free(tmp);
-        }
+    if (xmlHasProp(n, (xmlChar *) "handle")) {
+        attr =  xmlGetProp(n, (xmlChar *) "handle");
+        buffer_add_str(handle, (char *) attr);
+        xmlFree(attr);
+    /* handle is optional in WFS Schema */
+    } else buffer_add_str(handle, "TinyOWS-WFS-default-handle");
+
+    /* idgen appears in WFS 1.1.0, default behaviour is GenerateNew id
+       It is safe to not test WFS version, as schema validation 
+       already do the job for us.
+    */
+    if (xmlHasProp(n, (xmlChar *) "idgen")) {
+        attr =  xmlGetProp(n, (xmlChar *) "idgen");
+        if (strcmp((char *) attr, "ReplaceDuplicate") == 0)
+                idgen = WFS_REPLACE_DUPLICATE;
+        else if (strcmp((char *) attr, "UseExisting") == 0)
+                idgen = WFS_USE_EXISTING;
+        xmlFree(attr);
     }
 
@@ -386 +372 @@
          */ 
         id = buffer_init();
-        if ((n->properties != NULL) && (
-                    (strcmp((char *) n->properties->name, "id") == 0 ||
-                    (strcmp((char *) n->properties->name, "fid") == 0 )))) {
-            content = xmlNodeGetContent(n->properties->children);
-            buffer_add_str(id, (char *) content);
-            xmlFree(content); 
-        }
+        if (xmlHasProp(n, (xmlChar *) "id"))
+            attr =  xmlGetProp(n, (xmlChar *) "id");
+        else if (xmlHasProp(n, (xmlChar *) "fid"))
+            attr =  xmlGetProp(n, (xmlChar *) "fid");
+        
+        if (attr != NULL) {
+            buffer_add_str(id, (char *) attr);
+            xmlFree(attr); 
+        } else idgen = WFS_GENERATE_NEW;
+        /* TODO should add error if UseExisting 
+           or Replace without id set ? */
 
         id_column = ows_psql_id_column(o, layer_name);
-
-        /* retrieve the id of the inserted feature
+        layer_prefix = ows_layer_prefix(o->layers, layer_name);
+
+        /*
+         * Delete previous feature if idgen is ReplaceExisting
+         */
+        if (idgen == WFS_REPLACE_DUPLICATE) {
+             buffer_add_str(sql, "DELETE FROM \"");
+             buffer_copy(sql, layer_name);
+             buffer_add_str(sql, "\" WHERE ");
+             buffer_copy(sql, id_column);
+             buffer_add_str(sql, "='");
+             buffer_copy(sql, id);
+             buffer_add_str(sql, "';");
+        } else if (idgen == WFS_GENERATE_NEW) {
+             srandom((int) (time(NULL) ^ random() % 1000) + 42);
+             srandom((random() % 1000 ^ random() % 1000) + 42);
+             buffer_add_int(id, random());
+             /* FIXME: use something more clever than that
+                to prevent collission !
+             */
+        }
+
+        /* Retrieve the id of the inserted feature
          * to report it in transaction respons
          */
-        tmp = buffer_init();
-        buffer_copy(tmp, layer_name);
-        buffer_add(tmp, '.');
-        buffer_copy(tmp, id);
-        list_add(fid, tmp);
+        fid_full_name = buffer_init();
+        buffer_copy(fid_full_name, layer_name);
+        buffer_add(fid_full_name, '.');
+        buffer_copy(fid_full_name, id);
+        alist_add(wr->insert_results, handle, fid_full_name);
 
         buffer_add_str(sql, "INSERT INTO \"");
@@ -411 +422 @@
         buffer_add_str(sql, "\"");
         buffer_copy(sql, id_column);
-        buffer_add_str(sql, "\",");
+        buffer_add_str(sql, "\"");
 
         node = n->children;
 
         /* jump to the next element if there are spaces */
-        while (node->type != XML_ELEMENT_NODE)
-            node = node->next;
+        while (node->type != XML_ELEMENT_NODE) node = node->next;
 
         /* fill fields and values at the same time */
         for (; node; node = node->next) {
-            if (node->type == XML_ELEMENT_NODE) {
+            if (node->type == XML_ELEMENT_NODE && 
+                buffer_cmp(layer_prefix, (char *) node->ns->prefix)) {
+
+                buffer_add(sql, ',');
+                buffer_add(values, ',');
+
                 column = buffer_init();
                 buffer_add_str(column, (char *) node->name);
@@ -434 +449 @@
 
                     /* jump to the next element if there are spaces */
-                    while (elemt->type != XML_ELEMENT_NODE)
-                        elemt = elemt->next;
+                    while (elemt->type != XML_ELEMENT_NODE) elemt = elemt->next;
 
                     fe = filter_encoding_init();
@@ -448 +462 @@
                     } else {
                         fe->sql = fe_transform_geometry_gml_to_psql(o, layer_name, fe, elemt);
+                        /* Carefull no error test on transform ! */
                         buffer_copy(values, fe->sql);
                     }
@@ -458 +473 @@
                 buffer_free(column);
             }
-
-            if (node->next != NULL)
-                if (node->next->type == XML_ELEMENT_NODE) {
-                    buffer_add_str(sql, ",");
-                    buffer_add_str(values, ",");
-                }
         }
 
         /* As id could be NULL in GML */
         if (id->use > 0) {  
-            buffer_add_str(sql, " ) VALUES ('");
+            buffer_add_str(sql, ") VALUES ('");
             buffer_copy(sql, id);
-            buffer_add_str(sql, "',");
+            buffer_add_str(sql, "'");
         } else 
-            buffer_add_str(sql, " ) VALUES (null,");
+            buffer_add_str(sql, ") VALUES (null");
 
         buffer_copy(sql, values);
@@ -479 +488 @@
         buffer_free(values);
         buffer_free(layer_name);
+        buffer_free(layer_prefix);
         buffer_free(id);
     }
-
-    /* list of featureid inserted to be used during transaction response */
-    wr->insert_results = mlist_init();
-    mlist_add(wr->insert_results, fid);
 
     /* run the request to insert all features at the same time */
@@ -845 +851 @@
     sql = buffer_init();
     locator = buffer_init();
-    wr->featureid = mlist_init();
+    wr->insert_results = alist_init();
     content = NULL;
 
@@ -854 +860 @@
         xmlFreeDoc(xmldoc);
         xmlCleanupParser();
-        wfs_error(o, wr, WFS_ERROR_NO_MATCHING, "xml isn't valid",
-                  "transaction");
+        wfs_error(o, wr, WFS_ERROR_NO_MATCHING, "xml isn't valid", "transaction");
     }
 
@@ -861 +866 @@
 
     /* jump to the next element if there are spaces */
-    while (n->type != XML_ELEMENT_NODE)
-        n = n->next;
+    while (n->type != XML_ELEMENT_NODE) n = n->next;
 
     n = n->children;
 
     /* jump to the next element if there are spaces */
-    while (n->type != XML_ELEMENT_NODE)
-        n = n->next;
+    while (n->type != XML_ELEMENT_NODE) n = n->next;
 
     /* initialize the transaction inside postgresql */
@@ -879 +882 @@
 
     /* go through the operations while transaction is successful */
-    for (; (n != NULL) && (buffer_cmp(result, "PGRES_COMMAND_OK"));
-            n = n->next) {
-        if (n->type != XML_ELEMENT_NODE)
-            continue;
+    for ( /* empty */ ; (n != NULL) && (buffer_cmp(result, "PGRES_COMMAND_OK")); n = n->next) {
+        if (n->type != XML_ELEMENT_NODE) continue;
 
         if (strcmp((char *) n->name, "Insert") == 0) {
@@ -915 +916 @@
                 buffer_add_str(locator, (char *) n->name);
         }
-
     }