Convert to rinex for non-zipped files.

Fix #348
Stefal · Dec 17, 2024 · c303ffc · c303ffc
1 parent 413ce73
commit c303ffc
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 11 deletions.
diff --git 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
diff --git 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
@@ -55,7 +55,7 @@ <h4 class="modal-title">Warning</h4>
 
         <!-- Modal Header -->
         <div class="modal-header">
-          <h4 class="modal-title">Convert raw file archive (zip) to rinex file</h4>
+          <h4 class="modal-title">Convert raw file to rinex file</h4>
           <button type="button" class="close" data-dismiss="modal">&times;</button>
         </div>