Changeset 376 for trunk

Timestamp:

Nov 3, 2012, 3:07:43 AM (12 years ago)

Author:

djay

Message:

Add _ method to the zoo Python module to enable translation from zoo-services textdomain. Add gettextPath in the main section of the main.cfg to set the directory to search for language files.

Location:

trunk/zoo-project/zoo-kernel

Files:

• service_internal.h (modified) (1 diff)
• service_internal_python.c (modified) (2 diffs)
• service_internal_python.h (modified) (1 diff)
• zoo_loader.c (modified) (6 diffs)
• zoo_service_loader.c (modified) (5 diffs)

trunk/zoo-project/zoo-kernel/service_internal.h

@@ -59 +59 @@
 #include <openssl/buffer.h>
 
-//#include "cgic.h"
+#include "cgic.h"
 #include "ulinet.h"
 

trunk/zoo-project/zoo-kernel/service_internal_python.c

@@ -28 +28 @@
 
 PyMethodDef zooMethods[] = {
+  {"_", PythonTranslate, METH_VARARGS, "Translate a string using the zoo-services textdomain."},
   {"update_status", PythonUpdateStatus, METH_VARARGS, "Update status percentage of a running process."},
   {NULL, NULL, 0, NULL} /* tempt not the blade, all fear the sentinel */
@@ -418 +419 @@
 
 PyObject*
+PythonTranslate(PyObject* self, PyObject* args)
+{
+  char *str;
+  if (!PyArg_ParseTuple(args, "s", &str)){
+#ifdef DEBUG
+    fprintf(stderr,"Incorrect arguments to update status function");
+#endif
+    return NULL;
+  }
+  return PyString_FromString(_ss(str));
+}
+
+PyObject*
 PythonUpdateStatus(PyObject* self, PyObject* args)
 {

trunk/zoo-project/zoo-kernel/service_internal_python.h

@@ -45 +45 @@
 int zoo_python_support(maps**,map*,service*,maps**,maps**);
 
+PyObject* PythonTranslate(PyObject*, PyObject*);
 PyObject* PythonUpdateStatus(PyObject*, PyObject*);
 

trunk/zoo-project/zoo-kernel/zoo_loader.c

@@ -78 +78 @@
   fprintf (stderr, "RequestMethod: (%s) %d %d\n", cgiRequestMethod,strncasecmp(cgiRequestMethod,"post",4),strncmp(cgiContentType,"text/xml",8)==0 || strncasecmp(cgiRequestMethod,"post",4)==0); 
   fprintf (stderr, "Request: %s\n", cgiQueryString);
+  fflush(stderr);
 #endif
 
@@ -85 +86 @@
   if(strncmp(cgiContentType,"text/xml",8)==0 || 
      strncasecmp(cgiRequestMethod,"post",4)==0){
-    //fprintf(stderr,"length %d\n",cgiContentLength);
     if(cgiContentLength==NULL){
        cgiContentLength=0;
@@ -104 +104 @@
          }
        }
-       if(res==NULL){
+       if(res==NULL && (strQuery==NULL || strlen(strQuery)==0)){
          return errorException(NULL,"ZOO-Kernel failed to process your request cause the request was emtpty.","InternalError");
-       }else
-         tmpMap=createMap("request",res);
+       }else{
+         if(strQuery==NULL || strlen(strQuery)==0)
+           tmpMap=createMap("request",res);
+       }
     }else{
       char *buffer=new char[cgiContentLength+1];
@@ -113 +115 @@
         buffer[cgiContentLength]=0;
         tmpMap=createMap("request",buffer);
-        //fprintf(stderr,"%s\n",tmpMap->value);
       }else{
         buffer[0]=0;
@@ -133 +134 @@
             free(tmp);
           }
-          
-          sprintf(tmpValueFinal,"%s=%s",*arrayStep,ivalue);
           free(tmpValueFinal);
 #ifdef DEBUG
@@ -321 +320 @@
   }
 
-
   if(strncasecmp(cgiContentType,"multipart/form-data",19)==0){
-      map* tmp=getMap(tmpMap,"dataInputs");
-      if(tmp!=NULL){
-        addToMap(tmpMap,"dataInputs",strstr(strQuery,"dataInputs=")+11);
-      }
-    }
+    map* tmp=getMap(tmpMap,"dataInputs");
+    if(tmp!=NULL){
+      addToMap(tmpMap,"dataInputs",strstr(strQuery,"dataInputs=")+11);
+    }
+  }
 
   runRequest(tmpMap);

trunk/zoo-project/zoo-kernel/zoo_service_loader.c

@@ -28 +28 @@
 extern "C" int crlex();
 
+#include "cgic.h"
+
 extern "C" {
 #include <libxml/tree.h>
@@ -36 +38 @@
 }
 
-#include "cgic.h"
 #include "ulinet.h"
 
@@ -108 +109 @@
 
 #define _(String) dgettext ("zoo-kernel",String)
+#define __(String) dgettext ("zoo-service",String)
 
 
@@ -541 +543 @@
 #endif
 
-  bindtextdomain ("zoo-kernel","/usr/share/locale/");
-  bindtextdomain ("zoo-services","/usr/share/locale/");
+  map *getPath=getMapFromMaps(m,"main","gettextPath");
+  if(getPath!=NULL){
+    bindtextdomain ("zoo-kernel",getPath->value);
+    bindtextdomain ("zoo-services",getPath->value);    
+  }else{
+    bindtextdomain ("zoo-kernel","/usr/share/locale/");
+    bindtextdomain ("zoo-services","/usr/share/locale/");
+  }
 
   /**
@@ -554 +562 @@
         fstde = freopen(fstdem->value, "a+", stderr) ;
 
-  if((r_inputs=getMap(request_inputs,"language"))!=NULL){
+  r_inputs=getMap(request_inputs,"language");
+  if(r_inputs==NULL)
+    r_inputs=getMapFromMaps(m,"main","language");
+  if(r_inputs!=NULL){
     char *tmp=strdup(r_inputs->value);
+    setMapInMaps(m,"main","language",tmp);
     translateChar(tmp,'-','_');
     setlocale (LC_ALL, tmp);
+#ifdef WIN32
+    char tmp1[12];
+    sprintf(tmp1,"LC_ALL=%s",tmp);
+    putenv(tmp1);
+#endif
     free(tmp);
-    setMapInMaps(m,"main","language",r_inputs->value);
   }
   else{
     setlocale (LC_ALL, "en_US");
+#ifdef WIN32
+    char tmp1[12];
+    sprintf(tmp1,"LC_ALL=en_US");
+    putenv(tmp1);
+#endif
     setMapInMaps(m,"main","language","en-US");
   }