Merge branch 'develop'

src/main/app-resources/application.xml

@@ -12,7 +12,7 @@
 	<parameter id="pixex" title="Flag to extract POI reflectances" abstract="Flag to extract POI reflectances for evaluation purposes" scope="runtime">true</parameter>
 	<parameter id="aggregation" title="Pixel value aggregation method (with window size is larger than 1)" abstract="The aggregation methods that may be used are: min, exports the minimum of the window values; max, exports the maximum of the window values; mean, exports mean and standard deviation of the window values or median, exports the median of the window values">mean</parameter>
 	<parameter id="window" title="Side length of surrounding window (uneven)" abstract="The window size specifies the number of pixels surrounding the pixels derived from the given geographic coordinates to be exported">3</parameter>
-	<parameter id="publishL2" title="Flag to trigger the publishing of Level 2 products generated" abstract="Flag to trigger the publishing of Level 2 products generated" scope="runtime">true</parameter>
+	<parameter id="publish_l2" title="Flag to trigger the publishing of Level 2 products generated" abstract="Flag to trigger the publishing of Level 2 products generated" scope="runtime">true</parameter>
       </defaultParameters>
       <defaultJobconf>
         <property id="mapred.task.timeout">9900000000000</property>
@@ -24,7 +24,7 @@
     <node id="node_seadas">
       <job id="seadas" />
       <sources>
-        <source id="data" title="Data package URL" abstract="Data package OpenSearch Description Document URL" scope="runtime" refid="cas:series">https://challenges.esa.int/eceo/datapackage/RRPAR/description?key=9d79148d-3e17-414b-9983-e4cef9e88ec6</source>
+        <source id="data" title="Data package URL" abstract="Data package OpenSearch Description Document URL" scope="runtime" refid="cas:series">https://challenges.esa.int/eceo/data/package/RRPAR/description?key=9d79148d-3e17-414b-9983-e4cef9e88ec6</source>
       </sources>
       <parameters>
       	<parameter id="starttime">2002-03-01</parameter>

src/main/app-resources/seadas/run.sh

@@ -56,7 +56,18 @@ do
   #getting the input
   ciop-log "INFO" "Working with MERIS product ${input}"
 
-  n1input=$( ciop-copy -o ${myInput} ${input} )
+  case "${input:0:4}" in
+    "file"|"s3:/")
+      n1input="$( echo "${input}" | ciop-copy -o "${myInput}" - )"
+    ;;
+    "http")
+      n1input="$( opensearch-client "$input" enclosure | ciop-copy -o ${myInput} - )"
+    ;;
+    *)
+      exit $ERR_NOINPUT
+    ;;
+  esac
+
   [ $? -ne 0 ] && exit ${ERR_NOINPUT}
 
   #preparing the processor run