Changeset 862 for branches/prototype-v0/zoo-project/zoo-services/utils

Timestamp:

Feb 1, 2018, 11:27:28 AM (7 years ago)

Author:

djay

Message:

Add the capability to publish heatmap or any templated mapfile using the epecific msInclude and msLayer keys for an output. For MapServer? published output, define 4096 as the default maxsize and use pixel width or height for raster files. use the correct MapServer? imagemode depending on GDALGetRasterDataType (MS_IMAGEMODE_BYTE for GDT_Byte, MS_IMAGEMODE_INT16 for GDT_Int16 and MS_IMAGEMODE_FLOAT32 for GDT_Float32). Create a text file (.maps) listing every mapfiles created for a MapServer? published output (or inputs) using saveMapNames function. Fixes in ulinet, use uuid for naming temporary files. Add dialect input to the ogr2ogr service. Use the .maps file for removing a file from the DeleteData? service

Location:

branches/prototype-v0/zoo-project/zoo-services/utils/hpc

Files:

• service.c (modified) (1 diff)
• service2.c (modified) (5 diffs)

branches/prototype-v0/zoo-project/zoo-services/utils/hpc/service.c

@@ -2 +2 @@
  * Author : Gérald FENOY
  *
- * Copyright 2008-2009 GeoLabs SARL. All rights reserved.
+ * Copyright 2017 GeoLabs SARL. All rights reserved.
  *
  * This work was supported by public funds received in the framework of GEOSUD,

branches/prototype-v0/zoo-project/zoo-services/utils/hpc/service2.c

@@ -2 +2 @@
  * Author : Gérald FENOY
  *
- * Copyright 2008-2009 GeoLabs SARL. All rights reserved.
- * 
+ * Copyright 2017 GeoLabs SARL. All rights reserved.
+ *
+ * This work was supported by public funds received in the framework of GEOSUD,
+ * a project (ANR-10-EQPX-20) of the program "Investissements d'Avenir" managed
+ * by the French National Research Agency
+ *
  * This work was supported by public funds received in the framework of GEOSUD,
  * a project (ANR-10-EQPX-20) of the program "Investissements d'Avenir" managed
@@ -42 +46 @@
 
 #include <dirent.h>
+#include <string.h>
+#include <cerrno>
+
 extern "C" {
+
+  /** 
+   * Retrieve the error message which occured when trying to remove a file
+   * (return values can be EACCES, EBUSY, EFAULT, EIO, EISDIR, ELOOP, 
+   * ENAMETOOLONG, ENOENT, ENOMEM, ENOTDIR, EPERM, EROFS, UNKNOWN).
+   *
+   * @param errn
+   * @result a string corresponding to the error number 
+   */ 
+  char* fetchErrno(int errn){
+   switch(errn){
+    case EACCES:
+        return "EACCES";
+    case EBUSY:
+        return "EBUSY";
+    case EFAULT:
+        return "EFAULT";
+    case EIO:
+        return "EIO";
+    case EISDIR:
+        return "EISDIR";
+    case ELOOP:
+        return "ELOOP";
+    case ENAMETOOLONG:
+        return "ENAMETOOLONG";
+    case ENOENT:
+        return "ENOENT";
+    case ENOMEM:
+        return "ENOMEM";
+    case ENOTDIR:
+        return "ENOTDIR";
+    case EPERM:
+        return "EPERM";
+    case EROFS:
+        return "EROFS";
+    default:
+        return "UNKNOWN";
+   }
+  }
 
   /**
@@ -78 +124 @@
    */
   int tryDeleteDataFile(const char* storage,const char* filename){
-    char* fullpath=(char*)malloc((strlen(storage)+strlen(filename)+2)*sizeof(char));
-    sprintf(fullpath,"%s/%s",storage,filename);
+    char* fullpath=NULL;
+    if(filename!=NULL){
+      fullpath=(char*)malloc((strlen(storage)+strlen(filename)+2)*sizeof(char));
+      sprintf(fullpath,"%s/%s",storage,filename);
+    }
+    else
+      fullpath=zStrdup(storage);
     if(unlink(fullpath)==0){
       // TODO store the filename_full in the deletedfiles
-      fprintf(stderr,"#### DeleteData #### %s %d %s has been successfully deleted\n",__FILE__,__LINE__,filename);
+      fprintf(stderr,"#### DeleteData #### %s %d %s has been successfully deleted\n",__FILE__,__LINE__,(strlen(filename)>0?filename:fullpath));
     }else{
-      fprintf(stderr,"#### DeleteData #### unable to delete %s \n",fullpath);
+      fprintf(stderr,"#### DeleteData #### unable to delete %s %s \n",fullpath,fetchErrno(errno));
     }
     free(fullpath);
@@ -138 +189 @@
         }
         if(fcontent!=NULL && strcasecmp(fcontent,"SHARED")!=0){
-          // Delete associated zcm and zcp
+          // Delete associated zcm, zcp and maps files
           tryDeleteCacheFile(cacheDir->value,filename->value,"zca");
           tryDeleteCacheFile(cacheDir->value,filename->value,"zcm");
           tryDeleteCacheFile(cacheDir->value,filename->value,"zcp");
-          // Delete ZOO_DATA_<input>_<sid>.data and <input>_<sid>.map
+          tryDeleteCacheFile(tmpPath->value,filename->value,"maps");
+          // Delete <input>_<sid>.map
           char* datafile=(char*)malloc((strlen(jobid->value)+strlen(ioname->value)+19)*sizeof(char));
-          sprintf(datafile,"ZOO_DATA_%s_%s.data",ioname->value,jobid->value);
-          tryDeleteDataFile(dataPath->value,datafile);
-          free(datafile);
-          datafile=(char*)malloc((strlen(jobid->value)+strlen(ioname->value)+19)*sizeof(char));
           sprintf(datafile,"%s_%s.map",ioname->value,jobid->value);
           tryDeleteDataFile(dataPath->value,datafile);
@@ -160 +208 @@
         char tmp1[8];
         snprintf(tmp1,7,"%s",filename->value);
-        if(strcasecmp(tmp1,"output")==0){
-          tryDeleteDataFile(tmpPath->value,filename->value);
+        if(strcasecmp(tmp1,"output")==0 || strcasecmp(tmp1,"input_")==0){
+          trydeletedatafile(tmppath->value,filename->value);
+          char *tmp=zStrdup(filename->value);
+          tmp[strlen(tmp)-strlen(strrchr(tmp,'.'))]=0;
+          char *mapsfile=(char*)malloc((strlen(tmp)+6)*sizeof(char));
+          sprintf(mapsfile,"%s.maps",tmp);
+          char* mapPath=(char*)malloc((strlen(tmpPath->value)+strlen(mapsfile)+2)*sizeof(char));
+          sprintf(mapPath,"%s/%s",tmpPath->value,mapsfile);
+          FILE* myMapsfile=fopen(mapPath,"r");
+          if(myMapsfile!=NULL){
+            char *buffer=(char*)malloc(1024*sizeof(char));
+            while(fgets(buffer, 1024, myMapsfile) != NULL){
+              buffer[strlen(buffer)-1]=0;
+              tryDeleteDataFile(buffer,NULL);
+            }
+            free(buffer);
+            fclose(myMapsfile);
+          }
+          tryDeleteDataFile(mapPath,NULL);
+          free(mapPath);
+          free(mapsfile);
           // Delete ZOO_DATA_<output>_<sid>.data and <output>_<sid>.map
           char* datafile=(char*)malloc((strlen(jobid->value)+strlen(ioname->value)+19)*sizeof(char));