Changes between Version 52 and Version 53 of ZooWorkshop/FOSS4GJapan/CreatingOGRBasedWebServices

Timestamp:

Oct 16, 2010, 2:34:54 PM (14 years ago)

Author:

djay

Comment:

--

ZooWorkshop/FOSS4GJapan/CreatingOGRBasedWebServices

@@ -623 +623 @@
   OGRGeometryH geometry,res;
   map* tmp=getMapFromMaps(inputs,"InputPolygon","value");
-  if(tmp==NULL)
+  if(tmp==NULL){
+    setMapInMaps(conf,"lenv","message","Unable to fetch InputPolygon value.");
     return SERVICE_FAILED;
+  }
   map* tmp1=getMapFromMaps(inputs,"InputPolygon","mimeType");
   if(strncmp(tmp1->value,"application/json",16)==0)
@@ -630 +632 @@
   else
     geometry=createGeometryFromWFS(conf,tmp->value);
+  if(geometry==NULL){
+    setMapInMaps(conf,"lenv","message","Unable to parse InputPolygon value.");
+    return SERVICE_FAILED;
+  }
   res=OGR_G_ConvexHull(geometry);
   tmp1=getMapFromMaps(outputs,"Result","mimeType");
@@ -656 +662 @@
   OGRGeometryH geometry,res;
   map* tmp=getMapFromMaps(inputs,"InputPolygon","value");
-  if(tmp==NULL)
+  if(tmp==NULL){
+    setMapInMaps(conf,"lenv","message","Unable to fetch InputPolygon value.");
     return SERVICE_FAILED;
+  }
   map* tmp1=getMapFromMaps(inputs,"InputPolygon","mimeType");
   if(strncmp(tmp1->value,"application/json",16)==0)
@@ -663 +671 @@
   else
     geometry=createGeometryFromWFS(conf,tmp->value);
+  if(geometry==NULL){
+    setMapInMaps(conf,"lenv","message","Unable to parse InputPolygon value.");
+    return SERVICE_FAILED;
+  }
   res=(*myFunc)(geometry);
   tmp1=getMapFromMaps(outputs,"Result","mimeType");
   if(strncmp(tmp1->value,"application/json",16)==0){
-    addToMap(outputs->content,"value",OGR_G_ExportToJson(res));
-    addToMap(outputs->content,"mimeType","text/plain");
+    char *tmp=OGR_G_ExportToJson(res);
+    setMapInMaps(outputs,"Result","value",tmp);
+    setMapInMaps(outputs,"Result","mimeType","text/plain");
+    free(tmp);
   }
   else{
-    addToMap(outputs->content,"value",OGR_G_ExportToGML(res));
+    char *tmp=OGR_G_ExportToGML(res);
+    setMapInMaps(outputs,"Result","value",tmp);
+    free(tmp);
   }
   outputs->next=NULL;