Changeset 312

Timestamp:

07/15/10 08:26:47 (8 weeks ago)

Author:

ol

Message:

Remove test on PK related to XSD schema on Describe Feature Type?. Add nillable parameter. Handle not null with a default value (a sequence for instance). Related to #50

Location:

trunk/src

Files:

• ows/ows_storage.c (modified) (1 diff)
• wfs/wfs_describe.c (modified) (4 diffs)

trunk/src/ows/ows_storage.c

@@ -161 +161 @@
     buffer_add_str(sql, "' AND c.relnamespace = n.oid ");
     buffer_add_str(sql, "AND a.attnum > 0 AND a.attrelid = c.oid ");
-    buffer_add_str(sql, "AND a.atttypid = t.oid AND a.attnotnull = 't'");
+    buffer_add_str(sql, "AND a.atttypid = t.oid AND a.attnotnull = 't' AND a.atthasdef='f'");
 
     res = PQexec(o->pg, sql->buf);

trunk/src/wfs/wfs_describe.c

@@ -36 +36 @@
                              buffer * layer_name)
 {
-    buffer *id_name;
     array *table;
     array_node *an;
@@ -55 +54 @@
     fprintf(o->output, "   <xs:sequence>\n");
 
-    id_name = ows_psql_id_column(o, layer_name);
     table = ows_psql_describe_table(o, layer_name);
 
@@ -62 +60 @@
     /* Output the description of the layer_name */
     for (an = table->first; an != NULL; an = an->next) {
-        if (!id_name || (id_name && !buffer_cmp(an->key, id_name->buf))) {
             fprintf(o->output, "    <xs:element name ='");
             buffer_flush(an->key, o->output);
@@ -68 +65 @@
 
             if (in_list(mandatory_prop, an->key))
-                fprintf(o->output, "minOccurs='1' ");
+                fprintf(o->output, "nillable='false' minOccurs='1' ");
             else
-                fprintf(o->output, "minOccurs='0' ");
+                fprintf(o->output, "nillable='true' minOccurs='0' ");
 
             fprintf(o->output, "maxOccurs='1'/>\n");
-        }
     }