csvs and citations

3 files changed, 38 insertions, 15 deletions

diff --git a/client/index.js b/client/index.js
index 109d2c27..86bc8979 100644
--- a/client/index.js
+++ b/client/index.js
@@ -46,32 +46,47 @@ function appendApplets(applets) {
 
 function runApplets() {
   const applets = toArray(document.querySelectorAll('.applet')).map(el => {
-    console.log(el.dataset.payload)
+    // console.log(el.dataset.payload)
     let payload
     try {
       payload = JSON.parse(el.dataset.payload)
+      console.log(payload)
     } catch (e) {
       return null
     }
-    console.log(payload)
     let cmdPartz = payload.command.split(" ")
     let cmd = cmdPartz.shift()
     let dataset = null
+    let url = null
+    let opt = null
     payload.cmd = cmd
-    payload.parts = cmdPartz
-    if (payload.parts.length) {
-      dataset = payload.parts[0].trim()
+    payload.partz = cmdPartz
+    if (payload.partz.length) {
+      opt = payload.partz.shift().trim()
+      if (opt.indexOf('http') === 0) {
+        dataset = null
+        url = opt
+      } else if (opt.indexOf('assets') === 0) {
+        url = 'https://nyc3.digitaloceanspaces.com/megapixels/v1' + window.location.pathname + opt
+        dataset = null
+        // console.log(url)
+      } else {
+        dataset = opt
+        url = null
+      }
     }
-    if (!dataset) {
+    if (!dataset && !url) {
       const path = window.location.pathname.split('/').filter(s => !!s)
       if (path.length) {
         dataset = path[path.length - 1]
+        // console.log('dataset from path:', dataset)
       } else {
         console.log('couldnt determine citations dataset')
         return null
       }
     }
     payload.dataset = dataset
+    payload.url = url
     return [el, payload]
   }).filter(a => !!a)
   const withDataset = applets.map(a => a[1].dataset ? a[1] : null).filter(a => !!a)
diff --git a/client/map/index.js b/client/map/index.js
index 15153a90..788894f9 100644
--- a/client/map/index.js
+++ b/client/map/index.js
@@ -2,7 +2,7 @@ import L from 'leaflet'
 import './leaflet.bezier'
 
 function getCitations(dataset) {
-  console.log(dataset.citations)
+  // console.log(dataset.citations)
   return dataset.citations.map(c => ({
     title: c[0],
     location: c[2],
diff --git a/client/tables.js b/client/tables.js
index 4a6c666f..a30abc32 100644
--- a/client/tables.js
+++ b/client/tables.js
@@ -16,13 +16,14 @@ const citationsColumns = [
 ]
 
 function getColumns(payload) {
-  if (payload.cmd === 'citations') {
+  let { cmd, url, fields } = payload
+  if (cmd === 'citations') {
     return citationsColumns
   }
-  if (payload.opt.match('datasets.csv')) {
+  if (url && url.match('datasets.csv')) {
     return datasetColumns
   }
-  return (payload.fields || '').split(', ').map(field => {
+  return ((fields && fields.length) ? fields[0] : '').split(', ').map(field => {
     switch (field) {
       default:
         return { title: field, field: field.toLowerCase(), sorter: 'string' }
@@ -39,8 +40,8 @@ function getCitations(dataset) {
 }
 
 export default function append(el, payload) {
-  let url = payload.opt
   const columns = getColumns(payload)
+  console.log(columns)
   const table = new Tabulator(el, {
     height: '311px',
     layout: 'fitColumns',
@@ -50,18 +51,25 @@ export default function append(el, payload) {
   // let path = payload.opt
   // console.log(path, columns)
 
+  console.log(payload.cmd, payload.url, payload.dataset)
   if (payload.cmd === 'citations') {
     let { data } = payload
     const citations = getCitations(data)
     console.log(citations)
     table.setData(citations)
   } else {
-    fetch(url, { mode: 'cors' })
+    fetch(payload.url, { mode: 'cors' })
       .then(r => r.text())
       .then(text => {
-        const data = csv.toJSON(text, { headers: { included: true } })
-        console.log(data)
-        table.setData(data)
+        try {
+          const data = csv.toJSON(text, { headers: { included: true } })
+          // console.log(data)
+          table.setData(data)
+        } catch (e) {
+          console.error("error parsing json:", payload.url)
+          console.error(e)
+          // console.log(text)
+        }
       })
   }
 }