add drag and drop support for 2 files (.txt + .ann file)

Author: hmsklee

dist/tag/js/tag.min.js

@@ -33387,8 +33387,8 @@ var Main = function () {
     Promise.all(promises).then(function (files) {
       try {
         var message = parser.parseFiles(files);
+        redrawVisualization();
         if (message) {
-          redrawVisualization();
           printMessage(message);
         }
       } catch (err) {
@@ -34546,7 +34546,7 @@ var BratParser = function () {
             output.texts[tbm_i].tokenId = tokens.length - 1;
             ++tbm_i;
           }
-        } else if (text[ch] === ' ') {
+        } else if (/\s/.test(text[ch])) {
           if (token_start < ch) {
             tokens.push({
               word: text.slice(token_start, ch),
@@ -34715,8 +34715,8 @@ var BratParser = function () {
       }
     }
   }, {
-    key: 'parseAttributes',
-    value: function parseAttributes(tokens, mentions) {
+    key: 'parseAttribute',
+    value: function parseAttribute(tokens, mentions) {
       var id = +tokens[0].slice(1),
           attribute = tokens[1],
           target = tokens[2];
@@ -34758,6 +34758,8 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
+var re = /.*(?=\.(\S+))|.*/;
+
 var Parser = function () {
   function Parser() {
     _classCallCheck(this, Parser);
@@ -34781,10 +34783,11 @@ var Parser = function () {
 
       // get format from extension
       if (!format) {
-        var extension = path.slice(path.lastIndexOf('.'));
-        if (extension === '.json') {
+        var extension = path.toLowerCase().match(re)[1];
+
+        if (extension === 'json') {
           format = 'json';
-        } else if (extension === '.ann') {
+        } else {
           format = 'brat';
         }
       }
@@ -34812,6 +34815,42 @@ var Parser = function () {
           this.parseText(file.content);
         }
         return file.name;
+      } else if (files.length > 1) {
+        // find two files that match in name
+        files.sort(function (a, b) {
+          return a.name.localeCompare(b.name);
+        });
+
+        // file to check against
+        var i = 0;
+        var iname = files[i].name.match(re);
+
+        var annRe = /a/;
+        var txtRe = /s/;
+
+        for (var j = 1; j < files.length; ++j) {
+          var jname = files[j].name.match(re);
+          if (jname[1] && jname[1] !== 'txt' && jname[1] !== 'ann') {
+            // not a valid extension
+            ++i;
+            continue;
+          }
+
+          // check if name matches
+          if (jname[0] === iname[0]) {
+            if (iname[1] === 'ann' && jname[1] !== 'ann') {
+              this.parseText(files[j].content, files[i].content);
+              return;
+            } else if ((iname[1] === 'txt' || !iname[1]) && jname[1] === 'ann') {
+              this.parseText(files[i].content, files[j].content);
+              return;
+            }
+          }
+
+          // iterate to next file
+          ++i;
+          iname = jname;
+        }
       }
     }
   }, {
@@ -34822,8 +34861,8 @@ var Parser = function () {
     }
   }, {
     key: 'parseText',
-    value: function parseText(text) {
-      this.ann.parse(text);
+    value: function parseText(text, ann) {
+      this.ann.parse(text, ann);
       this.parsedData = this.ann.data;
     }
   }]);

src/js/main.js

@@ -266,8 +266,8 @@ const Main = (function() {
     Promise.all(promises).then(files => {
       try {
         let message = parser.parseFiles(files);
+        redrawVisualization();
         if (message) {
-          redrawVisualization();
           printMessage(message);
         }
       }

src/js/parse/ann.js

@@ -133,7 +133,7 @@ class BratParser {
           ++tbm_i;
         }
       }
-      else if (text[ch] === ' ') {
+      else if (/\s/.test(text[ch])) {
         if (token_start < ch) {
           tokens.push({
             word: text.slice(token_start, ch),
@@ -265,42 +265,42 @@ class BratParser {
   }
 
   parseRelationMention(tokens, mentions) {
-  const id = +tokens[0].slice(1),
-    label = tokens[1],
-    arg1 = tokens[2],
-    arg2 = tokens[3];
-
-  if (id > 0 && arg2) {
-    const split1 = arg1.split(this.re),
-      split2 = arg2.split(this.re);
-
-    if (mentions[split1[1]] && mentions[split2[1]]) {
-      return {
-        id: 'R' + id,
-        label,
-        arguments: [{
-          type: split1[0],
-          id: split1[1]
-        }, {
-          type: split2[0],
-          id: split2[1]
-        }]
-      };
+    const id = +tokens[0].slice(1),
+      label = tokens[1],
+      arg1 = tokens[2],
+      arg2 = tokens[3];
+
+    if (id > 0 && arg2) {
+      const split1 = arg1.split(this.re),
+        split2 = arg2.split(this.re);
+
+      if (mentions[split1[1]] && mentions[split2[1]]) {
+        return {
+          id: 'R' + id,
+          label,
+          arguments: [{
+            type: split1[0],
+            id: split1[1]
+          }, {
+            type: split2[0],
+            id: split2[1]
+          }]
+        };
+      }
     }
   }
-  }
 
-  parseAttributes(tokens, mentions) {
-  const id = +tokens[0].slice(1),
-    attribute = tokens[1],
-    target = tokens[2];
-
-  if (id > 0 && mentions[target]) {
-    return {
-      id,
-      target,
-      attribute,
-      value: tokens.slice(3).join(' ')
+  parseAttribute(tokens, mentions) {
+    const id = +tokens[0].slice(1),
+      attribute = tokens[1],
+      target = tokens[2];
+
+    if (id > 0 && mentions[target]) {
+      return {
+        id,
+        target,
+        attribute,
+        value: tokens.slice(3).join(' ')
       };
     }
   }

src/js/parse/parse.js

@@ -2,6 +2,8 @@ import ReachParser from './reach.js';
 import BratParser from './ann.js';
 import load from '../xhr.js';
 
+const re = /.*(?=\.(\S+))|.*/;
+
 class Parser {
   constructor() {
     /* output */
@@ -19,11 +21,12 @@ class Parser {
   loadFile(path, format) {
     // get format from extension
     if (!format) {
-      const extension = path.slice(path.lastIndexOf('.'));
-      if (extension === '.json') {
+      const extension = path.toLowerCase().match(re)[1];
+
+      if (extension === 'json') {
         format = 'json';
       }
-      else if (extension === '.ann') {
+      else {
         format = 'brat';
       }
     }
@@ -53,15 +56,51 @@ class Parser {
       }
       return file.name;
     }
+    else if (files.length > 1) {
+      // find two files that match in name
+      files.sort((a, b) => a.name.localeCompare(b.name));
+
+      // file to check against
+      let i = 0;
+      let iname = files[i].name.match(re);
+
+      let annRe = /a/;
+      let txtRe = /s/;
+
+      for (let j = 1; j < files.length; ++j) {
+        let jname = files[j].name.match(re);
+        if (jname[1] && jname[1] !== 'txt' && jname[1] !== 'ann') {
+          // not a valid extension
+          ++i;
+          continue;
+        }
+
+        // check if name matches
+        if (jname[0] === iname[0]) {
+          if (iname[1] === 'ann' && jname[1] !== 'ann') {
+            this.parseText(files[j].content, files[i].content);
+            return;
+          }
+          else if ((iname[1] === 'txt' || !iname[1]) && jname[1] === 'ann') {
+            this.parseText(files[i].content, files[j].content);
+            return;
+          }
+        }
+
+        // iterate to next file
+        ++i;
+        iname = jname;
+      }
+    }
   }
 
   parseJson(data) {
     this.reach.parse(data);
     this.parsedData = this.reach.data;
   }
 
-  parseText(text) {
-    this.ann.parse(text);
+  parseText(text, ann) {
+    this.ann.parse(text, ann);
     this.parsedData = this.ann.data;
   }
 }