Changeset 69 for trunk

Timestamp:

Jan 13, 2011, 1:40:10 AM (14 years ago)

Author:

djay

Message:

Fix XML request parser for embedded XML complex data. Handle Execute requests coming from the QGIS WPS Client plugin. Fix for Python support.

Location:

trunk/zoo-kernel

Files:

• service_internal_python.c (modified) (2 diffs)
• zoo_loader.c (modified) (3 diffs)
• zoo_service_loader.c (modified) (2 diffs)

trunk/zoo-kernel/service_internal_python.c

@@ -2 +2 @@
  * Author : Gérald FENOY
  *
- * Copyright (c) 2009-2010 GeoLabs SARL
+ * Copyright (c) 2009-2011 GeoLabs SARL
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -337 +337 @@
         res=createMap(PyString_AsString(key),PyString_AsString(value));
     }
-    Py_DECREF(value);
     Py_DECREF(key);
   }

trunk/zoo-kernel/zoo_loader.c

@@ -2 +2 @@
  * Author : Gérald FENOY
  *
- *  Copyright 2008-2009 GeoLabs SARL. All rights reserved.
+ *  Copyright 2008-2011 GeoLabs SARL. All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -109 +109 @@
 
   map* tmpMap=NULL;
-    
+
   if(strncmp(cgiContentType,"text/xml",8)==0){
     char *buffer=new char[cgiContentLength+1];
@@ -144 +144 @@
   }
 
+  if(strncasecmp(cgiRequestMethod,"post",4)==0 && getMap(tmpMap,"request")==NULL){
+    char *tmpKey=strdup(tmpMap->name);
+    char *tmpValue=strdup(tmpMap->value);
+    freeMap(&tmpMap);
+    free(tmpMap);
+    char* tmpValueFinal=(char*) malloc((strlen(tmpKey)+strlen(tmpValue)+2)*sizeof(char));
+    sprintf(tmpValueFinal,"%s=%s",tmpKey,tmpValue);
+    tmpMap=createMap("request",tmpValueFinal);
+    free(tmpValueFinal);
+  }
   /**
    * In case that the POST method was used, then check if params came in XML

trunk/zoo-kernel/zoo_service_loader.c

@@ -2 +2 @@
  * Author : Gérald FENOY
  *
- *  Copyright 2008-2009 GeoLabs SARL. All rights reserved.
+ *  Copyright 2008-2011 GeoLabs SARL. All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -1343 +1343 @@
               }
               xmlChar* mv=xmlNodeListGetString(doc,cur4->xmlChildrenNode,1);
+              if(mv==NULL){
+                xmlDocPtr doc1=xmlNewDoc(BAD_CAST "1.0");
+                int buffersize;
+                xmlDocSetRootElement(doc1,cur4->xmlChildrenNode);
+                xmlDocDumpFormatMemoryEnc(doc1, &mv, &buffersize, "utf-8", 1);
+                char size[1024];
+                sprintf(size,"%d",buffersize);
+                addToMap(tmpmaps->content,"size",size);
+              }
               addToMap(tmpmaps->content,"value",(char*)mv);
               xmlFree(mv);