Merge branch 'ann'

Author: hmsklee

dist/tag/js/tag.min.js

@@ -148,7 +148,6 @@
       <p><input type="checkbox" data-option="tree"> Open tree view in modal</p>
     </div>
   </div>
-
 </div>
 
 <script src="dist/tag/js/tag.min.js"></script>

index.html

@@ -210,6 +210,7 @@ label[for="file-input"] {
   pointer-events:none;
   opacity:0.5;
 }
+
 #taxonomy input.colorpicker:focus {
   border-color: white;
 }

src/css/app.css

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

src/js/main.js

@@ -10,8 +10,9 @@ class BratParser {
 /*
   @param textInput : Source text     or  input in standoff format
   @param annInput  : BRAT annotation or  {undefined}
+  @param evtInput  : event annotations or {undefined}
  */
-  parse(textInput, annInput) {
+  parse(textInput, annInput, evtInput) {
     var output = {
       texts: [],
       events: [],
@@ -33,6 +34,10 @@ class BratParser {
     } else {
       text = textInput;
       lines = annInput.split('\n');
+      if (evtInput) {
+        lines = lines.concat(
+          evtInput.split('\n'));
+      }
     }
 
     if (!text) {
@@ -133,7 +138,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),
@@ -238,7 +243,7 @@ class BratParser {
       trigger = tokens[1],
       args = tokens.slice(2);
 
-    if (id > 0 && trigger) {
+    if (id > 0 && trigger && args.length > 0) {
       let split = trigger.split(this.re);
       if (split[0].length > 0 && mentions[split[1]]) {
 
@@ -265,42 +270,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/ann.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,57 @@ class Parser {
       }
       return file.name;
     }
+    else if (files.length > 1) {
+      // find 2 or 3 files that match in name
+      files.sort((a, b) => a.name.localeCompare(b.name));
+
+      let matchingFiles = [];
+
+      let i = 0;
+      let iname = files[i].name.match(re);
+      for (let j = 1; j < files.length; ++j) {
+        let jname = files[j].name.match(re);
+        if (jname[1] && jname[0] === iname[0]) {
+          matchingFiles.push(files[i], files[j]);
+
+          let k = j + 1;
+          while (k < files.length) {
+            let kname = files[k].name.match(re);
+            if (kname[1] && kname[0] === iname[0]) {
+              matchingFiles.push(files[k]);
+            } else {
+              break;
+            }
+            ++k;
+          }
+          break;
+        }
+      }
+
+      // found matching files
+      if (matchingFiles.length === 2) {
+        // find text content
+        let text = matchingFiles.find(file => file.name.endsWith('.txt'));
+        let standoff = matchingFiles.find(file => !file.name.endsWith('.txt'));
+        this.parseText(text.content, standoff.content);
+      } else {
+        let text = matchingFiles.find(file => file.name.endsWith('.txt'));
+        let entities = matchingFiles.find(file => file.name.endsWith('.a1'));
+        let evts = matchingFiles.find(file => file.name.endsWith('.a2'));
+        if (text && evts && entities) {
+          this.parseText(text.content, entities.content, evts.content)
+        }
+      }
+    }
   }
 
   parseJson(data) {
     this.reach.parse(data);
     this.parsedData = this.reach.data;
   }
 
-  parseText(text) {
-    this.ann.parse(text);
+  parseText() {
+    this.ann.parse.apply(this.ann, arguments);
     this.parsedData = this.ann.data;
   }
 }