Changeset 376 for trunk/zoo-project/zoo-kernel/zoo_loader.c

Timestamp:

Nov 3, 2012, 3:07:43 AM (11 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.

File:

• trunk/zoo-project/zoo-kernel/zoo_loader.c (modified) (6 diffs)

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);