Changeset 268 for branches/branch-1.2/zoo-kernel

Timestamp:

Jul 16, 2011, 12:58:47 PM (13 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:

• . (modified) (1 prop)
• zoo-kernel/main.cfg (modified) (2 diffs)
• zoo-kernel/main_conf_read.y (modified) (1 diff)
• zoo-kernel/nmake.opt (modified) (1 diff)
• zoo-kernel/service.h (modified) (3 diffs)
• zoo-kernel/service_conf.l (modified) (1 diff)
• zoo-kernel/service_conf.y (modified) (1 diff)
• zoo-kernel/service_internal.c (modified) (4 diffs)
• zoo-kernel/service_internal.h (modified) (1 diff)
• zoo-kernel/zoo_service_loader.c (modified) (3 diffs)

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

@@ -6 +6 @@
 tmpPath=/YourFullTmpPathHere/
 tmpUrl = ../TmpPathRelativeToServerAdress/
+dataPath = /YouFullDataPathHere/
 
 [identification]
@@ -20 +21 @@
 positionName=Developer
 role=Dev
-adressDeliveryPoint=1280, avenue des Platanes
+addressDeliveryPoint=1280, avenue des Platanes
 addressCity=Lattes
 addressAdministrativeArea=False

branches/branch-1.2/zoo-kernel/main_conf_read.y

@@ -47 +47 @@
 /* le type des lval des jetons et des elements non terminaux bison */
 //======================================================
-%union 
-{
-   char * s;
-}
-%union { char* chaine; char* key;char* val;}
+%union { char* s;char* chaine; char* key;char* val;}
 //======================================================
 

branches/branch-1.2/zoo-kernel/nmake.opt

@@ -9 +9 @@
 CPP=cl /TP $(CFLAGS)
 
-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
+CFLAGS=-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
 
-LDFLAGS=$(GEODIR)/lib/libfcgi.lib $(GEODIR)/lib/libcurl_im
-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 
+LDFLAGS=$(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

@@ -124 +124 @@
     map* tmp=t;
     while(tmp!=NULL){
-      fprintf(file,"%s = %s\n",t->name,t->value);
+      fprintf(stderr,"%s = %s\n",tmp->name,tmp->value);
+      fprintf(file,"%s = %s\n",tmp->name,tmp->value);
       tmp=tmp->next;
     }
@@ -138 +139 @@
   }
 
-  static void dumpMapsToFile(maps* m,FILE* file){
+  static void dumpMapsToFile(maps* m,char* file_path){
+    FILE* file=fopen(file_path,"w");
     maps* tmp=m;
     if(tmp!=NULL){
       fprintf(file,"[%s]\n",tmp->name);
       dumpMapToFile(tmp->content,file);
-    }
+      fflush(file);
+    }
+    fclose(file);
   }
 
@@ -549 +553 @@
         map* tmpV=getMap(res->content,"value");
         free(tmpV->value);
-        tmpV->value=(char*)malloc(atoi(tmp->value)*sizeof(char));
+        tmpV->value=(char*)malloc((atoi(tmp->value)+1)*sizeof(char));
         memmove(tmpV->value,tmpSized,atoi(tmp->value)*sizeof(char));
+        tmpV->value[atoi(tmp->value)]=0;
         free(tmpSized);
       }

branches/branch-1.2/zoo-kernel/service_conf.l

@@ -41 +41 @@
 
 attname [a-zA-Z0-9_\-]+
