Changeset 43

Timestamp:

Nov 16, 2010, 7:18:57 PM (14 years ago)

Author:

djay

Message:

Make the Grass support working for vector data taking care about the absence or presence of abstract parameter from the ZCFG file... Prepare the binary string support for Python language, in the aim to make Grass raster function working.

Location:

trunk/zoo-kernel

Files:

• service_internal.c (modified) (1 diff)
• service_internal_python.c (modified) (1 diff)
• ulinet.c (modified) (1 diff)

trunk/zoo-kernel/service_internal.c

@@ -1263 +1263 @@
   xmlAddChild(nc1,nc2);
   // Extract Abstract required to be second element in the ZCFG file !
-  tmp=tmp->next;
-  nc2=xmlNewNode(ns_ows, BAD_CAST tmp->name);
-  nc3=xmlNewText(BAD_CAST _ss(tmp->value));
-  xmlAddChild(nc2,nc3);  
-  xmlAddChild(nc1,nc2);
-  xmlAddChild(nc,nc1);
-  tmp=tmp->next;
+  // For GRASS it can be empty ...
+  if(tmp->next!=NULL){
+    tmp=tmp->next;
+    nc2=xmlNewNode(ns_ows, BAD_CAST tmp->name);
+    nc3=xmlNewText(BAD_CAST _ss(tmp->value));
+    xmlAddChild(nc2,nc3);  
+    xmlAddChild(nc1,nc2);
+    xmlAddChild(nc,nc1);
+    tmp=tmp->next;
+  }
 
   /**

trunk/zoo-kernel/service_internal_python.c

@@ -201 +201 @@
   map* tmp=t;
   while(tmp!=NULL){
-    if(PyDict_SetItem(res,PyString_FromString(tmp->name),PyString_FromString(tmp->value))<0){
-      fprintf(stderr,"Unable to parse params...");
-      exit(1);
-    }
+    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,"Unable to parse params...");
+          exit(1);
+        }
+      else
+        if(PyDict_SetItem(res,PyString_FromString(tmp->name),PyString_FromString(tmp->value))<0){
+          fprintf(stderr,"Unable to parse params...");
+          exit(1);
+        }
+    } 
+    else
+      if(PyDict_SetItem(res,PyString_FromString(tmp->name),PyString_FromString(tmp->value))<0){
+        fprintf(stderr,"Unable to parse params...");
+        exit(1);
+      }
     tmp=tmp->next;
   }

trunk/zoo-kernel/ulinet.c

@@ -235 +235 @@
     default:
       sprintf(filename,"/tmp/ZOO_Cache%d",(int)time(NULL));
-      printf("file=%s",filename);
-#ifdef MSG_LAF_VERBOSE
-      printf("file=%s",filename);
+      filename[24]=0;
+      fprintf(stderr,"file=%s",filename);
+#ifdef MSG_LAF_VERBOSE
+      fprintf(stderr,"file=%s",filename);
 #endif
       hInternet.filename=filename;