Changeset 100 for trunk

Timestamp:

Jan 30, 2011, 11:58:32 PM (14 years ago)

Author:

djay

Message:

Detect the size of outputed binary string for the value key then add the size in the correspoding output maps. Solve raster storage on server side when returned from Python Services.

Location:

trunk/zoo-kernel

Files:

• service_conf.l (modified) (1 diff)
• service_internal_python.c (modified) (3 diffs)

trunk/zoo-kernel/service_conf.l

@@ -41 +41 @@
 
 attname [a-zA-Z0-9_\-]+
-attvalue1       [\*\+,;@a-zA-Z0-9_\-::.:" "\"\'/\\\(\)]+
+attvalue1       [\^\*\+,;@a-zA-Z0-9_\-::.:" "\"\'/\\\(\)]+
 
 attvalue                \"[^"]*\"|\'[^']*\'\(\)

trunk/zoo-kernel/service_internal_python.c

@@ -305 +305 @@
   for(i=0;i<nb;i++){
     PyObject* key=PyList_GetItem(list,i);
-    if(strcmp(PyString_AsString(key),"size")==0){
-      PyObject* value=PyDict_GetItem((PyObject*)t,key);
-      sizeValue=atoi(PyString_AsString(value));
-      Py_DECREF(value);
-      Py_DECREF(key);    
-      break;
-    }
-    Py_DECREF(key);    
-  }
-  for(i=0;i<nb;i++){
-    PyObject* key=PyList_GetItem(list,i);
     PyObject* value=PyDict_GetItem((PyObject*)t,key);
 #ifdef DEBUG
@@ -321 +310 @@
             PyString_AsString(key),PyString_AsString(value));
 #endif
-    if(sizeValue>=0 && strcmp(PyString_AsString(key),"value")==0){
-      char *buffer=NULL;//(char*)malloc((sizeValue+1)*sizeof(char));
+    if(strcmp(PyString_AsString(key),"value")==0){
+      char *buffer=NULL;
       Py_ssize_t size;
       PyString_AsStringAndSize(value,&buffer,&size);
+      fprintf(stderr,"SIZE %d\n",size);
       if(res!=NULL){
         addToMap(res,PyString_AsString(key),"");
@@ -332 +322 @@
       map* tmpR=getMap(res,"value");
       free(tmpR->value);
-      tmpR->value=(char*)malloc((sizeValue+1)*sizeof(char));
-      memmove(tmpR->value,buffer,sizeValue*sizeof(char));
-      tmpR->value[sizeValue]=0;
+      tmpR->value=(char*)malloc((size+1)*sizeof(char));
+      memmove(tmpR->value,buffer,size*sizeof(char));
+      tmpR->value[size]=0;
+      char sin[1024];
+      sprintf(sin,"%d",size);
+      addToMap(res,"size",sin);
     }else{
       if(res!=NULL)