Changeset 35 for trunk/zoo-services/ogr

Timestamp:

Oct 1, 2010, 2:52:10 PM (14 years ago)

Author:

djay

Message:

Correct use of translation function in ogr base-vect-ops Services Provider...

File:

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

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

@@ -91 +91 @@
     free(tmp);
     if(res==NULL){
-      setMapInMaps(conf,"lenv","message","Unable to call OGR_G_CreatFromGML");
+      setMapInMaps(conf,"lenv","message",_("Unable to call OGR_G_CreatFromGML"));
       return NULL;
     }
@@ -111 +111 @@
     map* tmp=getMapFromMaps(inputs,"InputPolygon","value");
     if(!tmp){
-      setMapInMaps(conf,"lenv","message","Unagle to parse the input geometry from InputPolygon");
+      setMapInMaps(conf,"lenv","message",_("Unable to parse the input geometry from InputPolygon"));
       return SERVICE_FAILED;
     }
@@ -123 +123 @@
     }
     else{
-      setMapInMaps(conf,"lenv","message","Unable to find any geometry for InputPolygon");
+      setMapInMaps(conf,"lenv","message",_("Unable to find any geometry for InputPolygon"));
       return SERVICE_FAILED;
     }
     if(geometry==NULL){
-      setMapInMaps(conf,"lenv","message","Unagle to parse the input geometry from InputPolygon");
+      setMapInMaps(conf,"lenv","message",_("Unable to parse the input geometry from InputPolygon"));
       return SERVICE_FAILED;
     }
@@ -178 +178 @@
 #endif
     map* tmp=getMapFromMaps(inputs,"InputPolygon","value");
-    if(!tmp)
-      return SERVICE_FAILED;
+    if(!tmp){
+      setMapInMaps(conf,"lenv","message",_("Unable to parse the input geometry from InputPolygon"));
+      return SERVICE_FAILED;
+    }
     fprintf(stderr,"Service internal print \n");
     dumpMaps(inputs);
@@ -196 +198 @@
     else
       geometry=createGeometryFromGML(conf,tmp->value);
-    if(geometry==NULL)
-      return SERVICE_FAILED;
+    if(geometry==NULL){
+      setMapInMaps(conf,"lenv","message",_("Unable to parse the input geometry from InputPolygon"));
+      return SERVICE_FAILED;
+    }
     res=(*myFunc)(geometry);
     fprintf(stderr,"Service internal print \n");
@@ -252 +256 @@
    map* tmp=getMapFromMaps(inputs,"InputPolygon","value");
    if(tmp==NULL){
-     setMapInMaps(conf,"lenv","message","Unable to fetch input geometry");
+     setMapInMaps(conf,"lenv","message",_("Unable to fetch input geometry"));
      return SERVICE_FAILED;
    }else
      if(strlen(tmp->value)<=0){
-       setMapInMaps(conf,"lenv","message","Unable to fetch input geometry");
+       setMapInMaps(conf,"lenv","message",_("Unable to fetch input geometry"));
        return SERVICE_FAILED;
      }
@@ -265 +269 @@
      geometry=createGeometryFromGML(conf,tmp->value);
    if(geometry==NULL){
-     setMapInMaps(conf,"lenv","message","Unable to parse input geometry");
+     setMapInMaps(conf,"lenv","message",_("Unable to parse input geometry"));
      return SERVICE_FAILED;
    }
@@ -287 +291 @@
      char *tmpS=OGR_G_ExportToGML(res);
      setMapInMaps(outputs,"Result","value",tmpS);
+     free(tmpS);
      setMapInMaps(outputs,"Result","mimeType","text/xml");
      setMapInMaps(outputs,"Result","encoding","UTF-8");
@@ -355 +360 @@
     }
     if(geometry1==NULL){
-      setMapInMaps(conf,"lenv","message","Unable to parse input geometry for InputEntity1.");
+      setMapInMaps(conf,"lenv","message",_("Unable to parse input geometry for InputEntity1."));
       fprintf(stderr,"SERVICE FAILED !\n");
       return SERVICE_FAILED;
@@ -385 +390 @@
     fprintf(stderr,"\nService internal print1 InputEntity2 Final\n");
     if(geometry2==NULL){
-      setMapInMaps(conf,"lenv","message","Unable to parse input geometry for InputEntity2.");
+      setMapInMaps(conf,"lenv","message",_("Unable to parse input geometry for InputEntity2."));
       fprintf(stderr,"SERVICE FAILED !\n");
       return SERVICE_FAILED;
@@ -461 +466 @@
     }
     if(geometry1==NULL){
-      setMapInMaps(conf,"lenv","message","Unable to parse input geometry for InputEntity1.");
+      setMapInMaps(conf,"lenv","message",_("Unable to parse input geometry for InputEntity1."));
       fprintf(stderr,"SERVICE FAILED !\n");
       return SERVICE_FAILED;
@@ -512 +517 @@
     map* tmp=getMapFromMaps(inputs,"InputPolygon","value");
     if(tmp==NULL){
-      setMapInMaps(conf,"lenv","message","Unable to parse input geometry from InputPolygon");
+      setMapInMaps(conf,"lenv","message",_("Unable to parse input geometry from InputPolygon"));
       return SERVICE_FAILED;
     }
@@ -518 +523 @@
     geometry=createGeometryFromGML(conf,tmp->value);
     if(geometry==NULL){
-      setMapInMaps(conf,"lenv","message","Unable to parse input geometry from InputPolygon");
+      setMapInMaps(conf,"lenv","message",_("Unable to parse input geometry from InputPolygon"));
       return SERVICE_FAILED;
     }