From c97f6abf41dcf93535c8257b939e99a23abe05d2 Mon Sep 17 00:00:00 2001 From: Fabio D'Andria Date: Wed, 24 Jun 2015 15:54:04 +0200 Subject: [PATCH 1/2] [develop] added missing plugin pom.xml --- pom.xml | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2869f00..abf517b 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ rpm Participant-F Participant-F - 1.1-SNAPSHOT + 1.2-SNAPSHOT scm:git:git@github.com:ocean-color-ac-challenge/Participant-F.git scm:git:git@github.com:ocean-color-ac-challenge/Participant-F.git @@ -341,6 +341,19 @@ user_reference(env['USER']) + + org.codehaus.mojo + build-helper-maven-plugin + 1.8 + + + parse-version + + parse-version + + + + de.jutzig github-release-plugin From 6b2c1b494187b1c76b7e10d96603688aa9672656 Mon Sep 17 00:00:00 2001 From: Fabio D'Andria Date: Wed, 1 Jul 2015 15:45:50 +0200 Subject: [PATCH 2/2] [develop] fix to skip files not correctly handled by megs --- pom.xml | 2 +- src/main/app-resources/megs/run.sh | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index abf517b..97d86a2 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ rpm Participant-F Participant-F - 1.2-SNAPSHOT + 1.3-SNAPSHOT scm:git:git@github.com:ocean-color-ac-challenge/Participant-F.git scm:git:git@github.com:ocean-color-ac-challenge/Participant-F.git diff --git a/src/main/app-resources/megs/run.sh b/src/main/app-resources/megs/run.sh index fc15bf7..37af856 100755 --- a/src/main/app-resources/megs/run.sh +++ b/src/main/app-resources/megs/run.sh @@ -107,8 +107,12 @@ do ciop-log "INFO" "Starting megs processor" sh run_megs.sh "${file}" ${prdurl} - [ $? -ne 0 ] && exit ${ERR_MEGS} - + #[ $? -ne 0 ] && exit ${ERR_MEGS} + [ $? -ne 0 ] && { + ciop-log "WARN" "error processing file $( basename ${file} )" + continue + } + ciop-log "INFO" "Conversion to BEAM-DIMAP format" l2="$( find ${outputDir} -type f -name "MER*.N1" )" ciop-log "DEBUG" "found: ${l2}"