Changeset 465 for trunk/zoo-project/zoo-kernel/zoo_service_loader.c

Timestamp:

Apr 23, 2014, 3:05:01 AM (10 years ago)

Author:

djay

Message:

Add the optional YAML ZCFG support #4 and the zcfg2yaml converter. Return error messages that enable the service provider to quickly identify the root cause of errors due to configuration file syntax #90. Fix logic in addMapToMap #91. Enable multiple range definition using default and supported blocks. Add the lastest revision number in version.h (available from Python ZOO-API as zoo.VERSION).

File:

• trunk/zoo-project/zoo-kernel/zoo_service_loader.c (modified) (12 diffs)

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

@@ -239 +239 @@
   map* r_inputs=NULL;
 #ifndef WIN32
-  char* pntmp=getcwd(ntmp,1024);
+  getcwd(ntmp,1024);
 #else
   _getcwd(ntmp,1024);
@@ -560 +560 @@
   char ntmp[1024];
 #ifndef WIN32
-  char *pntmp=getcwd(ntmp,1024);
+  getcwd(ntmp,1024);
 #else
   _getcwd(ntmp,1024);
@@ -760 +760 @@
     while ((dp = readdir(dirp)) != NULL)
       if(strstr(dp->d_name,".zcfg")!=0){
+        int t;
         memset(tmps1,0,1024);
         snprintf(tmps1,1024,"%s/%s",conf_dir,dp->d_name);
@@ -769 +770 @@
         fprintf(stderr,"#################\n%s\n#################\n",tmps1);
 #endif
-        t=getServiceFromFile(tmps1,&s1);
+        t=readServiceFile(m,tmps1,&s1,dp->d_name);
+        if(t<0){
+          dumpMaps(m);
+          map* tmp00=getMapFromMaps(m,"lenv","message");
+          char tmp01[1024];
+          sprintf(tmp01,_("Unable to parse the ZCFG file: %s (%s)"),dp->d_name,tmp00->value);
+          dup2(saved_stdout,fileno(stdout));
+          errorException(m, tmp01,"InternalError",NULL);
+          freeMaps(&m);
+          free(m);
+          return 1;
+        }
+
 #ifdef DEBUG
         dumpService(s1);
@@ -828 +841 @@
 
       r_inputs=getMap(request_inputs,"Identifier");
-      char *tmps=strtok(r_inputs->value,",");
+      
+      char *saveptr;
+      char *orig=zStrdup(r_inputs->value);
+      char *tmps=strtok_r(orig,",",&saveptr);
       
       char buff[256];
@@ -839 +855 @@
         memset(buff1,0,1024);
 #ifdef DEBUG
-        printf("\n#######%s\n########\n",buff1);
+        printf("\n#######%s\n########\n",buff);
 #endif
         while ((dp = readdir(dirp)) != NULL)
@@ -852 +868 @@
             }
 #ifdef DEBUG
-            printf("#################\n%s\n#################\n",buff1);
-#endif
-            t=getServiceFromFile(buff1,&s1);
+            printf("#################\n(%s) %s\n#################\n",r_inputs->value,buff1);
+#endif
+            char *tmp0=zStrdup(dp->d_name);
+            tmp0[strlen(tmp0)-5]=0;
+            t=readServiceFile(m,buff1,&s1,tmp0);
+            free(tmp0);
+            if(t<0){
+              map* tmp00=getMapFromMaps(m,"lenv","message");
+              char tmp01[1024];
+              if(tmp00!=NULL)
+                sprintf(tmp01,_("Unable to parse the ZCFG file: %s (%s)"),dp->d_name,tmp00->value);
+              else
+                sprintf(tmp01,_("Unable to parse the ZCFG file: %s."),dp->d_name);
+              dup2(saved_stdout,fileno(stdout));
+              errorException(m, tmp01,"InternalError",NULL);
+              freeMaps(&m);
+              free(m);
+              return 1;
+            }
 #ifdef DEBUG
             dumpService(s1);
@@ -861 +893 @@
             freeService(&s1);
             free(s1);
+            s1=NULL;
             scount++;
           }
         rewinddir(dirp);
-        tmps=strtok(NULL,",");
+        tmps=strtok_r(NULL,",",&saveptr);
       }
       closedir(dirp);
       fflush(stdout);
       dup2(saved_stdout,fileno(stdout));
+      free(orig);
       printDocument(m,doc,getpid());
       freeMaps(&m);
@@ -917 +951 @@
   int saved_stdout = dup(fileno(stdout));
   dup2(fileno(stderr),fileno(stdout));
-  t=getServiceFromFile(tmps1,&s1);
+  t=readServiceFile(m,tmps1,&s1,r_inputs->value);
   fflush(stdout);
   dup2(saved_stdout,fileno(stdout));
@@ -2181 +2215 @@
   addToMap(_tmpMaps->content,"sid",tmpBuff);
   addToMap(_tmpMaps->content,"status","0");
+  addToMap(_tmpMaps->content,"cwd",ntmp);
   addToMap(_tmpMaps->content,"message",_("No message provided"));
-  addToMap(_tmpMaps->content,"cwd",ntmp);
   map* ltmp=getMap(request_inputs,"soap");
   if(ltmp!=NULL)
@@ -2248 +2282 @@
   freeMaps(&_tmpMaps);
   free(_tmpMaps);
-
+  
 #ifdef DEBUG
   dumpMap(request_inputs);
@@ -2265 +2299 @@
   }
 #endif
-  int hrstd=-1;
   char *fbkp,*fbkp1;
   FILE *f0,*f1;