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

Timestamp:

Nov 16, 2018, 3:09:05 PM (5 years ago)

Author:

djay

Message:

Add support for output style definition depending on geometry type (msStylePoly, msStylePoint, msStrylLine). Upload shared data in remote_persitent_data_path rather than remote_data_path (used for not shared data). In case output data should be published and the data is empty (nb_pixels or nb_features is set to 0) then, the ZOO-Kernel returns an ExceptionReport? with an Exception for every output.

File:

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

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

@@ -185 +185 @@
     map* useMs=getMap(tmpI->content,"useMapserver");
     if((minNb==NULL || atoi(minNb->value)>=1) && useMs!=NULL && strncasecmp(useMs->value,"true",4)==0){
+      int lIndex=0;
+      maps* lenv=getMaps(m,"lenv");
+      if(getMapFromMaps(m,"lenv","mapErrorNb")==NULL)
+        setMapInMaps(m,"lenv","mapErrorNb","0");
+      else{
+        map* tmpV=getMapFromMaps(m,"lenv","mapErrorNb");
+        lIndex=atoi(tmpV->value)+1;
+        addIntToMap(lenv->content,"mapErrorNb",lIndex);
+      }
       setMapInMaps(m,"lenv","mapError","true");
-      setMapInMaps(m,"lenv","locator",tmpI->name);
+      setMapArray(lenv->content,"locator",lIndex,tmpI->name);
       if(nbElements==NULL)
-        setMapInMaps(m,"lenv","message",_("The ZOO-Kernel was able to retrieve the data but could not read it as geographic data."));
+        setMapArray(lenv->content,"message",lIndex,_("The ZOO-Kernel was able to retrieve the data but could not read it as geographic data."));
       else
-        setMapInMaps(m,"lenv","message",_("The ZOO-Kernel was able to retrieve the data but could not access any feature or pixel in te resulting file."));
+        setMapArray(lenv->content,"message",lIndex,_("The ZOO-Kernel was able to retrieve the data but could not access any feature or pixel in te resulting file."));
       if(getMapFromMaps(m,"lenv","state")==NULL)
         errorException (m, _("Unable to find any geographic data"), "WrongInputData", tmpI->name);
@@ -889 +898 @@
        */
       tmpMap=getMap(output->content,"msStyle");
+      if(tmpMap==NULL){
+        switch(myLayer->type){
+        case MS_LAYER_POLYGON:
+          tmpMap=getMapFromMaps(conf,"main","msStylePoly");
+          break;
+        case MS_LAYER_LINE:
+          tmpMap=getMapFromMaps(conf,"main","msStyleLine");
+          break;
+        default:
+          tmpMap=getMapFromMaps(conf,"main","msStylePoint");
+          break;
+        }
+      }
       if(tmpMap!=NULL)
         msUpdateStyleFromString(myLayer->CLASS[myLayer->numclasses]->styles[myLayer->CLASS[myLayer->numclasses]->numstyles],tmpMap->value,0);
@@ -1135 +1157 @@
     CPLErrorReset();
     GDALGetRasterStatistics( hBand, TRUE, TRUE, &pdfMin, &pdfMax, &pdfMean, &pdfStdDev);
-    //GDALComputeRasterStatistics( hBand, TRUE, &pdfMin, &pdfMax, &pdfMean, &pdfStdDev, NULL,NULL);
     char tmpN[21];
     sprintf(tmpN,"Band%d",iBand+1);