psdi-data-conversion 0.0.35__py3-none-any.whl → 0.0.37__py3-none-any.whl

psdi_data_conversion/main.py

@@ -371,7 +371,7 @@ def detail_converter_use(args: ConvertArgs):
             if format_name in l_formats:
                 optional_not: str = ""
             else:
-                optional_not: str = " not"
+                optional_not: str = "not "
             print_wrap(f"Conversion {to_or_from} {format_name} is {optional_not}supported by {args.name}.\n")
 
         # List all possible formats, and which can be used for input and which for output
@@ -551,12 +551,12 @@ def detail_possible_converters(from_format: str, to_format: str):
         return
 
     print_wrap(f"The following registered converters can convert from {from_format} to {to_format}:", newline=True)
-    print("\n    ".join(l_possible_registered_converters))
+    print("    " + "\n    ".join(l_possible_registered_converters) + "\n")
     if l_possible_unregistered_converters:
         print("")
         print_wrap("Additionally, the following converters are supported by this package on other platforms and can "
                    "perform this conversion:", newline=True)
-        print("\n    ".join(l_possible_registered_converters))
+        print("    " + "\n    ".join(l_possible_unregistered_converters) + "\n")
 
     print_wrap("For details on input/output flags and options allowed by a converter for this conversion, call:")
     print(f"{CL_SCRIPT_NAME} -l <converter name> -f {from_format} -t {to_format}")
@@ -694,26 +694,34 @@ def run_from_args(args: ConvertArgs):
                                               delete_input=args.delete_input,
                                               refresh_local_log=False)
         except FileConverterHelpException as e:
-            print_wrap(f"ERROR: {e}", err=True)
+            if not e.logged:
+                print_wrap(f"ERROR: {e}", err=True)
+                e.logged = True
             success = False
             continue
         except FileConverterAbortException as e:
-            print_wrap(f"ERROR: Attempt to convert file {filename} aborted with status code {e.status_code} and "
-                       f"message:\n{e}\n", err=True)
+            if not e.logged:
+                print_wrap(f"ERROR: Attempt to convert file {filename} aborted with status code {e.status_code} and "
+                           f"message:\n{e}\n", err=True)
+                e.logged = True
             success = False
             continue
         except FileConverterInputException as e:
             if "Conversion from" in str(e) and "is not supported" in str(e):
-                print_wrap(f"ERROR: {e}", err=True, newline=True)
+                if not e.logged:
+                    print_wrap(f"ERROR: {e}", err=True, newline=True)
                 detail_possible_converters(args.from_format, args.to_format)
-            else:
+            elif not e.logged:
                 print_wrap(f"ERROR: Attempt to convert file {filename} failed at converter initialization with "
                            f"exception type {type(e)} and message: \n{e}\n", err=True)
+            e.logged = True
             success = False
             continue
         except Exception as e:
-            print_wrap(f"ERROR: Attempt to convert file {filename} failed with exception type {type(e)} and message: " +
-                       f"\n{e}\n", err=True)
+            if not hasattr(e, "logged") or e.logged is False:
+                print_wrap(f"ERROR: Attempt to convert file {filename} failed with exception type {type(e)} and "
+                           f"message: \n{e}\n", err=True)
+                e.logged = True
             success = False
             continue
 

psdi_data_conversion/static/content/accessibility.htm

@@ -15,10 +15,14 @@
   <link href="https://fonts.googleapis.com/css?family=Open+Sans:400" rel="stylesheet" type="text/css">
   <link href="https://fonts.googleapis.com/css?family=Lexend:400" rel="stylesheet" type="text/css">
   <link rel="stylesheet" href="../styles/format.css">
+
+  <script src="https://code.jquery.com/jquery-3.7.1.js" integrity="sha256-eKhayi8LEQwp4NKxN+CfCh+3qOVUtJn3QNZ0TciWLP4="
+    crossorigin="anonymous"></script>
+
   <script src="../javascript/load_accessibility.js"></script>
