Changeset 539 for trunk/zoo-project/zoo-kernel/zoo_service_loader.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/zoo_service_loader.c (modified) (3 diffs)

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

@@ -256 +256 @@
         fprintf(stderr,"#################\n%s\n#################\n",tmps1);
 #endif
-        t=readServiceFile(m,tmps1,&s1,dp->d_name);
-
+        char *tmpsn=zStrdup(dp->d_name);
+        tmpsn[strlen(tmpsn)-5]=0;
+        t=readServiceFile(m,tmps1,&s1,tmpsn);
+        free(tmpsn);
         if(t<0){
           map* tmp00=getMapFromMaps(m,"lenv","message");
@@ -994 +996 @@
             if(tmpMap!=NULL)
               addToMap(request_inputs,"metapath",tmpMap->value);
+            map* tmpMapI=getMapFromMaps(m,"lenv","Identifier");
 
             s1=(service*)malloc(SERVICE_SIZE);
-            t=readServiceFile(m,buff1,&s1,corig);
+            t=readServiceFile(m,buff1,&s1,tmpMapI->value);
             if(t<0){
               map* tmp00=getMapFromMaps(m,"lenv","message");
@@ -1165 +1168 @@
       addToMap(request_inputs,"metapath",tmpMap->value);
     free(identifier);
-  }else
+  }else{
     setMapInMaps(m,"lenv","Identifier",r_inputs->value);
+    setMapInMaps(m,"lenv","oIdentifier",r_inputs->value);
+  }
+
+  r_inputs=getMapFromMaps(m,"lenv","Identifier");
   int saved_stdout = dup(fileno(stdout));
   dup2(fileno(stderr),fileno(stdout));