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

Timestamp:

Oct 11, 2018, 4:30:46 PM (6 years ago)

Author:

djay

Message:

Check for md5sum of any file in the cache to avoid sending the same file on HPC server twice. Add the multiple LiteralData? inputs support for HPC services. Remove condition for defining SCALE for every band in the outputed MapServer? mapfile.

File:

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

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

@@ -542 +542 @@
   int imyIndex=getPublishedId(output);
   msMapSetExtent(m,minX,minY,maxX,maxY);
-  m->maxsize=4096;
+  //m->maxsize=4096;
 #ifdef DEBUGMS
   fprintf(stderr,"Extent %.15f %.15f %.15f %.15f\n",minX,minY,maxX,maxY);
@@ -951 +951 @@
    */
   GDALAllRegister();
-  hDataset = GDALOpen( pszFilename, GA_Update );
+  hDataset = GDALOpen( pszFilename, GA_Update ); /*GA_ReadOnly*/
   if( hDataset == NULL ){
 #ifdef DEBUGMS
@@ -1039 +1039 @@
     setSrsInformations(output,m,myLayer,pszProjection);
   }else{
-    fprintf(stderr,"NO SRS FOUND ! %s\n",GDALGetProjectionRef( hDataset ));
+    fprintf(stderr,"NO SRS FOUND %s %d ! %s\n",__FILE__,__LINE__,GDALGetProjectionRef( hDataset ));
+    fflush(stderr);
     CPLErr sp=GDALSetProjection( hDataset , "+init=epsg:4326" );
     if(sp!=CE_None){
-      fprintf(stderr,"NO SRS FOUND ! %s\n",CPLGetLastErrorMsg());
+      fprintf(stderr,"NO SRS SET ! %s\n",CPLGetLastErrorMsg());
     }
   }
@@ -1133 +1134 @@
 
     CPLErrorReset();
-    GDALComputeRasterStatistics( hBand, TRUE, &pdfMin, &pdfMax, &pdfMean, &pdfStdDev, NULL,NULL);
+    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);
@@ -1143 +1145 @@
       sprintf(tmpI,"%s_interval",tmpN);
       msInsertHashTable(&(myLayer->metadata), tmpI, tmpMm);
-      if(pdfMax>255)
-        msLayerAddProcessing(myLayer,tmpMp);
+      //if(pdfMax>255)
+      msLayerAddProcessing(myLayer,tmpMp);
       map* test=getMap(output->content,"msClassify");
       if(test!=NULL && strncasecmp(test->value,"true",4)==0){
@@ -1498 +1500 @@
     fprintf(myMaps,"%s\n",mapfile);
     fclose(myMaps);
-  } 
+  }
+  free(mapName);
+  free(tmp);
 }