Merge pull request #1070 from camicroscope/fix-port-xml

Fix port xml

Author: birm

apps/port/import.html

@@ -22,25 +22,25 @@ <h1 class="h1">Import Annotations</h1>
     <h3 class="h">Info</h3>
   <br>
     <div class="slide" >
-      <input type="text"  name="slide_id" placeholder="Slide Id:"><br>
+      <input type="text"  name="slide_id" id="slide_id" placeholder="Slide Id:"><br>
     </div>
     <br>
     <div class="slide">
-      <input type="text" name="annot_name" placeholder="Annotation Name:"><br>
+      <input type="text" name="annot_name" id="annot_name" placeholder="Annotation Name:"><br>
     </div>
     <h3 class="h2">File Contents</h3>
     <div class="slide">
-      <textarea name="input" class="slide" rows="5" cols="75" placeholder="Input Here"></textarea><br>
+      <textarea name="input" class="slide" id="xml_in" rows="5" cols="75" placeholder="Input Here"></textarea><br>
     </div>
     <br>
     <div class="btns">
       <button id="convert_btn btn1" class="buttons" onclick="xml2geo()" type="button">Convert from XML</button>
       <button id="prepare_btn btn2" class="buttons" onclick="prepareAnnot()" type="button">Prepare JSON</button>
     </div>
     <br>
-      <textarea name="input" class="slide" rows="5" cols="75" placeholder="Output:"></textarea><br>
+      <textarea name="input" class="slide" id="output" rows="5" cols="75" placeholder="Output:"></textarea><br>
       <button id="post_btn" class="buttons btnn" onclick="saveAnnot()" type="button">Post</button>
   </div>
 </body>
 
-</html>
+</html>

apps/port/import.js

@@ -2,7 +2,7 @@ const store = new Store('../../data');
 
 function prepareAnnot() {
   try {
-    let output = JSON.parse(document.getElementById('input'));
+    let output = JSON.parse(document.getElementById('input').value);
     output['provenance']['image']['slide'] = document.getElementById('slide_id').value;
     output['provenance']['analysis']['execution'] = document.getElementById('annot_name').value;
     output['properties']['annotations']['name'] = document.getElementById('annot_name').value;
@@ -14,7 +14,7 @@ function prepareAnnot() {
 
 function saveAnnot() {
   try {
-    let doc = JSON.parse(document.getElementById('output'));
+    let doc = JSON.parse(document.getElementById('output').value);
   } catch (e) {
     alert(e);
   }