Changeset 35772 for main/trunk/model-interfaces-dev

Timestamp:

2021-12-08T13:55:18+13:00 (2 years ago)

Author:

cstephen

Message:

Upgrade to support the new macroniser backend.
Fix chunk/asset resolution

Location:

main/trunk/model-interfaces-dev/atea/macron-restoration

Files:

• public/img (deleted)
• src/assets (added)
• src/assets/powerpoint_icon.webp (added)
• src/assets/word_icon.webp (added)
• src/components/DirectInput.vue (modified) (2 diffs)
• src/components/FileInput.vue (modified) (2 diffs)
• src/components/FileUpload.vue (modified) (1 diff)
• src/js/MacronRestorationModule.js (modified) (4 diffs)
• vue.config.js (modified) (1 diff)

main/trunk/model-interfaces-dev/atea/macron-restoration/src/components/DirectInput.vue

@@ -130 +130 @@
                 }
 
-                if (word.linebreak) {
-                    restored += this.normaliseLinebreak(word.linebreak);
+                if (word.linebreaks) {
+                    restored += this.normaliseLinebreak(word.linebreaks);
                 }
             }
@@ -187 +187 @@
         /**
          * Normalises a linebreak.
-         * @param {String} linebreak The linebreak sequence.
+         * @param {String} linebreakCount The linebreak sequence.
          */
-        normaliseLinebreak(linebreak) {
+        normaliseLinebreak(linebreakCount) {
             if (!this.normaliseLinebreaks) {
-                return linebreak;
-            }
-
-            const rCount = linebreak.split("\r").length - 1;
-            const nCount = linebreak.split("\n").length - 1;
-
-            if (rCount > 1) {
-                if (nCount > 0) {
-                    return "\r\n\r\n";
-                }
-
-                return "\r\r";
-            }
-            else if (nCount > 1) {
-                return "\n\n";
-            }
-
-            return linebreak;
+                return this.repeatString("\n", linebreakCount);
+            }
+
+            linebreakCount = Math.min(2, linebreakCount);
+            return this.repeatString("\n", linebreakCount);
+        },
+        repeatString(string, count) {
+            let result = "";
+
+            for (let i = 0; i < count; i++) {
+                result += string;
+            }
+
+            return result;
         }
     }

main/trunk/model-interfaces-dev/atea/macron-restoration/src/components/FileInput.vue

@@ -5 +5 @@
     <div v-for="(fileInfo, index) in fileInfos" :key="fileInfo.id">
         <div class="info-container">
-            <img class="icon-l" src="img/word_icon.ico" v-if="fileInfo.fileType === '.docx'" />
-            <img class="icon-l" src="img/powerpoint_icon.ico" v-else-if="fileInfo.fileType === '.pptx'" />
+            <img class="icon-l" src="../assets/word_icon.webp" v-if="fileInfo.fileType === '.docx'" />
+            <img class="icon-l" src="../assets/powerpoint_icon.webp" v-else-if="fileInfo.fileType === '.pptx'" />
             <span class="material-icons mdi-override" v-else>description</span>
 
@@ -85 +85 @@
     },
     mounted() {
-        this.$refs.formDownload.setAttribute("action", macronRestorer.queryUrl + "Download");
+        this.$refs.formDownload.setAttribute("action", macronRestorer.rootQueryUrl + "download");
     }
 }

main/trunk/model-interfaces-dev/atea/macron-restoration/src/components/FileUpload.vue

@@ -9 +9 @@
 
             <input ref="fileInput" type="file" @input="onFilesChanged"
-                accept="application/vnd.openxmlformats-officedocument.wordprocessingml.document,application/vnd.oasis.opendocument.text,text/plain,application/vnd.openxmlformats-officedocument.presentationml.presentation"
+                accept="application/vnd.openxmlformats-officedocument.wordprocessingml.document,application/vnd.oasis.opendocument.text,text/plain,application/vnd.openxmlformats-officedocument.presentationml.presentation,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
                 multiple :disabled="isMacronising" />
 

main/trunk/model-interfaces-dev/atea/macron-restoration/src/js/MacronRestorationModule.js

@@ -33 +33 @@
         /** @type {String} The URL to which query POST requests should be made. */
         if (process.env.NODE_ENV !== "production") {
-            this.queryUrl = "//localhost:8383/macron-restoration/jsp/servlet/";
+            this.rootQueryUrl = "//localhost:8383/gs3-macroniser/";
         }
         else {
-            this.queryUrl = "/macron-restoration/jsp/servlet/";
+            this.rootQueryUrl = "/gs3-macroniser/";
         }
     }
@@ -43 +43 @@
      * Performs a request to the macron restoration API to restore the given input text.
      * @param {String} input The input text to macronise
-     * @returns {Promise<{ w: String, macronised?: Boolean }>} The JSON response from the macron restoration API.
+     * @returns {Promise<{ w?: String, macronised?: Boolean, linebreaks?: Number }>} The JSON response from the macron restoration API.
      */
     async directMacronisation(input, preserveExistingMacrons) {
-        const queryUrl = this.queryUrl + "DirectInput";
+        const queryUrl = this.rootQueryUrl + "direct";
+
+        const formData = new FormData();
+        formData.append("fragment", input);
+        formData.append("preserveExistingMacrons", preserveExistingMacrons);
 
         try {
@@ -53 +57 @@
                 {
                     method: "POST",
-                    headers: {
-                        "Content-Type": "application/x-www-form-urlencoded"
-                    },
-                    body: `o=json&fragment=${input}&preserveExistingMacrons=${preserveExistingMacrons}`
+                    body: formData
                 }
             );
@@ -82 +83 @@
      */
     async fileMacronisation(file, preserveExistingMacrons) {
-        const queryUrl = this.queryUrl + "FileUpload";
+        const queryUrl = this.rootQueryUrl + "file";
         const formData = new FormData();
 

main/trunk/model-interfaces-dev/atea/macron-restoration/vue.config.js

@@ -5 +5 @@
  */
 module.exports = {
-    // publicPath: "interfaces/atea/macron-restoration/dist",
     filenameHashing: false, // Allows us to easily setup direct links to the bundles in macron-restoration.xsl. You may want to change this for production in order to help with caching
+    publicPath: process.env.NODE_ENV === 'production'
+        ? '/greenstone3/interfaces/atea/macron-restoration/dist'
+        : '/',
 
     chainWebpack: config => {