-attvalue1       [\^\*\+,;@a-zA-Z0-9_\-::.:" "\"\'/\\\(\)\t\|]+
+attvalue1       [\^\*\+,;@a-zA-Z0-9_\-::.:" "\"\'/\\\(\)\t\|\$\&>]+
 
 attvalue                \"[^"]*\"|\'[^']*\'\(\)

branches/branch-1.2/zoo-kernel/service_conf.y

@@ -356 +356 @@
 //======================================================
 EmptyElemTag
- : INFCAR ID Attributeetoile SLASH SUPCAR       {}
+ : INFCAR ID Attributeetoile SLASH SUPCAR       {
+   if(strncasecmp($2,"Default",7)==0){
+     wait_defaults=false;
+     current_data=previous_data;
+     if(current_element->defaults==NULL){
+       current_element->defaults=(iotype*)malloc(IOTYPE_SIZE);
+       current_element->defaults->content=NULL;
+     }
+     addMapToMap(&current_element->defaults->content,current_content);
+     freeMap(&current_content);
+     free(current_content);
+     current_element->defaults->next=NULL;
+     wait_defaults=false;
+     current_content=NULL;
+     current_element->supported=NULL;
+     current_element->next=NULL;
+   }
+ }
  ;
 

branches/branch-1.2/zoo-kernel/service_internal.c

@@ -173 +173 @@
 }
 #else
+
 void unhandleStatus(maps *conf){
   int shmid,i;
@@ -209 +210 @@
     if ((shmid = shmget(key, SHMSZ, IPC_CREAT | 0666)) < 0) {
 #ifdef DEBUG
-      fprintf(stderr,"shmget failed to update value\n");
+      fprintf(stderr,"shmget failed to create new Shared memory segment\n");
 #endif
     }else{
@@ -220 +221 @@
         tmpMap=getMapFromMaps(conf,"lenv","status");
         s1=shm;
-        for(s=tmpMap->value;s!=NULL;s++)
+        for(s=tmpMap->value;*s!=NULL && *s!=0;s++){
           *s1++=*s;
+        }
+        *s1=NULL;
         shmdt((void *)shm);
       }
@@ -1722 +1725 @@
       else
         sprintf(session_file_path,"%s/sess_%s.cfg",tmpPath->value,strstr(_tmp->value,"=")+1);
-      FILE* file=fopen(session_file_path,"w");
-      dumpMapsToFile(tmpSess,file);
-      fclose(file);
+      dumpMapsToFile(tmpSess,session_file_path);
     }
   }

branches/branch-1.2/zoo-kernel/service_internal.h

@@ -57 +57 @@
 #include <openssl/bio.h>
 #include <openssl/buffer.h>
+
+#include "cgic.h"
 
 extern   int getServiceFromFile(const char*,service**);

branches/branch-1.2/zoo-kernel/zoo_service_loader.c

@@ -675 +675 @@
 #endif
         while ((dp = readdir(dirp)) != NULL)
-          if(strcmp(dp->d_name,buff)==0){
+          if((strcasecmp("all.zcfg",buff)==0 && strstr(dp->d_name,".zcfg")>0)
+             || strcasecmp(dp->d_name,buff)==0){
             memset(buff1,0,1024);
             snprintf(buff1,1024,"%s/%s",conf_dir,dp->d_name);
@@ -764 +765 @@
     return 0;
   }
-  //close(saved_stdout);
+  close(saved_stdout);
 
 #ifdef DEBUG
@@ -1812 +1813 @@
     if(tmpPath==NULL)
       tmpPath=getMapFromMaps(m,"main","tmpPath");
-    sprintf(session_file_path,"%s/sess_%s.cfg",tmpPath->value,strstr(cgiCookie,"=")+1);
+    char *tmp1=strtok(cgiCookie,";");
+    if(tmp1!=NULL)
+      sprintf(session_file_path,"%s/sess_%s.cfg",tmpPath->value,strstr(tmp1,"=")+1);
+    else
+      sprintf(session_file_path,"%s/sess_%s.cfg",tmpPath->value,strstr(cgiCookie,"=")+1);
+
     maps *tmpSess=(maps*)calloc(1,MAPS_SIZE);
     struct stat file_status;
     int istat = stat(session_file_path, &file_status);
-    if(istat==0){
+    if(istat==0 && file_status.st_size>0){
       conf_read(session_file_path,tmpSess);
       dumpMaps(tmpSess);