Changeset 539 for trunk/zoo-project/zoo-kernel/service_internal.c

Timestamp:

Nov 17, 2014, 3:35:53 PM (9 years ago)

Author:

djay

Message:

Fix yaml service naming. Add javax javaxx optional sections in the main.cfg #105.

File:

• trunk/zoo-project/zoo-kernel/service_internal.c (modified) (4 diffs)

trunk/zoo-project/zoo-kernel/service_internal.c

@@ -1777 +1777 @@
     xmlNewNsProp(nc,ns,BAD_CAST "processVersion",BAD_CAST tmp2->value);
   
-  printDescription(nc,ns_ows,serv->name,serv->content);
+  map* tmpI=getMapFromMaps(m,"lenv","oIdentifier");
+  printDescription(nc,ns_ows,tmpI->value,serv->content);
 
   xmlAddChild(n,nc);
@@ -3361 +3362 @@
 
 void parseIdentifier(maps* conf,char* conf_dir,char *identifier,char* buffer){
+  setMapInMaps(conf,"lenv","oIdentifier",identifier);
+  char *lid=zStrdup(identifier);
   char *saveptr1;
-  char *tmps1=strtok_r(identifier,".",&saveptr1);
+  char *tmps1=strtok_r(lid,".",&saveptr1);
   int level=0;
   char key[25];
@@ -3420 +3423 @@
   sprintf(buffer,"%s.zcfg",tmp0);
   free(tmp0);
+  fprintf(stderr,"DEBUG %s\n",lid);
+  free(lid);
 }
 
@@ -3451 +3456 @@
     char size[1024];
     map* tmp=getMapFromMaps(outputs,parameterName,"value");
+    if(tmp==NULL){
+      setMapInMaps(outputs,parameterName,"value","");
+      tmp=getMapFromMaps(outputs,parameterName,"value");
+    }
     free(tmp->value);
     tmp->value=(char*) malloc((numberOfBytes+1)*sizeof(char));