Changeset 565 for trunk/zoo-project/zoo-kernel

Timestamp:

Feb 9, 2015, 5:37:32 PM (10 years ago)

Author:

djay

Message:

Add support for expected_generated_file in case we can predict that the name of the generated_file will vary from the name given for an output (specific to OTB support).

Location:

trunk/zoo-project/zoo-kernel

Files:

• service_internal.c (modified) (1 diff)
• service_internal_otb.c (modified) (1 diff)

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

@@ -2602 +2602 @@
           char *file_name;
           if(gfile!=NULL){
+            gfile=getMap(tmpI->content,"expected_generated_file");
+            if(gfile==NULL){
+              gfile=getMap(tmpI->content,"generated_file");
+            }
             readGeneratedFile(m,tmpI->content,gfile->value);        
             file_name=(char*)malloc((strlen(gfile->value)+strlen(tmp1->value)+1)*sizeof(char));

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

@@ -193 +193 @@
                                 ext="kml";
                               else
-                                if(strncasecmp(tmpVal->value,"application/vnd.google-earth.kmz",32)==0)
+                                if(strncasecmp(tmpVal->value,"application/vnd.google-earth.kmz",32)==0){
                                   ext="kmz";
+                                  sprintf(tmp,"%s/%s_%sxt.%s",tmpPath->value,s->name,tmpSid->value,ext);
+                                  m_Application->SetParameterString(paramKey, tmp);
+                                  setMapInMaps(outputs,paramKey.c_str(),"expected_generated_file",tmp);
+                                }
 
                       }