Ignore:
Timestamp:
May 27, 2014, 10:33:43 AM (5 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:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/zoo-project/zoo-kernel/makefile.vc

    r467 r476  
    6868        $(CPP) /EHsc /c $(CFLAGS) zoo_loader.c
    6969
    70 dirent.obj:
    71         $(CPP) /EHsc /c $(CFLAGS) ..\..\thirds\dirent-win32\dirent.c
     70zoo_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
     71        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)
    7272
    73 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
    74         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)
    75 
    76 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
    77         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)
     73zcfg2yaml.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
     74        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)
    7875
    7976clean:
  • trunk/zoo-project/zoo-kernel/service_conf.l

    r465 r476  
    118118
    119119
    120 <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;}
     120<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;}
    121121
    122122%%
  • trunk/zoo-project/zoo-kernel/service_conf.y

    r469 r476  
    807807
    808808  int resultatYYParse = srparse() ;
    809  
     809  fprintf(stderr,"%s %d %d\n",__FILE__,__LINE__,resultatYYParse);
     810
    810811#ifdef DEBUG_SERVICE_CONF
    811812  fprintf(stderr,"RESULT: %d %d\n",resultatYYParse,wait_outputs);
     
    825826      addToElements(&my_service->outputs,current_element);
    826827    }
     828  fprintf(stderr,"%s %d\n",__FILE__,__LINE__);
    827829#ifdef DEBUG_SERVICE_CONF
    828830    fprintf(stderr,"(DATAOUTPUTS - %d) FREE current_element\n",__LINE__);
     
    835837#endif
    836838  }
     839  fprintf(stderr,"%s %d\n",__FILE__,__LINE__);
    837840  if(current_element!=NULL){
    838841    freeElements(&current_element);
     
    840843    current_element=NULL;
    841844  }
     845  fprintf(stderr,"%s %d\n",__FILE__,__LINE__);
    842846  if(current_content!=NULL){
    843847    freeMap(&current_content);
     
    845849    current_content=NULL;
    846850  }
     851  fprintf(stderr,"%s %d\n",__FILE__,__LINE__);
    847852  fclose(srin);
    848853#ifdef DEBUG_SERVICE_CONF
     
    850855#endif
    851856  if(wait_outputs<0 || my_service==NULL || my_service->name==NULL || my_service->content==NULL || my_service->outputs==NULL){
     857    fprintf(stderr,"%s %d\n",__FILE__,__LINE__);
    852858    setMapInMaps(conf,"lenv","message",srlval.chaine);
     859    dumpMaps(conf);
    853860#ifndef WIN32
    854861    srlex_destroy();
     
    858865  else
    859866    *service=my_service;
     867  dumpService(my_service);
     868  fprintf(stderr,"%s %d\n",__FILE__,__LINE__);
    860869
    861870#ifndef WIN32
  • trunk/zoo-project/zoo-kernel/service_internal.c

    r471 r476  
    6868
    6969#include <windows.h>
     70#include <fcgi_stdio.h>
    7071#include <stdio.h>
    7172#include <conio.h>
     
    11541155            xmlAddChild(nc6,nc8);
    11551156            _tmp0=e->supported;
    1156             tmp1=_tmp0->content;
    1157             goto doRange;
     1157            if(getMap(_tmp0->content,"range")!=NULL ||
     1158               getMap(_tmp0->content,"rangeMin")!=NULL ||
     1159               getMap(_tmp0->content,"rangeMax")!=NULL ||
     1160               getMap(_tmp0->content,"rangeClosure")!=NULL ){
     1161              tmp1=_tmp0->content;
     1162              goto doRange;
     1163            }
    11581164          }else{
    11591165            _tmp0=_tmp0->next;
    11601166            if(_tmp0!=NULL){
    11611167              xmlAddChild(nc6,nc8);
    1162               tmp1=_tmp0->content;
    1163               goto doRange;
     1168              if(getMap(_tmp0->content,"range")!=NULL ||
     1169                 getMap(_tmp0->content,"rangeMin")!=NULL ||
     1170                 getMap(_tmp0->content,"rangeMax")!=NULL ||
     1171                 getMap(_tmp0->content,"rangeClosure")!=NULL ){
     1172                tmp1=_tmp0->content;
     1173                goto doRange;
     1174              }
    11641175            }
    11651176          }
  • trunk/zoo-project/zoo-kernel/service_internal.h

    r471 r476  
    3131#define TIME_SIZE 40
    3232
    33 #include "fcgi_stdio.h"
     33#include "cgic.h"
    3434#include <libintl.h>
    3535#include <locale.h>
     
    3939#include <sys/stat.h>
    4040#include <sys/types.h>
    41 #include "cgic.h"
    4241#ifndef WIN32
    4342#include <sys/ipc.h>
Note: See TracChangeset for help on using the changeset viewer.

Search

Context Navigation

ZOO Sponsors

http://www.zoo-project.org/trac/chrome/site/img/geolabs-logo.pnghttp://www.zoo-project.org/trac/chrome/site/img/neogeo-logo.png http://www.zoo-project.org/trac/chrome/site/img/apptech-logo.png http://www.zoo-project.org/trac/chrome/site/img/3liz-logo.png http://www.zoo-project.org/trac/chrome/site/img/gateway-logo.png

Become a sponsor !

Knowledge partners

http://www.zoo-project.org/trac/chrome/site/img/ocu-logo.png http://www.zoo-project.org/trac/chrome/site/img/gucas-logo.png http://www.zoo-project.org/trac/chrome/site/img/polimi-logo.png http://www.zoo-project.org/trac/chrome/site/img/fem-logo.png http://www.zoo-project.org/trac/chrome/site/img/supsi-logo.png http://www.zoo-project.org/trac/chrome/site/img/cumtb-logo.png

Become a knowledge partner

Related links

http://zoo-project.org/img/ogclogo.png http://zoo-project.org/img/osgeologo.png