Changeset 476 for trunk/zoo-project/zoo-kernel

Timestamp:

May 27, 2014, 10:33:43 AM (11 years ago)

Author:

djay

Message:

Upgrade dirent-win32 to dirent API for Microsoft Visual Studio. Fix for second empty range node.

Location:

trunk/zoo-project/zoo-kernel

Files:

• makefile.vc (modified) (1 diff)
• service_conf.l (modified) (1 diff)
• service_conf.y (modified) (7 diffs)
• service_internal.c (modified) (2 diffs)
• service_internal.h (modified) (2 diffs)

trunk/zoo-project/zoo-kernel/makefile.vc

@@ -68 +68 @@
         $(CPP) /EHsc /c $(CFLAGS) zoo_loader.c
 
-dirent.obj:
-        $(CPP) /EHsc /c $(CFLAGS) ..\..\thirds\dirent-win32\dirent.c
+zoo_loader.cgi: version.h zoo_loader.obj zoo_service_loader.obj service_internal.obj $(PY_FILE) $(JAVA_FILE) $(MS_FILE) $(JS_FILE) $(RUBY_FILE) ulinet.obj lex.cr.obj lex.sr.obj service_conf.tab.obj main_conf_read.tab.obj
+        link zoo_loader.obj service_internal.obj $(PY_FILE) $(JAVA_FILE) $(MS_FILE) $(JS_FILE) $(RUBY_FILE) ulinet.obj main_conf_read.tab.obj lex.cr.obj service_conf.tab.obj lex.sr.obj  zoo_service_loader.obj /out:zoo_loader.cgi $(LDFLAGS) $(LDFLAGSCGI)
 
-zoo_loader.cgi: version.h zoo_loader.obj zoo_service_loader.obj service_internal.obj $(PY_FILE) $(JAVA_FILE) $(MS_FILE) $(JS_FILE) $(RUBY_FILE) ulinet.obj lex.cr.obj lex.sr.obj service_conf.tab.obj main_conf_read.tab.obj dirent.obj
-        link zoo_loader.obj dirent.obj service_internal.obj $(PY_FILE) $(JAVA_FILE) $(MS_FILE) $(JS_FILE) $(RUBY_FILE) ulinet.obj main_conf_read.tab.obj lex.cr.obj service_conf.tab.obj lex.sr.obj  zoo_service_loader.obj /out:zoo_loader.cgi $(LDFLAGS) $(LDFLAGSCGI)
-
-zcfg2yaml.exe: version.h zcfg2yaml.obj zoo_service_loader.obj service_internal.obj $(PY_FILE) $(JAVA_FILE) $(MS_FILE) $(JS_FILE) $(RUBY_FILE) ulinet.obj lex.cr.obj lex.sr.obj service_conf.tab.obj main_conf_read.tab.obj dirent.obj
-        link zcfg2yaml.obj dirent.obj service_internal.obj $(PY_FILE) $(JAVA_FILE) $(MS_FILE) $(JS_FILE) $(RUBY_FILE) ulinet.obj main_conf_read.tab.obj lex.cr.obj service_conf.tab.obj lex.sr.obj /out:zcfg2yaml.exe $(LDFLAGS) $(LDFLAGSCGI)
+zcfg2yaml.exe: version.h zcfg2yaml.obj zoo_service_loader.obj service_internal.obj $(PY_FILE) $(JAVA_FILE) $(MS_FILE) $(JS_FILE) $(RUBY_FILE) ulinet.obj lex.cr.obj lex.sr.obj service_conf.tab.obj main_conf_read.tab.obj
+        link zcfg2yaml.obj service_internal.obj $(PY_FILE) $(JAVA_FILE) $(MS_FILE) $(JS_FILE) $(RUBY_FILE) ulinet.obj main_conf_read.tab.obj lex.cr.obj service_conf.tab.obj lex.sr.obj /out:zcfg2yaml.exe $(LDFLAGS) $(LDFLAGSCGI)
 
 clean:

trunk/zoo-project/zoo-kernel/service_conf.l

