Ignore:
Timestamp:
Jul 16, 2011, 12:58:47 PM (11 years ago)
Author:
djay
Message:

Merge branch-1.2 to current rev. 267. Tag release-1.2.0-rc2.

Location:
branches/branch-1.2
Files:
10 edited

Legend:

Unmodified
Added
Removed
  • branches/branch-1.2

  • branches/branch-1.2/zoo-kernel/main.cfg

    r5 r268  
    66tmpPath=/YourFullTmpPathHere/
    77tmpUrl = ../TmpPathRelativeToServerAdress/
     8dataPath = /YouFullDataPathHere/
    89
    910[identification]
     
    2021positionName=Developer
    2122role=Dev
    22 adressDeliveryPoint=1280, avenue des Platanes
     23addressDeliveryPoint=1280, avenue des Platanes
    2324addressCity=Lattes
    2425addressAdministrativeArea=False
  • branches/branch-1.2/zoo-kernel/main_conf_read.y

    r217 r268  
    4747/* le type des lval des jetons et des elements non terminaux bison */
    4848//======================================================
    49 %union
    50 {
    51    char * s;
    52 }
    53 %union { char* chaine; char* key;char* val;}
     49%union { char* s;char* chaine; char* key;char* val;}
    5450//======================================================
    5551
  • branches/branch-1.2/zoo-kernel/nmake.opt

    r217 r268  
    99CPP=cl /TP $(CFLAGS)
    1010
    11 CFLAGS=-DUSE_PYTHON /EHa /nologo /MT /W3 /EHsc /O2 /D_CRT_SECURE_NO_WARNINGS /DWIN32 $(CJFLAGS) -I./ -I..\thirds\dirent-win32 -I$(PYTHON_CPATH)\include -I$(GEODIR)/include -ILIBINTL_CPATH\include -I$(TPATH)\include -DLINUX_FREE_ISSUE #-DDEBUG #-DDEBUG_SERVICE_CONF
     11CFLAGS=-DUSE_PYTHON /EHa /nologo /MT /W3 /EHsc /O2 /D_CRT_SECURE_NO_WARNINGS /DWIN32 $(CJFLAGS) -I./ -I..\thirds\dirent-win32 -I..\thirds\include -I$(PYTHON_CPATH)\include -I$(GEODIR)/include -ILIBINTL_CPATH\include -I$(TPATH)\include -DLINUX_FREE_ISSUE #-DDEBUG #-DDEBUG_SERVICE_CONF
    1212
    13 LDFLAGS=$(GEODIR)/lib/libfcgi.lib $(GEODIR)/lib/libcurl_im
    14 p.lib  $(GEODIR)/apps/Python25/libs/python25.lib $(GEODIR)/lib/libxml2.lib ../thirds/cgic206/libcgic.lib $(GEODIR)/lib/gdal_i.lib $(TOOLS)\..\lib\libeay32.dll.a $(TOOLS)\..\lib\libcrypto.a $(TOOLS)\..\lib\libssl32.dll.a $(TOOLS)\..\lib\libintl.lib /machine:i386
     13LDFLAGS=$(GEODIR)/lib/libfcgi.lib $(GEODIR)/lib/libcurl_imp.lib  $(GEODIR)/apps/Python25/libs/python25.lib $(GEODIR)/lib/libxml2.lib ../thirds/cgic206/libcgic.lib $(GEODIR)/lib/gdal_i.lib $(TOOLS)\..\lib\libeay32.dll.a $(TOOLS)\..\lib\libcrypto.a $(TOOLS)\..\lib\libssl32.dll.a $(TOOLS)\..\lib\libintl.lib /machine:i386
  • branches/branch-1.2/zoo-kernel/service.h

    r217 r268  
    124124    map* tmp=t;
    125125    while(tmp!=NULL){
    126       fprintf(file,"%s = %s\n",t->name,t->value);
     126      fprintf(stderr,"%s = %s\n",tmp->name,tmp->value);
     127      fprintf(file,"%s = %s\n",tmp->name,tmp->value);
    127128      tmp=tmp->next;
    128129    }
     
    138139  }
    139140
    140   static void dumpMapsToFile(maps* m,FILE* file){
     141  static void dumpMapsToFile(maps* m,char* file_path){
     142    FILE* file=fopen(file_path,"w");
    141143    maps* tmp=m;
    142144    if(tmp!=NULL){
    143145      fprintf(file,"[%s]\n",tmp->name);
    144146      dumpMapToFile(tmp->content,file);
    145     }
     147      fflush(file);
     148    }
     149    fclose(file);
    146150  }
    147151
     
    549553        map* tmpV=getMap(res->content,"value");
    550554        free(tmpV->value);
    551         tmpV->value=(char*)malloc(atoi(tmp->value)*sizeof(char));
     555        tmpV->value=(char*)malloc((atoi(tmp->value)+1)*sizeof(char));
    552556        memmove(tmpV->value,tmpSized,atoi(tmp->value)*sizeof(char));
     557        tmpV->value[atoi(tmp->value)]=0;
    553558        free(tmpSized);
    554559      }
  • branches/branch-1.2/zoo-kernel/service_conf.l

    r217 r268  
    4141
    4242attname [a-zA-Z0-9_\-]+
    43 attvalue1       [\^\*\+,;@a-zA-Z0-9_\-::.:" "\"\'/\\\(\)\t\|]+
     43attvalue1       [\^\*\+,;@a-zA-Z0-9_\-::.:" "\"\'/\\\(\)\t\|\$\&>]+
    4444
    4545attvalue                \"[^"]*\"|\'[^']*\'\(\)
  • branches/branch-1.2/zoo-kernel/service_conf.y

    r217 r268  
    356356//======================================================
    357357EmptyElemTag
    358  : INFCAR ID Attributeetoile SLASH SUPCAR       {}
     358 : INFCAR ID Attributeetoile SLASH SUPCAR       {
     359   if(strncasecmp($2,"Default",7)==0){
     360     wait_defaults=false;
     361     current_data=previous_data;
     362     if(current_element->defaults==NULL){
     363       current_element->defaults=(iotype*)malloc(IOTYPE_SIZE);
     364       current_element->defaults->content=NULL;
     365     }
     366     addMapToMap(&current_element->defaults->content,current_content);
     367     freeMap(&current_content);
     368     free(current_content);
     369     current_element->defaults->next=NULL;
     370     wait_defaults=false;
     371     current_content=NULL;
     372     current_element->supported=NULL;
     373     current_element->next=NULL;
     374   }
     375 }
    359376 ;
    360377
  • branches/branch-1.2/zoo-kernel/service_internal.c

    r217 r268  
    173173}
    174174#else
     175
    175176void unhandleStatus(maps *conf){
    176177  int shmid,i;
     
    209210    if ((shmid = shmget(key, SHMSZ, IPC_CREAT | 0666)) < 0) {
    210211#ifdef DEBUG
    211       fprintf(stderr,"shmget failed to update value\n");
     212      fprintf(stderr,"shmget failed to create new Shared memory segment\n");
    212213#endif
    213214    }else{
     
    220221        tmpMap=getMapFromMaps(conf,"lenv","status");
    221222        s1=shm;
    222         for(s=tmpMap->value;s!=NULL;s++)
     223        for(s=tmpMap->value;*s!=NULL && *s!=0;s++){
    223224          *s1++=*s;
     225        }
     226        *s1=NULL;
    224227        shmdt((void *)shm);
    225228      }
     
    17221725      else
    17231726        sprintf(session_file_path,"%s/sess_%s.cfg",tmpPath->value,strstr(_tmp->value,"=")+1);
    1724       FILE* file=fopen(session_file_path,"w");
    1725       dumpMapsToFile(tmpSess,file);
    1726       fclose(file);
     1727      dumpMapsToFile(tmpSess,session_file_path);
    17271728    }
    17281729  }
  • branches/branch-1.2/zoo-kernel/service_internal.h

    r217 r268  
    5757#include <openssl/bio.h>
    5858#include <openssl/buffer.h>
     59
     60#include "cgic.h"
    5961
    6062extern   int getServiceFromFile(const char*,service**);
  • branches/branch-1.2/zoo-kernel/zoo_service_loader.c

    r217 r268  
    675675#endif
    676676        while ((dp = readdir(dirp)) != NULL)
    677           if(strcmp(dp->d_name,buff)==0){
     677          if((strcasecmp("all.zcfg",buff)==0 && strstr(dp->d_name,".zcfg")>0)
     678             || strcasecmp(dp->d_name,buff)==0){
    678679            memset(buff1,0,1024);
    679680            snprintf(buff1,1024,"%s/%s",conf_dir,dp->d_name);
     
    764765    return 0;
    765766  }
    766   //close(saved_stdout);
     767  close(saved_stdout);
    767768
    768769#ifdef DEBUG
     
    18121813    if(tmpPath==NULL)
    18131814      tmpPath=getMapFromMaps(m,"main","tmpPath");
    1814     sprintf(session_file_path,"%s/sess_%s.cfg",tmpPath->value,strstr(cgiCookie,"=")+1);
     1815    char *tmp1=strtok(cgiCookie,";");
     1816    if(tmp1!=NULL)
     1817      sprintf(session_file_path,"%s/sess_%s.cfg",tmpPath->value,strstr(tmp1,"=")+1);
     1818    else
     1819      sprintf(session_file_path,"%s/sess_%s.cfg",tmpPath->value,strstr(cgiCookie,"=")+1);
     1820
    18151821    maps *tmpSess=(maps*)calloc(1,MAPS_SIZE);
    18161822    struct stat file_status;
    18171823    int istat = stat(session_file_path, &file_status);
    1818     if(istat==0){
     1824    if(istat==0 && file_status.st_size>0){
    18191825      conf_read(session_file_path,tmpSess);
    18201826      dumpMaps(tmpSess);
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