Changeset 378 for trunk/zoo-project

Timestamp:

Nov 4, 2012, 3:43:29 PM (12 years ago)

Author:

djay

Message:

Directly use tmpUrl if it starts with "​http://". Fix cache system. Add support for "%" in main.cfg to let user define printf format for instance.

Location:

trunk/zoo-project/zoo-kernel

Files:

• main_conf_read.l (modified) (1 diff)
• service_internal.c (modified) (3 diffs)

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

@@ -31 +31 @@
 attname [a-zA-Z0-9_\-:]+
 
-attvalue1       [\*,;@a-zA-Z0-9_\-.:" "\"\'/\\\(\)\+\x41-\xff]+
+attvalue1       [%\*,;@a-zA-Z0-9_\-.:" "\"\'/\\\(\)\+\x41-\xff]+
 
 attvalue                \"[^"]*\"|\'[^']*\'

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

@@ -1206 +1206 @@
       map* tmpm2=getMap(tmp_maps->content,"tmpUrl");
       if(tmpm1!=NULL && tmpm2!=NULL){
-        sprintf(url,"%s/%s/%s_%i.xml",tmpm1->value,tmpm2->value,service,pid);
+        if(strncasecmp(tmpm2->value,"http://",7)==0){
+          sprintf(url,"%s/%s_%i.xml",tmpm2->value,service,pid);
+        }else
+          sprintf(url,"%s/%s/%s_%i.xml",tmpm1->value,tmpm2->value,service,pid);
       }
     }
@@ -1892 +1895 @@
         map *tmp3=getMapFromMaps(m,"main","serverAddress");
         char *file_url;
-        file_url=(char*)malloc((strlen(tmp3->value)+strlen(tmp2->value)+strlen(s->name)+strlen(ext->value)+strlen(tmpI->name)+13)*sizeof(char));
-        sprintf(file_url,"%s/%s/%s_%s_%i.%s",tmp3->value,tmp2->value,s->name,tmpI->name,cpid+100000,ext->value);
+        if(strncasecmp(tmp2->value,"http://",7)==0){
+          file_url=(char*)malloc((strlen(tmp2->value)+strlen(s->name)+strlen(ext->value)+strlen(tmpI->name)+13)*sizeof(char));
+          sprintf(file_url,"%s/%s_%s_%i.%s",tmp2->value,s->name,tmpI->name,cpid+100000,ext->value);
+        }else{
+          file_url=(char*)malloc((strlen(tmp3->value)+strlen(tmp2->value)+strlen(s->name)+strlen(ext->value)+strlen(tmpI->name)+13)*sizeof(char));
+          sprintf(file_url,"%s/%s/%s_%s_%i.%s",tmp3->value,tmp2->value,s->name,tmpI->name,cpid+100000,ext->value);
+        }
         addToMap(tmpI->content,"Reference",file_url);
         if(hasExt!=true){
@@ -2524 +2532 @@
     addToCache(m,url,fcontent,fsize);
   free(fcontent);
-  free(cached);
+  if(cached!=NULL)
+    free(cached);
   return 0;
 }