-  <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.6.3/jquery.min.js"></script>
   <script src="../javascript/common.js" type="module"></script>
   <script src="../javascript/psdi-common.js" type="module"></script>
+  <script src="../javascript/accessibility.js" type="module" language="JavaScript"></script>
 </head>
 
 <body marginwidth="0">
@@ -244,10 +248,6 @@
     </div>
   </form>
 
-  <script src="https://code.jquery.com/jquery-3.7.1.js" integrity="sha256-eKhayi8LEQwp4NKxN+CfCh+3qOVUtJn3QNZ0TciWLP4="
-    crossorigin="anonymous"></script>
-  <script src="../javascript/accessibility.js" type="module" language="JavaScript"></script>
-
   <footer class="footer" id="psdi-footer"></footer>
 
 </body>

psdi_data_conversion/static/content/convert.htm

@@ -15,16 +15,18 @@
   <link href="https://fonts.googleapis.com/css?family=Open+Sans+Condensed:700" rel="stylesheet" type="text/css">
 
   <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.6.2/dist/css/bootstrap.min.css">
-  <script src="https://cdn.jsdelivr.net/npm/jquery@3.7.1/dist/jquery.slim.min.js"></script>
+
+  <script src="https://code.jquery.com/jquery-3.7.1.js" integrity="sha256-eKhayi8LEQwp4NKxN+CfCh+3qOVUtJn3QNZ0TciWLP4="
+    crossorigin="anonymous"></script>
   <script src="https://cdn.jsdelivr.net/npm/popper.js@1.16.1/dist/umd/popper.min.js"></script>
   <script src="https://cdn.jsdelivr.net/npm/bootstrap@4.6.2/dist/js/bootstrap.bundle.min.js"></script>
-
-  <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.6.3/jquery.min.js"></script>
+  <script src="https://cdn.jsdelivr.net/jquery.dirtyforms/2.0.0/jquery.dirtyforms.min.js"></script>
 
   <link rel="stylesheet" href="../styles/format.css">
   <script src="../javascript/load_accessibility.js"></script>
   <script src="../javascript/common.js" type="module"></script>
   <script src="../javascript/psdi-common.js" type="module"></script>
+  <script src="../javascript/convert.js" type="module" language="JavaScript"></script>
 </head>
 
 <body marginwidth="0">
@@ -40,8 +42,13 @@
     </div>
   </div>
 
-  <form name="gui">
+  <form name="gui" class="gui">
     <div class="max-width-box">
