service_internal_js.c

Timestamp:

Jun 29, 2016, 3:40:46 PM (8 years ago)

Author:

djay

Message:

Give the capability to store the main.cfg file in sysconfdir and the services in servicePath if defined in the [main] section.

File:

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

-                      r781
+                      r784
   JS_MaybeGC(cx);
-  char ntmp[1024];
-  getcwd(ntmp,1024);
   jsval *argv = JS_ARGV(cx,argv1);
   int i=0;
 …
   for(i=0;i<argc;i++){
     char *filename = JSValToChar(cx,&argv[i]);
-    char *api0=(char*)malloc((strlen(ntmp)+strlen(filename)+2)*sizeof(char));
-    sprintf(api0,"%s/%s",ntmp,filename);
 #ifdef JS_DEBUG
     fprintf(stderr,"Trying to load %s\n",api0);
     fflush(stderr);
 #endif
+    JSObject *api_script1=loadZooApiFile(cx,JS_GetGlobalObject(cx),api0);
+    free(api0);
+    JSObject *api_script1=loadZooApiFile(cx,JS_GetGlobalObject(cx),filename);
+  }
   JS_MaybeGC(cx);
 …
   map* tmpm1=getMap(request,"metapath");
   char ntmp[1024];
+  getcwd(ntmp,1024);
+  map* cwdMap=getMapFromMaps(*main_conf,"main","servicePath");
+  if(cwdMap!=NULL)
+    sprintf(ntmp,"%s",cwdMap->value);
+  else
+    getcwd(ntmp,1024);
   /**

Note: See TracChangeset for help on using the changeset viewer.