From 039143d27592e4c88449afd1de81f4dfe70adfcb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micka=C3=ABl=20V=C3=A9ril?= <mveril@irsamc.ups-tlse.fr>
Date: Mon, 30 Sep 2019 10:53:13 +0200
Subject: [PATCH] Use websiteFile

---
 content/onedataset.html | 15 ++++++++++-----
 static/scripts/data.js  |  5 ++++-
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/content/onedataset.html b/content/onedataset.html
index 3a9eb98e..f6c3f964 100644
--- a/content/onedataset.html
+++ b/content/onedataset.html
@@ -9,6 +9,7 @@ draft: false
     <script src="/scripts/getTextFromFile.js" type="text/javascript"></script>
     <script src="/scripts/trueTypeOf.js" type="text/javascript"></script>
     <script src="/scripts/noNan.js"></script>
+    <script src="/scripts/websiteFile.js"></script>
     <script src="https://cdn.rawgit.com/larsgw/citation.js/archive/citation.js/citation-0.4.0-9.js" type="text/javascript"></script>
     <script src="https://cdn.plot.ly/plotly-latest.min.js"></script>
      {{< getDataFilesName >}}
@@ -67,8 +68,6 @@ draft: false
         reload()
       }
       async function update_file(file) {
-        var lnk_file=document.getElementById('lnk_file');
-        lnk_file.setAttribute('href',String.raw`view?dataFile=${file}`);
         dat= await data.loadAsync(file);
         await applyData(dat);
       }
@@ -78,7 +77,7 @@ draft: false
         par.innerHTML='';
         var md=[];
         var els=[];
-        var customRenderingProp=["excitations"]
+        var customRenderingProp=["excitations","sourceFile"]
         for (const key of Object.keys(window.data)) {
           if (window.data[key]!=null){
             md.push(key)
@@ -87,6 +86,7 @@ draft: false
                 md.push([prop,window.data[key][prop]])
             }
             md.push(window.data[key].DOI)
+            md.push(window.data[key].sourceFile)
           }
         }
         div=document.getElementById("meta_div")
@@ -111,6 +111,12 @@ draft: false
               node.target='_blank'
               node.href=element.url       
               break
+            case "websiteFile":
+              node=document.createElement("a")
+              node.innerText="Go to file"
+              node.target='_blank'
+              node.href=element.viewerUrl
+              break
             case "Array":
               k=element[0]
               v=element[1]
@@ -210,5 +216,4 @@ draft: false
       <div id="abs_plot">
       </div>
     </div>
-    </p>
-    <a target="_blank" id='lnk_file'>Go to file</a>
\ No newline at end of file
+    </p>
\ No newline at end of file
diff --git a/static/scripts/data.js b/static/scripts/data.js
index c4794698..c45e486b 100644
--- a/static/scripts/data.js
+++ b/static/scripts/data.js
@@ -108,9 +108,12 @@ class dataFileBase {
     this.method = null
     this.excitations = []
     this.DOI = null
+    this.sourceFile=null
   }
   static async loadAsync(file) {
-    return this.loadString(await getTextFromFileAsync(getFullDataPath(file)));
+    var dat = this.loadString(await getTextFromFileAsync(getFullDataPath(file)));
+    dat.sourceFile=new websiteFile(file)
+    return dat
   }
   static readmetaPair(key, value, dat) {
     switch (key) {