Changeset 564 for trunk/zoo-project/zoo-kernel

Timestamp:

Feb 9, 2015, 5:16:06 PM (10 years ago)

Author:

djay

Message:

Add kmz output support, small fix in readGeneratedFile.

Location:

trunk/zoo-project/zoo-kernel

Files:

• service_internal.c (modified) (2 diffs)
• service_internal_otb.c (modified) (1 diff)

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

@@ -2459 +2459 @@
 void readGeneratedFile(maps* m,map* content,char* filename){
   FILE * file=fopen(filename,"rb");
+  if(file==NULL){
+    fprintf(stderr,"Failed to open file %s for reading purpose.\n",filename);
+    setMapInMaps(m,"lenv","message","Unable to read produced file. Please try again later");
+    return ;
+  }
   fseek(file, 0, SEEK_END);
   long count = ftell(file);
@@ -2464 +2469 @@
   struct stat file_status; 
   stat(filename, &file_status);
-  if(file==NULL){
-    fprintf(stderr,"Failed to open file %s for reading purpose.\n",filename);
-    setMapInMaps(m,"lenv","message","Unable to read produced file. Please try again later");
-    return ;
-  }
   map* tmpMap1=getMap(content,"value");
   if(tmpMap1==NULL){

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

@@ -190 +190 @@
                               ext="shp";
                             else
-                            if(strncasecmp(tmpVal->value,"application/vnd.google-earth.kml+xml",36)==0)
-                              ext="kml";
+                              if(strncasecmp(tmpVal->value,"application/vnd.google-earth.kml+xml",36)==0)
+                                ext="kml";
+                              else
+                                if(strncasecmp(tmpVal->value,"application/vnd.google-earth.kmz",32)==0)
+                                  ext="kmz";
+
                       }
                       sprintf(tmp,"%s/%s_%s.%s",tmpPath->value,s->name,tmpSid->value,ext);