still related to MapServer#19 and ns_prefix removing

tsufiev · Nov 5, 2012 · d8dbe5b · d8dbe5b
1 parent 22c0907
commit d8dbe5b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/wfs/wfs_describe.c b/src/wfs/wfs_describe.c
@@ -165,7 +165,7 @@ void wfs_describe_feature_type(ows * o, wfs_request * wr)
   int wfs_version;
   list_node *elemt, *ln;
   list *ns_prefix, *typ;
-  buffer *namespace;
+  buffer *namespace, *typename;
 
   assert(o);
   assert(wr);
@@ -242,8 +242,10 @@ void wfs_describe_feature_type(ows * o, wfs_request * wr)
     /* Describe each feature type specified in the request */
     for (elemt = wr->typename->first ; elemt ; elemt = elemt->next) {
       fprintf(o->output, "<xs:element name='");
-      buffer_flush(elemt->value, o->output);
-      fprintf(o->output, "' type='%s:", ns_prefix->first->value->buf);
+      typename = ows_layer_no_prefix(o->layers, buffer_clone(elemt->value));
+      buffer_flush(typename, o->output);
+      buffer_free(typename);
+      fprintf(o->output, "' type='");
       buffer_flush(elemt->value, o->output);
       fprintf(o->output, "Type' substitutionGroup='gml:_Feature' />\n");
       wfs_complex_type(o, wr, elemt->value);

diff --git a/src/wfs/wfs_get_capabilities.c b/src/wfs/wfs_get_capabilities.c
@@ -268,8 +268,6 @@ static void wfs_feature_type_list(ows * o)
         for (s = 0; s < ln->layer->depth; s++) fprintf(o->output, " ");
 
         fprintf(o->output, " <Name>");
-        buffer_flush(ln->layer->ns_prefix, o->output);
-        fprintf(o->output, ":");
         buffer_flush(ln->layer->name, o->output);
         fprintf(o->output, "</Name>\n");
       }