Changeset 36 for trunk

Timestamp:

Oct 2, 2010, 1:16:14 AM (14 years ago)

Author:

djay

Message:

Better using the _ss function from service code for translation ...

File:

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

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

@@ -23 +23 @@
  */
 
-#include <libintl.h>
-#include <locale.h>
-#define _(String) dgettext ("zoo-services",String)
-
 #include "cpl_conv.h"
 #include "ogr_api.h"
@@ -32 +28 @@
 #include "geos_c.h"
 #include "service.h"
-
+#include "service_internal.h"
 
 extern "C" {
@@ -91 +87 @@
     free(tmp);
     if(res==NULL){
-      setMapInMaps(conf,"lenv","message",_("Unable to call OGR_G_CreatFromGML"));
+      setMapInMaps(conf,"lenv","message",_ss("Unable to call OGR_G_CreatFromGML"));
       return NULL;
     }
@@ -111 +107 @@
     map* tmp=getMapFromMaps(inputs,"InputPolygon","value");
     if(!tmp){
-      setMapInMaps(conf,"lenv","message",_("Unable to parse the input geometry from InputPolygon"));
+      setMapInMaps(conf,"lenv","message",_ss("Unable to parse the input geometry from InputPolygon"));
       return SERVICE_FAILED;
     }
@@ -123 +119 @@
     }
     else{
-      setMapInMaps(conf,"lenv","message",_("Unable to find any geometry for InputPolygon"));
+      setMapInMaps(conf,"lenv","message",_ss("Unable to find any geometry for InputPolygon"));
       return SERVICE_FAILED;
     }
     if(geometry==NULL){
-      setMapInMaps(conf,"lenv","message",_("Unable to parse the input geometry from InputPolygon"));
+      setMapInMaps(conf,"lenv","message",_ss("Unable to parse the input geometry from InputPolygon"));
       return SERVICE_FAILED;
     }
@@ -179 +175 @@
     map* tmp=getMapFromMaps(inputs,"InputPolygon","value");
     if(!tmp){
-      setMapInMaps(conf,"lenv","message",_("Unable to parse the input geometry from InputPolygon"));
+      setMapInMaps(conf,"lenv","message",_ss("Unable to parse the input geometry from InputPolygon"));
       return SERVICE_FAILED;
     }
@@ -199 +195 @@
       geometry=createGeometryFromGML(conf,tmp->value);
     if(geometry==NULL){
-      setMapInMaps(conf,"lenv","message",_("Unable to parse the input geometry from InputPolygon"));
+      setMapInMaps(conf,"lenv","message",_ss("Unable to parse the input geometry from InputPolygon"));
       return SERVICE_FAILED;
     }
@@ -256 +252 @@
    map* tmp=getMapFromMaps(inputs,"InputPolygon","value");
    if(tmp==NULL){
-     setMapInMaps(conf,"lenv","message",_("Unable to fetch input geometry"));
+     setMapInMaps(conf,"lenv","message",_ss("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",_ss("Unable to fetch input geometry"));
        return SERVICE_FAILED;
      }
@@ -269 +265 @@
      geometry=createGeometryFromGML(conf,tmp->value);
    if(geometry==NULL){
-     setMapInMaps(conf,"lenv","message",_("Unable to parse input geometry"));
+     setMapInMaps(conf,"lenv","message",_ss("Unable to parse input geometry"));
      return SERVICE_FAILED;
    }
@@ -360 +356 @@
     }
     if(geometry1==NULL){
-      setMapInMaps(conf,"lenv","message",_("Unable to parse input geometry for InputEntity1."));
+      setMapInMaps(conf,"lenv","message",_ss("Unable to parse input geometry for InputEntity1."));
       fprintf(stderr,"SERVICE FAILED !\n");
       return SERVICE_FAILED;
@@ -390 +386 @@
     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",_ss("Unable to parse input geometry for InputEntity2."));
       fprintf(stderr,"SERVICE FAILED !\n");
       return SERVICE_FAILED;
@@ -466 +462 @@
     }
     if(geometry1==NULL){
-      setMapInMaps(conf,"lenv","message",_("Unable to parse input geometry for InputEntity1."));
+      setMapInMaps(conf,"lenv","message",_ss("Unable to parse input geometry for InputEntity1."));
       fprintf(stderr,"SERVICE FAILED !\n");
       return SERVICE_FAILED;
@@ -489 +485 @@
     }
     if(geometry2==NULL){
-      setMapInMaps(conf,"lenv","message",_("Unable to parse input geometry for InputEntity2."));
+      setMapInMaps(conf,"lenv","message",_ss("Unable to parse input geometry for InputEntity2."));
       fprintf(stderr,"SERVICE FAILED !\n");
       return SERVICE_FAILED;
@@ -517 +513 @@
     map* tmp=getMapFromMaps(inputs,"InputPolygon","value");
     if(tmp==NULL){
-      setMapInMaps(conf,"lenv","message",_("Unable to parse input geometry from InputPolygon"));
+      setMapInMaps(conf,"lenv","message",_ss("Unable to parse input geometry from InputPolygon"));
       return SERVICE_FAILED;
     }
@@ -523 +519 @@
     geometry=createGeometryFromGML(conf,tmp->value);
     if(geometry==NULL){
-      setMapInMaps(conf,"lenv","message",_("Unable to parse input geometry from InputPolygon"));
+      setMapInMaps(conf,"lenv","message",_ss("Unable to parse input geometry from InputPolygon"));
       return SERVICE_FAILED;
     }