+      <a href="../../">
+        <input type="button" class="button" value=" ← Return to Format Selection " name="returnHome" id="returnHome">
+      </a>
+      <br>
+      <br>
       <p>Zero to two option flag select boxes and zero to two sets of option flag check boxes may be displayed,
         depending on the conversion and the degree of completion of the database. Further information may be displayed
         underneath the select boxes if available. One or more input or output flags may be selected if required (command
@@ -54,7 +61,7 @@
         <div id="inFlagList">
           <p>
             <label for="inFlags" id="in_label">Read (input) option flags
-              (select all required):</label>
+              (hold CTRL to select multiple, or CTRL+click a selected option to unselect):</label>
           <div id="in_flag_break"></div>
           <select id="inFlags" class="large-width" size="4" multiple="multiple"></select>
           <div id=inFlagInfo></div>
@@ -63,7 +70,7 @@
         <div id="outFlagList">
           <p>
             <label for="outFlags" id="out_label">Write (output) option flags
-              (select all required):</label>
+              (hold CTRL to select multiple, or CTRL+click a selected option to unselect):</label>
           <div id="out_flag_break"></div>
           <select id="outFlags" class="large-width" size="4" multiple="multiple"></select>
           <div id=outFlagInfo></div>
@@ -104,14 +111,15 @@
         <input type="radio" name="coordOptions" id="coordOptions" value="better" disabled=true> better
         <input type="radio" name="coordOptions" id="coordOptions" value="best" disabled=true> best
       </p>
-      <p id="fileChecking">
-      </p>
       <p id="convertFile">
         <input type="checkbox" checked id="extCheck"> Enforce file naming checking to ensure uploaded files (and files
         contained in archives) all have the correct extension<br>
         <input type="checkbox" id="requestLog"> Also download log file for the conversion<br>
-        Select file to convert:
-        <br><input type="file" name="fileToUpload" id="fileToUpload"><br>
+        Select file to convert<span class="max-file-size"></span>:
+        <br>
+        <input type="file" name="fileToUpload" id="fileToUpload">
+        <input type="button" class="button" value=" Clear Uploaded File " name="clearUpload" id="clearUpload">
+        <br>
         If you have sensitive data you might prefer to use
         <a href="download.htm">one of our downloadable tools or Python library</a> rather than uploading your data to
         our service.<br>
@@ -125,9 +133,6 @@
     </div>
   </form>
 
-  <script src="https://code.jquery.com/jquery-3.7.1.js" integrity="sha256-eKhayi8LEQwp4NKxN+CfCh+3qOVUtJn3QNZ0TciWLP4="
-    crossorigin="anonymous"></script>
-  <script src="../javascript/convert.js" type="module" language="JavaScript"></script>
 
   <footer class="footer" id="psdi-footer"></footer>
 

psdi_data_conversion/static/content/convertato.htm

@@ -15,16 +15,18 @@
   <link href="https://fonts.googleapis.com/css?family=Open+Sans+Condensed:700" rel="stylesheet" type="text/css">
 
   <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.6.2/dist/css/bootstrap.min.css">
-  <script src="https://cdn.jsdelivr.net/npm/jquery@3.7.1/dist/jquery.slim.min.js"></script>
+
+  <script src="https://code.jquery.com/jquery-3.7.1.js" integrity="sha256-eKhayi8LEQwp4NKxN+CfCh+3qOVUtJn3QNZ0TciWLP4="
+    crossorigin="anonymous"></script>
   <script src="https://cdn.jsdelivr.net/npm/popper.js@1.16.1/dist/umd/popper.min.js"></script>
   <script src="https://cdn.jsdelivr.net/npm/bootstrap@4.6.2/dist/js/bootstrap.bundle.min.js"></script>
-
-  <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.6.3/jquery.min.js"></script>
+  <script src="https://cdn.jsdelivr.net/jquery.dirtyforms/2.0.0/jquery.dirtyforms.min.js"></script>
 
   <link rel="stylesheet" href="../styles/format.css">
   <script src="../javascript/load_accessibility.js"></script>
   <script src="../javascript/common.js" type="module"></script>
   <script src="../javascript/psdi-common.js" type="module"></script>
+  <script src="../javascript/convertato.js" type="module" language="JavaScript"></script>
 </head>
 
 <body marginwidth="0">
@@ -40,39 +42,44 @@
     </div>
   </div>
 
-  <form name="gui">
-    <div>
-      <p>
-        Click on 'Choose file' and then select an input file of the correct format (and extension). Clicking on
-        'Convert'
-        uploads and converts the file. The output file is automatically downloaded, along with a log file. If any issues
-        are
-        encountered (e.g., the output file does not download), please click on 'Provide Feedback' in the navigation bar.
-      </p>
-      <h6 id="heading"></h6>
-      <p id="convertFile">
-        <input type="checkbox" checked id="extCheck"> Enforce file naming checking to ensure uploaded files (and files
-        contained in archives) all have the correct extension<br>
-        <input type="checkbox" id="requestLog"> Also download log file for the conversion<br>
-        Select file to convert:
-        <br><input type="file" name="fileToUpload" id="fileToUpload"><br>
-        If you have sensitive data you might prefer to use
-        <a href="download.htm">one of our downloadable tools or Python library</a> rather than uploading your data to
-        our service.<br>
-        <span class="convert-button-and-spinner">
-          <input type="button" class="button init-disabled" value=" Convert " name="uploadButton" id="uploadButton"
-            disabled=true>
-          <span class="loading-spinner spinner-border"></span>
-        </span>
-      </p>
+  <form name="gui" class="gui">
+    <div class="max-width-box">
+      <div>
+        <a href="../../">
+          <input type="button" class="button" value=" ← Return to Format Selection " name="returnHome" id="returnHome">
+        </a>
+        <br>
+        <br>
+        <p>
+          Click on 'Choose file' and then select an input file of the correct format (and extension). Clicking on
+          'Convert' uploads and converts the file. The output file is automatically downloaded, along with a log file.
+          If any issues are encountered (e.g., the output file does not download), please click on 'Provide Feedback' in
+          the navigation bar.
+        </p>
+        <h6 id="heading"></h6>
+        <p id="convertFile">
+          <input type="checkbox" checked id="extCheck"> Enforce file naming checking to ensure uploaded files (and files
+          contained in archives) all have the correct extension<br>
+          <input type="checkbox" id="requestLog"> Also download log file for the conversion<br>
+          Select file to convert<span class="max-file-size"></span>:
+          <br>
+          <input type="file" name="fileToUpload" id="fileToUpload">
+          <input type="button" class="button" value=" Clear Uploaded File " name="clearUpload" id="clearUpload">
+          <br>
+          If you have sensitive data you might prefer to use
+          <a href="download.htm">one of our downloadable tools or Python library</a> rather than uploading your data to
+          our service.<br>
+          <span class="convert-button-and-spinner">
+            <input type="button" class="button init-disabled" value=" Convert " name="uploadButton" id="uploadButton"
+              disabled=true>
+            <span class="loading-spinner spinner-border"></span>
+          </span>
+        </p>
+      </div>
+      <div class="largeGap"></div>
     </div>
-    <div class="largeGap"></div>
   </form>
 
-  <script src="https://code.jquery.com/jquery-3.7.1.js" integrity="sha256-eKhayi8LEQwp4NKxN+CfCh+3qOVUtJn3QNZ0TciWLP4="
-    crossorigin="anonymous"></script>
-  <script src="../javascript/convertato.js" type="module" language="JavaScript"></script>
-
   <footer class="footer" id="psdi-footer"></footer>
 
 </body>

psdi_data_conversion/static/content/convertc2x.htm

@@ -16,16 +16,18 @@
   <link href="https://fonts.googleapis.com/css?family=Open+Sans+Condensed:700" rel="stylesheet" type="text/css">
 
   <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.6.2/dist/css/bootstrap.min.css">
-  <script src="https://cdn.jsdelivr.net/npm/jquery@3.7.1/dist/jquery.slim.min.js"></script>
+
+  <script src="https://code.jquery.com/jquery-3.7.1.js" integrity="sha256-eKhayi8LEQwp4NKxN+CfCh+3qOVUtJn3QNZ0TciWLP4="
+    crossorigin="anonymous"></script>
   <script src="https://cdn.jsdelivr.net/npm/popper.js@1.16.1/dist/umd/popper.min.js"></script>
   <script src="https://cdn.jsdelivr.net/npm/bootstrap@4.6.2/dist/js/bootstrap.bundle.min.js"></script>
-
-  <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.6.3/jquery.min.js"></script>
+  <script src="https://cdn.jsdelivr.net/jquery.dirtyforms/2.0.0/jquery.dirtyforms.min.js"></script>
 
   <link rel="stylesheet" href="../styles/format.css">
   <script src="../javascript/load_accessibility.js"></script>
   <script src="../javascript/common.js" type="module"></script>
   <script src="../javascript/psdi-common.js" type="module"></script>
+  <script src="../javascript/convertc2x.js" type="module" language="JavaScript"></script>
 </head>
 
 <body marginwidth="0">
@@ -41,39 +43,44 @@
     </div>
   </div>
 
-  <form name="gui">
-    <div>
-      <p>
-        Click on 'Choose file' and then select an input file of the correct format (and extension). Clicking on
-        'Convert'
-        uploads and converts the file. The output file is automatically downloaded, along with a log file. If any issues
-        are
-        encountered (e.g., the output file does not download), please click on 'Provide Feedback' in the navigation bar.
-      </p>
-      <h6 id="heading"></h6>
-      <p id="convertFile">
-        <input type="checkbox" checked id="extCheck"> Enforce file naming checking to ensure uploaded files (and files
-        contained in archives) all have the correct extension<br>
-        <input type="checkbox" id="requestLog"> Also download log file for the conversion<br>
-        Select file to convert:
-        <br><input type="file" name="fileToUpload" id="fileToUpload"><br>
-        If you have sensitive data you might prefer to use
-        <a href="download.htm">one of our downloadable tools or Python library</a> rather than uploading your data to
-        our service.<br>
-        <span class="convert-button-and-spinner">
-          <input type="button" class="button init-disabled" value=" Convert " name="uploadButton" id="uploadButton"
-            disabled=true>
-          <span class="loading-spinner spinner-border"></span>
-        </span>
-      </p>
+  <form name="gui" class="gui">
+    <div class="max-width-box">
+      <div>
+        <a href="../../">
+          <input type="button" class="button" value=" ← Return to Format Selection " name="returnHome" id="returnHome">
+        </a>
+        <br>
+        <br>
+        <p>
+          Click on 'Choose file' and then select an input file of the correct format (and extension). Clicking on
+          'Convert' uploads and converts the file. The output file is automatically downloaded, along with a log file.
+          If any issues are encountered (e.g., the output file does not download), please click on 'Provide Feedback' in
+          the navigation bar.
+        </p>
+        <h6 id="heading"></h6>
+        <p id="convertFile">
+          <input type="checkbox" checked id="extCheck"> Enforce file naming checking to ensure uploaded files (and files
+          contained in archives) all have the correct extension<br>
+          <input type="checkbox" id="requestLog"> Also download log file for the conversion<br>
+          Select file to convert<span class="max-file-size"></span>:
+          <br>
+          <input type="file" name="fileToUpload" id="fileToUpload">
+          <input type="button" class="button" value=" Clear Uploaded File " name="clearUpload" id="clearUpload">
+          <br>
+          If you have sensitive data you might prefer to use
+          <a href="download.htm">one of our downloadable tools or Python library</a> rather than uploading your data to
+          our service.<br>
+          <span class="convert-button-and-spinner">
+            <input type="button" class="button init-disabled" value=" Convert " name="uploadButton" id="uploadButton"
+              disabled=true>
+            <span class="loading-spinner spinner-border"></span>
+          </span>
+        </p>
+      </div>
+      <div class="largeGap"></div>
     </div>
-    <div class="largeGap"></div>
   </form>
 
-  <script src="https://code.jquery.com/jquery-3.7.1.js" integrity="sha256-eKhayi8LEQwp4NKxN+CfCh+3qOVUtJn3QNZ0TciWLP4="
-    crossorigin="anonymous"></script>
-  <script src="../javascript/convertc2x.js" type="module" language="JavaScript"></script>
-
   <footer class="footer" id="psdi-footer"></footer>
 
 </body>

psdi_data_conversion/static/content/documentation.htm

@@ -13,8 +13,11 @@
   <link href="https://fonts.googleapis.com/css?family=Lato:400" rel="stylesheet" type="text/css">
   <link href="https://fonts.googleapis.com/css?family=Open+Sans+Condensed:700" rel="stylesheet" type="text/css">
   <link rel="stylesheet" href="../styles/format.css">
+
+  <script src="https://code.jquery.com/jquery-3.7.1.js" integrity="sha256-eKhayi8LEQwp4NKxN+CfCh+3qOVUtJn3QNZ0TciWLP4="
+    crossorigin="anonymous"></script>
+
   <script src="../javascript/load_accessibility.js"></script>
-  <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.6.3/jquery.min.js"></script>
   <script src="../javascript/common.js" type="module"></script>
   <script src="../javascript/psdi-common.js" type="module"></script>
 </head>
@@ -85,9 +88,6 @@
     </div>
   </form>
 
-  <script src="https://code.jquery.com/jquery-3.7.1.js" integrity="sha256-eKhayi8LEQwp4NKxN+CfCh+3qOVUtJn3QNZ0TciWLP4="
-    crossorigin="anonymous"></script>
-
   <footer class="footer" id="psdi-footer"></footer>
 
 </body>

psdi_data_conversion/static/content/download.htm

@@ -13,8 +13,11 @@
   <link href="https://fonts.googleapis.com/css?family=Lato:400" rel="stylesheet" type="text/css">
   <link href="https://fonts.googleapis.com/css?family=Open+Sans+Condensed:700" rel="stylesheet" type="text/css">
   <link rel="stylesheet" href="../styles/format.css">
+
+  <script src="https://code.jquery.com/jquery-3.7.1.js" integrity="sha256-eKhayi8LEQwp4NKxN+CfCh+3qOVUtJn3QNZ0TciWLP4="
+    crossorigin="anonymous"></script>
+
   <script src="../javascript/load_accessibility.js"></script>
-  <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.6.3/jquery.min.js"></script>
   <script src="../javascript/common.js" type="module"></script>
   <script src="../javascript/psdi-common.js" type="module"></script>
 </head>
@@ -40,6 +43,8 @@
         Python library.
       </p>
 
+      <h2>Installation</h2>
+
       <h3>Install via pip</h3>
 
       <ul>
@@ -60,12 +65,6 @@
         Python library.
       </p>
 
-      <p>
-        If you do wish to run the local version of this webpage, you'll need to create a helper script to set up the
-        proper parameters and start the server. See the README provided on the front page of this project's PyPI page,
-        linked above, for the source of this helper script, which you can paste and use locally.
-      </p>
-
       <h3>Source Code</h3>
 
       <ul>
@@ -83,11 +82,28 @@
         for other possible optional dependencies sets that can be installed.
       </p>
 
-      <p>When installed in this manner, the helper script to run the local webpage is provided in the root directory
-        of the repository as <code class="secondary">run_local.sh</code>. It can be run from this directory, copied to
-        your <code class="secondary">$PATH</code>, or aliased as desired.
+      <h2>Use</h2>
+
+      <p>
+        Once installed, the project can be used in one of three ways:
       </p>
 
+      <ul>
+        <li><strong>Local Gui:</strong> Run the script <code class="secondary">psdi-data-convert-gui</code> to start the
+          server. Append the <code class="secondary">--help</code> option for to see optional arguments (generally not
+          required for end-users)
+        </li>
+        <li><strong>Command-Line Application:</strong> Run the script <code class="secondary">psdi-data-convert</code>
+          to use the application at the command-line. Append the <code class="secondary">--help</code> option to see
+          arguments for it, and/or find documentation in the project's README.
+        </li>
+        <li><strong>Python Library:</strong> Within a Python script, library, or terminal, the project can be imported
+          via <code class="secondary">import psdi_data_conversion</code>, with the most useful function being <code
+            class="secondary">psdi_data_conversion.converter.run_converter</code> - see the <code
+            class="secondary">help()</code> of this function and/or find documentation in the project's README.
+        </li>
+      </ul>
+
       <h2>Documentation</h2>
 
       <ul>

psdi_data_conversion/static/content/feedback.htm

@@ -13,8 +13,11 @@
   <link href="https://fonts.googleapis.com/css?family=Lato:400" rel="stylesheet" type="text/css">
   <link href="https://fonts.googleapis.com/css?family=Open+Sans+Condensed:700" rel="stylesheet" type="text/css">
   <link rel="stylesheet" href="../styles/format.css">
+
+  <script src="https://code.jquery.com/jquery-3.7.1.js" integrity="sha256-eKhayi8LEQwp4NKxN+CfCh+3qOVUtJn3QNZ0TciWLP4="
+    crossorigin="anonymous"></script>
+
   <script src="../javascript/load_accessibility.js"></script>
-  <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.6.3/jquery.min.js"></script>
   <script src="../javascript/common.js" type="module"></script>
   <script src="../javascript/psdi-common.js" type="module"></script>
 </head>
@@ -44,9 +47,6 @@
     </div>
   </form>
 
-  <script src="https://code.jquery.com/jquery-3.7.1.js" integrity="sha256-eKhayi8LEQwp4NKxN+CfCh+3qOVUtJn3QNZ0TciWLP4="
-    crossorigin="anonymous"></script>
-
   <footer class="footer" id="psdi-footer"></footer>
 
 </body>

psdi_data_conversion/static/content/index-versions/psdi-common-header.html

@@ -16,7 +16,7 @@
     </div>
   </div>
   <div class="navbar__items navbar__items--right">
-    <!-- This file contains the links that will appear in the top-right of the header bar for .html files in the index.htm page. --> <a href="./" class="navbar__item navbar__link">Home</a> <a href="static/content/report.htm" class="navbar__item navbar__link">Report Missing Format/Conversion</a> <a href="static/content/feedback.htm" class="navbar__item navbar__link">Provide Feedback</a> <a href="static/content/documentation.htm" class="navbar__item navbar__link">Documentation</a> <a href="static/content/accessibility.htm" class="navbar__item navbar__link">Accessibility</a> <a href="mailto: psdi@soton.ac.uk" class="navbar__item navbar__link" id="mail">Contact</a>
+    <!-- This file contains the links that will appear in the top-right of the header bar for .html files in the index.htm page. --> <a href="./" class="navbar__item navbar__link">Home</a> <a href="static/content/report.htm" class="navbar__item navbar__link">Report Missing Format/Conversion</a> <a href="static/content/feedback.htm" class="navbar__item navbar__link">Provide Feedback</a> <a href="static/content/documentation.htm" class="navbar__item navbar__link">Documentation</a> <a href="static/content/download.htm" class="navbar__item navbar__link service-only">Download</a> <a href="static/content/accessibility.htm" class="navbar__item navbar__link">Accessibility</a> <a href="mailto: psdi@soton.ac.uk" class="navbar__item navbar__link" id="mail">Contact</a>
     <button class="clean-btn color-mode-toggle" title="Switch between dark and light mode"
       aria-label="Lightmode/darkmode toggle button">
       <img src="static/img/colormode-toggle-lm.svg" alt="Lightmode toggle icon"

psdi_data_conversion/static/content/psdi-common-header.html

@@ -16,7 +16,7 @@
     </div>
   </div>
   <div class="navbar__items navbar__items--right">
-    <!-- This file contains the links that will appear in the top-right of the header bar for .html files in this directory. --> <a href="../../" class="navbar__item navbar__link">Home</a> <a href="report.htm" class="navbar__item navbar__link">Report Missing Format/Conversion</a> <a href="feedback.htm" class="navbar__item navbar__link">Provide Feedback</a> <a href="documentation.htm" class="navbar__item navbar__link">Documentation</a> <a href="accessibility.htm" class="navbar__item navbar__link">Accessibility</a> <a href="mailto:support@psdi.ac.uk" class="navbar__item navbar__link" id="mail">Contact Us</a>
+    <!-- This file contains the links that will appear in the top-right of the header bar for .html files in this directory. --> <a href="../../" class="navbar__item navbar__link">Home</a> <a href="report.htm" class="navbar__item navbar__link">Report Missing Format/Conversion</a> <a href="feedback.htm" class="navbar__item navbar__link">Provide Feedback</a> <a href="documentation.htm" class="navbar__item navbar__link">Documentation</a> <a href="download.htm" class="navbar__item navbar__link service-only">Download</a> <a href="accessibility.htm" class="navbar__item navbar__link">Accessibility</a> <a href="mailto:support@psdi.ac.uk" class="navbar__item navbar__link" id="mail">Contact Us</a>
     <button class="clean-btn color-mode-toggle" title="Switch between dark and light mode"
       aria-label="Lightmode/darkmode toggle button">
       <img src="../img/colormode-toggle-lm.svg" alt="Lightmode toggle icon"

psdi_data_conversion/static/content/report.htm

@@ -13,10 +13,16 @@
   <link href="https://fonts.googleapis.com/css?family=Lato:400" rel="stylesheet" type="text/css">
   <link href="https://fonts.googleapis.com/css?family=Open+Sans+Condensed:700" rel="stylesheet" type="text/css">
   <link rel="stylesheet" href="../styles/format.css">
+
+  <script src="https://code.jquery.com/jquery-3.7.1.js" integrity="sha256-eKhayi8LEQwp4NKxN+CfCh+3qOVUtJn3QNZ0TciWLP4="
+    crossorigin="anonymous"></script>
+  <script src="https://cdn.jsdelivr.net/jquery.dirtyforms/2.0.0/jquery.dirtyforms.min.js"></script>
+
   <script src="../javascript/load_accessibility.js"></script>
-  <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.6.3/jquery.min.js"></script>
   <script src="../javascript/common.js" type="module"></script>
   <script src="../javascript/psdi-common.js" type="module"></script>
+  <script src="../javascript/report.js" type="module" language="JavaScript"></script>
+
 </head>
 
 <body marginwidth="0">
@@ -32,7 +38,7 @@
     </div>
   </div>
 
-  <form name="gui" class="service-only">
+  <form name="gui" class="gui service-only">
     <div class="max-width-box">
       <p>Select the type of report (missing file format or conversion) and then follow the instructions that appear.
       <p><b>Finally:</b> click on 'Report.'</p><br>
@@ -81,7 +87,7 @@
     </div>
   </form>
 
-  <form name="gui" class="local-only">
+  <form name="gui" class="gui local-only">
     <div class="max-width-box">
       <div class="smallGap"></div>
       <p>
@@ -93,10 +99,6 @@
     </div>
   </form>
 
-  <script src="https://code.jquery.com/jquery-3.7.1.js" integrity="sha256-eKhayi8LEQwp4NKxN+CfCh+3qOVUtJn3QNZ0TciWLP4="
-    crossorigin="anonymous"></script>
-  <script src="../javascript/report.js" type="module" language="JavaScript"></script>
-
   <footer class="footer" id="psdi-footer"></footer>
 
 </body>

psdi_data_conversion/static/javascript/common.js

@@ -4,6 +4,26 @@
  * @author Bryan Gillis
  */
 
+export function initDirtyForms() {
+  $("form.gui").dirtyForms();
+}
+
+export function cleanDirtyForms() {
+  $('form.gui').dirtyForms('setClean');
+}
+
+export function dirtyDirtyForms() {
+  $('form.gui').dirtyForms('setDirty');
+}
+
+export function enableDirtyForms() {
+  $('form.gui').removeClass($.DirtyForms.ignoreClass);
+}
+
+export function disableDirtyForms() {
+  $('form.gui').addClass($.DirtyForms.ignoreClass);
+}
+
 
 /**
  * Gets whether or not the app is operating in "Service mode"

psdi_data_conversion/static/javascript/convert.js

@@ -10,14 +10,13 @@ import { getInputFlags, getOutputFlags, getInputArgFlags, getOutputArgFlags } fr
 import { commonConvertReady, convertFile, getExtCheck, splitArchiveExt, isArchiveExt } from "./convert_common.js"
 
 var token = "",
-    max_file_size = 0,
     in_ext = "",
     out_ext = "",
     in_str = "",
     out_str = "";
 
 $(document).ready(function () {
-    [token, max_file_size, in_str, in_ext, out_str, out_ext] = commonConvertReady("Open Babel");
+    [token, in_str, in_ext, out_str, out_ext] = commonConvertReady("Open Babel");
 
     $('input[name="coordinates"]').change(coordOptionAvailability);
     $("#uploadButton").click(submitFile);