Changeset 631 for trunk/zoo-project/zoo-kernel/service_internal_otb.c

Timestamp:

Apr 13, 2015, 8:17:18 PM (9 years ago)

Author:

djay

Message:

Add readBase64 function, avoid calling it prior to fork . Add dumpMapsValuesToFiles function used to simplify OTB support.

File:

• trunk/zoo-project/zoo-kernel/service_internal_otb.c (modified) (4 diffs)

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

@@ -98 +98 @@
 
 /**
- * Write a file from value and length
- *
- * @param fname the file name
- * @param val the value
- * @param length the value length
- */
-int writeFile(char* fname,char* val,int length){
-  FILE* of=fopen(fname,"wb");
-  if(of==NULL){
-    return -1;
-  }
-  size_t ret=fwrite(val,sizeof(char),length,of);
-  if(ret<length){
-    fprintf(stderr,"Write error occured!\n");
-    fclose(of);
-    return -1;
-  }
-  fclose(of);
-  return 1;
-}
-
-/**
  * Load and run an OTB Application corresponding to the service by using inputs parameters.
  * Define the m_Conf 
@@ -137 +115 @@
   map* tmp=NULL;
   int res=-1;
-
   std::vector<std::string> list = ApplicationRegistry::GetAvailableApplications();
   if (list.size() == 0){
@@ -146 +123 @@
     free(tmps);
     res=-1;
+    return res;
   }
   else{
+    dumpMapsValuesToFiles(main_conf,real_inputs);
     for (std::vector<std::string>::const_iterator it = list.begin(); it != list.end(); ++it){
       if(s->name==*it){
@@ -212 +191 @@
                     setMapInMaps(inputs,paramKey.c_str(),"generated_file",tmp);
                     dynamic_cast<OutputImageParameter *> (param.GetPointer())->SetPixelType(outPixType);
-                  }else{
-                    map* tmpPath=getMapFromMaps(m,"main","tmpPath");
-                    map* tmpSid=getMapFromMaps(m,"lenv","sid");
-                    map* tmpVal=getMapFromMaps(inputs,paramKey.c_str(),"mimeType");
-                    char file_ext[32];
-                    getFileExtension(tmpVal != NULL ? tmpVal->value : NULL, file_ext, 32);
-                    if(type == ParameterType_InputImageList){
-                      char *val=(char*)malloc((strlen(tmpPath->value)+strlen(s->name)+strlen(tmpSid->value)+strlen(file_ext)+13)*sizeof(char));
-                      sprintf(val,"%s/Input_%s_%s_%d.%s",tmpPath->value,s->name,tmpSid->value,0,file_ext);
-                      int length=0;
-                      map* tmpSize=getMap(test,"size");
-                      if(tmpSize!=NULL){
-                        length=atoi(tmpSize->value);
-                      }
-                      writeFile(val,test->value,length);
-                      values.push_back(val);
-                      free(val);
-                      map* tmpLength=getMapFromMaps(inputs,paramKey.c_str(),"length");
-                      if(tmpLength!=NULL){
-                        int len=atoi(tmpLength->value);
-                        maps* tmpI=getMaps(inputs,paramKey.c_str());
-                        for(int k=1;k<len;k++){
-                          val=(char*)malloc((strlen(tmpPath->value)+strlen(s->name)+strlen(tmpSid->value)+strlen(file_ext)+13)*sizeof(char));
-                          sprintf(val,"%s/Input_%s_%s_%d.%s",tmpPath->value,s->name,tmpSid->value,k,file_ext);
-                          length=0;
-                          map* tmpV=getMapArray(tmpI->content,"value",k);
-                          tmpSize=getMapArray(tmpI->content,"size",k);
-                          if(tmpSize!=NULL){
-                            length=atoi(tmpSize->value);
-                          }
-                          writeFile(val,tmpV->value,length);
-                          values.push_back(val);
-                          free(val);
-                        }
-                      }
-                      dynamic_cast<InputImageListParameter *> (param.GetPointer())->SetListFromFileName(values);
-                    }
-                    else
-                      if(type == ParameterType_InputVectorData || type == ParameterType_InputImage
-                           || type == ParameterType_ComplexInputImage || type == ParameterType_InputVectorData
-                           || type == ParameterType_InputFilename){
-                        char tmp[1024];
-                        char* ext="json";
-                        if(tmpVal!=NULL){
-                          char *val=(char*)malloc((strlen(tmpPath->value)+strlen(s->name)+strlen(tmpSid->value)+strlen(file_ext)+10)*sizeof(char));
-                          sprintf(val,"%s/Input_%s_%s.%s",tmpPath->value,s->name,tmpSid->value,file_ext);
-                          int length=0;
-                          map* tmpSize=getMap(test,"size");
-                          if(tmpSize!=NULL){
-                            length=atoi(tmpSize->value);
-                          }
-                          writeFile(val,test->value,length);
-
-                          if(strncasecmp(tmpVal->value,"application/zip",14)==0){
-
-                            char tmpName[1024];
-                            sprintf(tmpName,"/vsizip/%s",val);
-                            char **files=VSIReadDir(tmpName);
-                            int nFiles = CSLCount( files );
-                            char tmpSSName[1024];
-                            sprintf(tmpSSName,"%s/Input_%s_%s",tmpPath->value,s->name,tmpSid->value);
-                            mkdir(tmpSSName,0777);
-                            
-                            char tmpSName[1024];
-                            for(int kk=0;kk<nFiles;kk++){
-                              sprintf(tmpSName,"%s/%s",tmpName,files[kk]);
-                              VSILFILE* fmain=VSIFOpenL(tmpSName, "rb");
-                              if(fmain!=NULL){
-                                VSIFSeekL(fmain,0,SEEK_END);
-                                long count=VSIFTellL(fmain);
-                                VSIRewindL(fmain);
-                                
-                                char *content=(char*) malloc((count+1)*sizeof(char));  
-                                VSIFReadL(content,1,count*sizeof(char),fmain);
-                                
-                                char tmpSSSName[1024];
-                                sprintf(tmpSSSName,"%s/%s",tmpSSName,files[kk]);
-                                
-                                FILE* fx=fopen(tmpSSSName, "wb");
-                                fwrite(content,1,count,fx);
-                                fclose(fx);
-                                VSIFCloseL(fmain);
-                                free(content);
-                                std::string test1(tmpSSSName);
-                                if(test1.find(".shp")!=std::string::npos){
-                                  setMapInMaps(inputs,paramKey.c_str(),"cache_file",tmpSSSName);
-                                  test=getMapFromMaps(inputs,paramKey.c_str(),"cache_file");
-                                }
-                              }
-                            }
-                            m_Application->SetParameterString(paramKey, test->value);
-                          }else{
-                            m_Application->SetParameterString(paramKey, val);
-                          }
-                          free(val);
-                        }
-                      }
-                      else
-                        if(test->value!=NULL)
-                          m_Application->SetParameterString(paramKey, test->value);
-                  }
-
+                  }
+                  else{ 
+                    if(test!=NULL && test->value!=NULL)
+                      m_Application->SetParameterString(paramKey, test->value);
+                  }
                 }else{
                   if(type == ParameterType_OutputVectorData){