diff --git a/tools/convbin.sh b/tools/convbin.sh index 4732b4d..1da6b2f 100755 --- a/tools/convbin.sh +++ b/tools/convbin.sh @@ -94,12 +94,17 @@ elif [[ ${RINEX_TYPE} == '30s_full' ]] ; then rnx_conversion_func='convert_to_ri elif [[ ${RINEX_TYPE} == '1s_full' ]] ; then rnx_conversion_func='convert_to_rinex_1s_full' ; RINEX_FILE=$(echo "${filedate}"-"${MOUNT_NAME}"_"${RINEX_TYPE}".obs) fi - #Let's launch the CONVBIN process echo "- Processing on ""${RAW_ARCHIVE}" -extract_raw_file && \ -${rnx_conversion_func} && \ +file_extension="${RAW_ARCHIVE##*.}" +if [[ $file_extension == 'zip' ]] + then + extract_raw_file + else + raw_file="${RAW_ARCHIVE}" +fi +${rnx_conversion_func} return_code=$? echo -n 'rinex_file='"${RINEX_FILE}" -rm "${raw_file}" +[[ $file_extension == 'zip' ]] && rm "${raw_file}" exit $return_code \ No newline at end of file diff --git a/web_app/static/logs.js b/web_app/static/logs.js index 03ce8bd..f687795 100644 --- a/web_app/static/logs.js +++ b/web_app/static/logs.js @@ -17,12 +17,6 @@ window.operateEvents = { 'click #log_edit': function(e, value, row, index) { document.querySelector('#filename').textContent = row.name; //console.log(row.format); - if ( row.format.split(".").pop() === "ZIP") { - createRinexBtnElt.removeAttribute('disabled'); - } - else { - createRinexBtnElt.setAttribute('disabled', ''); - } $('#editModal').modal(); createRinexBtnElt.dataset.filename = row.name; //$('#rinex-create-button').data.row = row; diff --git a/web_app/templates/logs.html b/web_app/templates/logs.html index e15e6bf..87fe779 100644 --- a/web_app/templates/logs.html +++ b/web_app/templates/logs.html @@ -55,7 +55,7 @@