Changeset 282 for trunk

Timestamp:

Jul 27, 2011, 3:26:01 AM (13 years ago)

Author:

djay

Message:

Fixe previous commit...

Location:

trunk/zoo-kernel

Files:

• service.h (modified) (1 diff)
• service_internal.c (modified) (2 diffs)
• zoo_service_loader.c (modified) (3 diffs)

trunk/zoo-kernel/service.h

@@ -498 +498 @@
   }
 
-  static map* getMapOrEmpty(map* m,const char *key){
+  static map* getMapOrFill(map* m,const char *key,char* value){
     map* tmp=m;
     map* tmpMap=getMap(tmp,key);
     if(tmpMap==NULL){
-      addToMap(tmp,key,"");
+      addToMap(tmp,key,value);
       tmpMap=getMap(tmp,key);
     }

trunk/zoo-kernel/service_internal.c

@@ -2384 +2384 @@
   int fsize;
   if(cached!=NULL){
-    fprintf(stderr,"Use cached file: %s\n",cached);
     struct stat f_status;
     int s=stat(cached, &f_status);
     if(s==0){
-      fprintf(stderr,"Use cached file: %s\n",cached);
       fcontent=(char*)malloc(sizeof(char)*(f_status.st_size+1));
       FILE* f=fopen(cached,"r");
@@ -2405 +2403 @@
     fsize=res.nDataLen;
   }
-  map* tmpMap=getMapOrEmpty(content,"value");
+  map* tmpMap=getMapOrFill(content,"value","");
   free(tmpMap->value);
   tmpMap->value=(char*)malloc((fsize+1)*sizeof(char));

trunk/zoo-kernel/zoo_service_loader.c

@@ -452 +452 @@
   _getcwd(ntmp,1024);
 #endif
-  r_inputs=getMap(request_inputs,"metapath");
-  if(r_inputs==NULL){
-    if(request_inputs==NULL)
-      request_inputs=createMap("metapath","");
-    else
-      addToMap(request_inputs,"metapath","");
-#ifdef DEBUG
-    fprintf(stderr,"ADD METAPATH\n");
-    dumpMap(request_inputs);
-#endif
-    r_inputs=getMap(request_inputs,"metapath");
-  }
+  r_inputs=getMapOrFill(request_inputs,"metapath","");
+
   char conf_file[10240];
   snprintf(conf_file,10240,"%s/%s/main.cfg",ntmp,r_inputs->value);
@@ -1399 +1389 @@
                  * mimeType, encoding, schema
                  */
-                const char *coms[3];
-                coms[0]="mimeType";
-                coms[1]="encoding";
-                coms[2]="schema";
+                const char *coms[3]={"mimeType","encoding","schema"};
                 for(int l=0;l<3;l++){
 #ifdef DEBUG
@@ -1433 +1420 @@
                 xmlChar* mv=xmlNodeListGetString(doc,cur4->xmlChildrenNode,1);
                 map* ltmp=getMap(tmpmaps->content,"mimeType");
+                dumpMap(ltmp);
                 if(mv==NULL || 
                    (xmlStrcasecmp(cur4->name, BAD_CAST "ComplexData")==0 &&