Changeset 851 for branches/prototype-v0/zoo-project/zoo-kernel/service_internal_ms.c

Timestamp:

Aug 31, 2017, 4:14:46 PM (7 years ago)

Author:

djay

Message:

Invoke callback asynchronously. Still the ZOO-Kernel has still to wait for every requests to finish before stoping its execution.

File:

• branches/prototype-v0/zoo-project/zoo-kernel/service_internal_ms.c (modified) (8 diffs)

branches/prototype-v0/zoo-project/zoo-kernel/service_internal_ms.c

@@ -194 +194 @@
 
   char* webService_url=(char*)malloc((strlen(msUrl->value)+strlen(format->value)+strlen(tmpI->name)+strlen(width->value)+strlen(height->value)+strlen(extent->value)+256)*sizeof(char));
-  map* datatype=getMap(tmpI->content,"datatype");
+  map* datatype=getMap(tmpI->content,"geodatatype");
   
-  sprintf(webService_url,
-          "%s?map=%s/%s_%s.map&request=%s&service=%s&version=%s&%s&format=%s&bbox=%s&crs=%s",
-          msUrl->value,
-          dataPath->value,
-          tmpI->name,
-          sid->value,
-          options[proto][2],
-          options[proto][0],
-          protoVersion,
-          layers,
-          rformat->value,
-          extent->value,
-          crs->value
-          );
   if(proto>0){
-    addToMap(tmpI->content,"Reference",webService_url);
+    sprintf(webService_url,
+            "%s?map=%s/%s_%s.map&request=%s&service=%s&version=%s&%s&format=%s&bbox=%s&crs=%s",
+            msUrl->value,
+            dataPath->value,
+            tmpI->name,
+            sid->value,
+            options[proto][2],
+            options[proto][0],
+            protoVersion,
+            layers,
+            rformat->value,
+            extent->value,
+            crs->value
+            );
+    if(datatype!=NULL && strncasecmp(datatype->value,"raster",6)==0){
+      addToMap(tmpI->content,"ref_wcs_link",webService_url);
+    }
+    else{
+      addToMap(tmpI->content,"ref_wfs_link",webService_url);
+    }
     proto=0;
     rformat=createMap("mimeType","image/png");
   }
   else{
+    sprintf(webService_url,
+            "%s?map=%s/%s_%s.map&request=%s&service=%s&version=%s&%s&width=%s&height=%s&format=%s&bbox=%s&crs=%s",
+            msUrl->value,
+            dataPath->value,
+            tmpI->name,
+            sid->value,
+            options[proto][2],
+            options[proto][0],
+            protoVersion,
+            layers,
+            width->value,
+            height->value,
+            rformat->value,
+            extent->value,
+            crs->value
+            );
+    addToMap(tmpI->content,"ref_wms_link",webService_url);
     if(datatype!=NULL && strncasecmp(datatype->value,"raster",6)==0){
       proto=2;
@@ -225 +247 @@
     }
   }
-  if(datatype!=NULL && strncasecmp(datatype->value,"raster",6)==0){
-    addToMap(tmpI->content,"ref_wcs_link",webService_url);
-  }
-  else{
-    addToMap(tmpI->content,"ref_wfs_link",webService_url);
-  }
+  addToMap(tmpI->content,"Reference",webService_url);
+
   protoVersion=options[proto][1];
   extent=getMap(tmpI->content,options[proto][4]);
   memset(webService_url,0,strlen(webService_url));
-  sprintf(webService_url,
-          "%s?map=%s/%s_%s.map&request=%s&service=%s&version=%s&%s&width=%s&height=%s&format=%s&bbox=%s&crs=%s",
-          msUrl->value,
-          dataPath->value,
-          tmpI->name,
-          sid->value,
-          options[proto][2],
-          options[proto][0],
-          protoVersion,
-          layers,
-          width->value,
-          height->value,
-          rformat->value,
-          extent->value,
-          crs->value
-          );
   if(proto>0){
-    addToMap(tmpI->content,"Reference",webService_url);
-  }
-  addToMap(tmpI->content,"ref_wms_link",webService_url);
+    sprintf(webService_url,
+            "%s?map=%s/%s_%s.map&request=%s&service=%s&version=%s&%s&format=%s&bbox=%s&crs=%s",
+            msUrl->value,
+            dataPath->value,
+            tmpI->name,
+            sid->value,
+            options[proto][2],
+            options[proto][0],
+            protoVersion,
+            layers,
+            rformat->value,
+            extent->value,
+            crs->value
+            );
+    if(datatype!=NULL && strncasecmp(datatype->value,"raster",6)==0){
+      addToMap(tmpI->content,"ref_wcs_link",webService_url);
+    }
+    else{
+      addToMap(tmpI->content,"ref_wfs_link",webService_url);
+    }
+  }else{
+    sprintf(webService_url,
+            "%s?map=%s/%s_%s.map&request=%s&service=%s&version=%s&%s&width=%s&height=%s&format=%s&bbox=%s&crs=%s",
+            msUrl->value,
+            dataPath->value,
+            tmpI->name,
+            sid->value,
+            options[proto][2],
+            options[proto][0],
+            protoVersion,
+            layers,
+            width->value,
+            height->value,
+            rformat->value,
+            extent->value,
+            crs->value
+            );
+    addToMap(tmpI->content,"ref_wms_link",webService_url);
+  }
   if(hasCRS==0){
     freeMap(&crs);
     free(crs);
   }
+  freeMap(&rformat);
+  free(rformat);
   free(webService_url);
+  dumpMaps(tmpI);
 }
 
@@ -552 +593 @@
       i++;
     }
+    OGR_DS_Destroy(poDS1);
   }
   free(sdsName);
@@ -572 +614 @@
   }
 
-  addToMap(output->content,"datatype","vector");
+  addToMap(output->content,"geodatatype","vector");
   int iLayer = 0;
   for( iLayer=0; iLayer < OGR_DS_GetLayerCount(poDS); iLayer++ ){
@@ -744 +786 @@
   }
 
-  //OGR_DS_Destroy(poDS);
+  OGR_DS_Destroy(poDS);
   //OGRCleanupAll();
 
@@ -774 +816 @@
     fprintf(stderr,"Unable to access the DataSource %s \n",pszFilename);
 #endif
+    addToMap(output->content,"geodatatype","other");
     setMapInMaps(conf,"lenv","message","gdalinfo failed - unable to open");
     GDALDestroyDriverManager();
@@ -782 +825 @@
 #endif
 
-  addToMap(output->content,"datatype","raster");
+  addToMap(output->content,"geodatatype","raster");
   /**
    * Add a new layer set name, data
@@ -1018 +1061 @@
   GDALClose( hDataset );
   GDALDestroyDriverManager();
-
   CPLCleanupTLS();
   return 1;