Changeset 633

Timestamp:

Apr 16, 2015, 4:01:40 AM (10 years ago)

Author:

djay

Message:

Call readGeneratedFile even if asReference parameter was set to false.

File:

• trunk/zoo-project/zoo-kernel/service_internal.c (modified) (3 diffs)

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

@@ -2660 +2660 @@
   free(tmpMap1->value);
   tmpMap1->value=(char*) malloc((count+1)*sizeof(char));  
-  fread(tmpMap1->value,1,count*sizeof(char),file);
+  fread(tmpMap1->value,count,sizeof(char),file);
   fclose(file);
   char rsize[100];
-  sprintf(rsize,"%ld",count*sizeof(char));
-  addToMap(tmpMap1,"size",rsize);
+  sprintf(rsize,"%ld",count);
+  addToMap(content,"size",rsize);
 }
 
@@ -2764 +2764 @@
       map* testMap=getMap(tmpI->content,"useMapserver");        
 #endif
+      map *gfile=getMap(tmpI->content,"generated_file");
+      char *file_name;
+      if(gfile!=NULL){
+        gfile=getMap(tmpI->content,"expected_generated_file");
+        if(gfile==NULL){
+          gfile=getMap(tmpI->content,"generated_file");
+        }
+        readGeneratedFile(m,tmpI->content,gfile->value);            
+        file_name=(char*)malloc((strlen(gfile->value)+strlen(tmp1->value)+1)*sizeof(char));
+        for(int i=0;i<strlen(gfile->value);i++)
+          file_name[i]=gfile->value[i+strlen(tmp1->value)];
+      }
+
       toto=getMap(tmpI->content,"asReference");
 #ifdef USE_MS
@@ -2784 +2797 @@
           }
 
-          map *gfile=getMap(tmpI->content,"generated_file");
-          char *file_name;
-          if(gfile!=NULL){
-            gfile=getMap(tmpI->content,"expected_generated_file");
-            if(gfile==NULL){
-              gfile=getMap(tmpI->content,"generated_file");
-            }
-            readGeneratedFile(m,tmpI->content,gfile->value);        
-            file_name=(char*)malloc((strlen(gfile->value)+strlen(tmp1->value)+1)*sizeof(char));
-            for(int i=0;i<strlen(gfile->value);i++)
-              file_name[i]=gfile->value[i+strlen(tmp1->value)];
-          }
-          else{
+          if(gfile==NULL){
             map *ext=getMap(tmpI->content,"extension");
             char *file_path;