@@ -118 +118 @@
 
 
-<INITIAL,DANSBALISE,HORSBALISE>.|\n     {lmsg=(char*)malloc(1024*sizeof(char));sprintf(lmsg,"error: line %d: character not allowed '%s'",srlineno,yytext);fprintf(stderr,"%s \n",lmsg);srlval.chaine=lmsg;return -1;}
+<INITIAL,DANSBALISE,HORSBALISE>.|\n     {lmsg=(char*)malloc(1024*sizeof(char));sprintf(lmsg,"error: line %d: character not allowed '%s'",srlineno,yytext);fprintf(stderr,"%s \n",lmsg);srlval.chaine=lmsg;fprintf(stderr,"%s \n",lmsg);return -1;}
 
 %%

trunk/zoo-project/zoo-kernel/service_conf.y

@@ -807 +807 @@
 
   int resultatYYParse = srparse() ;
-  
+  fprintf(stderr,"%s %d %d\n",__FILE__,__LINE__,resultatYYParse);
+
 #ifdef DEBUG_SERVICE_CONF
   fprintf(stderr,"RESULT: %d %d\n",resultatYYParse,wait_outputs);
@@ -825 +826 @@
       addToElements(&my_service->outputs,current_element);
     }
+  fprintf(stderr,"%s %d\n",__FILE__,__LINE__);
 #ifdef DEBUG_SERVICE_CONF
     fprintf(stderr,"(DATAOUTPUTS - %d) FREE current_element\n",__LINE__);
@@ -835 +837 @@
 #endif
   }
+  fprintf(stderr,"%s %d\n",__FILE__,__LINE__);
   if(current_element!=NULL){
     freeElements(&current_element);
@@ -840 +843 @@
     current_element=NULL;
   }
+  fprintf(stderr,"%s %d\n",__FILE__,__LINE__);
   if(current_content!=NULL){
     freeMap(&current_content);
@@ -845 +849 @@
     current_content=NULL;
   }
+  fprintf(stderr,"%s %d\n",__FILE__,__LINE__);
   fclose(srin);
 #ifdef DEBUG_SERVICE_CONF
@@ -850 +855 @@
 #endif
   if(wait_outputs<0 || my_service==NULL || my_service->name==NULL || my_service->content==NULL || my_service->outputs==NULL){
+    fprintf(stderr,"%s %d\n",__FILE__,__LINE__);
     setMapInMaps(conf,"lenv","message",srlval.chaine);
+    dumpMaps(conf);
 #ifndef WIN32
     srlex_destroy();
@@ -858 +865 @@
   else
     *service=my_service;
+  dumpService(my_service);
+  fprintf(stderr,"%s %d\n",__FILE__,__LINE__);
 
 #ifndef WIN32

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

@@ -68 +68 @@
 
 #include <windows.h>
+#include <fcgi_stdio.h>
 #include <stdio.h>
 #include <conio.h>
@@ -1154 +1155 @@
             xmlAddChild(nc6,nc8);
             _tmp0=e->supported;
-            tmp1=_tmp0->content;
-            goto doRange;
+            if(getMap(_tmp0->content,"range")!=NULL ||
+               getMap(_tmp0->content,"rangeMin")!=NULL ||
+               getMap(_tmp0->content,"rangeMax")!=NULL ||
+               getMap(_tmp0->content,"rangeClosure")!=NULL ){
+              tmp1=_tmp0->content;
+              goto doRange;
+            }
           }else{
             _tmp0=_tmp0->next;
             if(_tmp0!=NULL){
               xmlAddChild(nc6,nc8);
-              tmp1=_tmp0->content;
-              goto doRange;
+              if(getMap(_tmp0->content,"range")!=NULL ||
+                 getMap(_tmp0->content,"rangeMin")!=NULL ||
+                 getMap(_tmp0->content,"rangeMax")!=NULL ||
+                 getMap(_tmp0->content,"rangeClosure")!=NULL ){
+                tmp1=_tmp0->content;
+                goto doRange;
+              }
             }
           }

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

@@ -31 +31 @@
 #define TIME_SIZE 40
 
-#include "fcgi_stdio.h"
+#include "cgic.h"
 #include <libintl.h>
 #include <locale.h>
@@ -39 +39 @@
 #include <sys/stat.h>
 #include <sys/types.h>
-#include "cgic.h"
 #ifndef WIN32
 #include <sys/ipc.h>