Changeset 58 for trunk

Timestamp:

Jan 6, 2011, 11:19:42 AM (14 years ago)

Author:

djay

Message:

Add binary files support for DataInputs?. Managing this binary format for the Python language, this should resolve the GRASS support in case of binary DataInputs?.

Location:

trunk/zoo-kernel

Files:

• service_conf.y (modified) (1 diff)
• service_internal.c (modified) (2 diffs)
• service_internal_python.c (modified) (2 diffs)
• zoo_service_loader.c (modified) (1 diff)

trunk/zoo-kernel/service_conf.y

@@ -297 +297 @@
               if(wait_defaults==true){
                 defaultsc++;
-                /*freeMap(&current_content);
-                  current_content=NULL;*/
               }
               current_data=5;

trunk/zoo-kernel/service_internal.c

@@ -406 +406 @@
                 int j;
                 for(j=0;j<2;j++)
-                  if(strlen(tmp2->name)==strlen(tmpPhone[j]) && strncasecmp(tmp2->name,tmpPhone[j],strlen(tmp2->name))==0){
+                  if(strcasecmp(tmp2->name,tmpPhone[j])==0){
                     char *toto=NULL;
                     char *toto1=tmp2->name;
@@ -419 +419 @@
                   int j;
                   for(j=0;j<6;j++)
-                    if(strlen(tmp2->name)==strlen(tmpAddress[j]) && strncasecmp(tmp2->name,tmpAddress[j],strlen(tmp2->name))==0){
+                    if(strcasecmp(tmp2->name,tmpAddress[j])==0){
                       char *toto=NULL;
                       char *toto1=tmp2->name;

trunk/zoo-kernel/service_internal_python.c

@@ -201 +201 @@
   PyObject* res=PyDict_New( );
   map* tmp=t;
+  map* size=getMap(tmp,"size");
+  dumpMap(t);
   while(tmp!=NULL){
-    /*if(strcasecmp(tmp->name,"value")==0){
-      map* ttmp=getMap(t,"size");
-      if(ttmp!=NULL)
-        if(PyDict_SetItem(res,PyString_FromString(tmp->name),PyString_FromStringAndSize(tmp->value,(Py_ssize_t) atoi(ttmp->value)))<0){
+    fprintf(stderr,"%s => %s\n"),tmp->name,tmp->value;
+    if(strcasecmp(tmp->name,"value")==0){
+      if(size!=NULL){
+        if(PyDict_SetItem(res,PyString_FromString(tmp->name),PyString_FromStringAndSize(tmp->value,(Py_ssize_t) atoi(size->value)))<0){
           fprintf(stderr,"Unable to parse params...");
           exit(1);
         }
+      }
       else
         if(PyDict_SetItem(res,PyString_FromString(tmp->name),PyString_FromString(tmp->value))<0){
@@ -215 +218 @@
         }
     } 
-    else*/
+    else
       if(PyDict_SetItem(res,PyString_FromString(tmp->name),PyString_FromString(tmp->value))<0){
         fprintf(stderr,"Unable to parse params...");

trunk/zoo-kernel/zoo_service_loader.c

@@ -953 +953 @@
                 InternetReadFile(res, (LPVOID)tmpContent,res.nDataLen, &dwRead);
                 map* tmpMap=getMap(tmpmaps->content,"value");
-                if(tmpMap!=NULL)
-                  tmpMap->value=strdup(tmpContent);
+                if(tmpMap!=NULL){
+                  tmpMap->value=(char*)malloc((res.nDataLen+1)*sizeof(char));
+                  memmove(tmpMap->value,tmpContent,(res.nDataLen)*sizeof(char));
+                  tmpMap->value[res.nDataLen]=0;
+                  fprintf(stderr,"%d = %d ?\n",res.nDataLen/sizeof(char),strlen(tmpContent));
+                  if(strlen(tmpContent)!=res.nDataLen/sizeof(char)){
+                    char tmp[256];
+                    sprintf(tmp,"%d",res.nDataLen);
+                    addToMap(tmpmaps->content,"size",tmp);
+                  }
+                  /*FILE* fd=fopen("/tmp/test.png","w");
+                  fwrite(tmpContent,1,(res.nDataLen)*sizeof(char),fd);
+                  fclose(fd);
+                  dumpMap(tmpMap);*/
+                }
                 free(tmpContent);
               }