Changeset 54 for trunk

Timestamp:

Dec 17, 2010, 11:39:39 AM (14 years ago)

Author:

nmarco

Message:

fixed the mimetype in the applyOne function (it was always text/plain both that for json that for gml) and added schema parameter in the response

File:

• trunk/zoo-services/ogr/base-vect-ops/service.c (modified) (5 diffs)

trunk/zoo-services/ogr/base-vect-ops/service.c

@@ -164 +164 @@
 
 
-  int applyOne(maps*& conf,maps*& inputs,maps*& outputs,OGRGeometryH (*myFunc)(OGRGeometryH)){
+  int applyOne(maps*& conf,maps*& inputs,maps*& outputs,OGRGeometryH (*myFunc)(OGRGeometryH),char* schema){
 #ifdef DEBUG
     fprintf(stderr,"\nService internal print\n");
@@ -218 +218 @@
         char *tmpS=OGR_G_ExportToGML(res);
         setMapInMaps(outputs,"Result","value",tmpS);
-        setMapInMaps(outputs,"Result","mimeType","text/plain");
+        setMapInMaps(outputs,"Result","mimeType","text/xml");
         setMapInMaps(outputs,"Result","encoding","UTF-8");
+        setMapInMaps(outputs,"Result","schema",schema);
         free(tmpS);
-
       }
     }else{
@@ -302 +302 @@
 #endif
   int Boundary(maps*& conf,maps*& inputs,maps*& outputs){
-    return applyOne(conf,inputs,outputs,&OGR_G_GetBoundary);
+    return applyOne(conf,inputs,outputs,&OGR_G_GetBoundary,"http://fooa/gml/3.1.0/polygon.xsd");
   }
 
@@ -309 +309 @@
 #endif
   int ConvexHull(maps*& conf,maps*& inputs,maps*& outputs){
-    return applyOne(conf,inputs,outputs,&OGR_G_ConvexHull);
+    return applyOne(conf,inputs,outputs,&OGR_G_ConvexHull,"http://fooa/gml/3.1.0/polygon.xsd");
   }
 
@@ -328 +328 @@
 #endif
   int Centroid(maps*& conf,maps*& inputs,maps*& outputs){
-    return applyOne(conf,inputs,outputs,&MY_OGR_G_Centroid);
+    return applyOne(conf,inputs,outputs,&MY_OGR_G_Centroid,"http://fooa/gml/3.1.0/point.xsd");
   }