From 9fed659758b2ad9449f955fe275f2def04f7bbab Mon Sep 17 00:00:00 2001
From: YaphetKG <kebedey@renci.org>
Date: Fri, 16 Feb 2024 12:28:33 -0500
Subject: [PATCH 1/8] download buttons

---
 index.html            |  6 ++++--
 src/ldf-client-ui.js  | 47 +++++++++++++++++++++++++++++++++++++++++--
 styles/ldf-client.css | 11 ++++++++++
 3 files changed, 60 insertions(+), 4 deletions(-)

diff --git a/index.html b/index.html
index c5e55af6..bf8dcac2 100644
--- a/index.html
+++ b/index.html
@@ -89,13 +89,15 @@ <h1><a href="#">Query the Web of Linked Data</a></h1>
         </li>
 
         <li>
-          <label>Query results</label>
+          <label class="padded-top">Query results</label>
           <div class="results"></div>
+          <div><button id="download_csv" class="download">Download CSV</button></div>
         </li>
 
         <li>
-          <label>Execution log</label>
+          <label class="padded-top">Execution log</label>
           <pre class="log"></pre>
+          <div><button id="download_log" class="download">Download Log</button></div>
         </li>
       </ul>
     </fieldset>
diff --git a/src/ldf-client-ui.js b/src/ldf-client-ui.js
index f9ac348e..61508684 100644
--- a/src/ldf-client-ui.js
+++ b/src/ldf-client-ui.js
@@ -93,6 +93,8 @@ if (typeof global.process === 'undefined')
           $element = this.element,
           $stop = this.$stop = $('.stop', $element),
           $start = this.$start = $('.start', $element),
+          $downloadCsv = this.$downloadCsv = $('#download_csv', $element),
+          $downloadLogs = this.$downloadCsv = $('#download_log', $element),
           $queryTexts = $('.querytext'),
           $queryContexts = $('.querycontext'),
           $queryResultsToTrees = $('.results-to-tree'),
@@ -111,7 +113,8 @@ if (typeof global.process === 'undefined')
           $showDetails = this.$showDetails = $('.details-toggle', $element),
           $proxyDefault = $('.proxy-default', $element);
       this.$details = $('.details', $element);
-
+      this.bindingResults = [];
+      this.logs = '';
       // Replace non-existing elements by an empty text box
       if (!$datasources.length) $datasources = this.$datasources = $('<select>');
       if (!$results.length) $results = $('<div>');
@@ -236,6 +239,10 @@ if (typeof global.process === 'undefined')
       $start.click(this._startExecution.bind(this));
       $stop.click(this._stopExecutionForcefully.bind(this));
 
+      // Download csv data
+      $downloadCsv.click(this._downloadCSV.bind(this));
+      $downloadLogs.click(this._downloadLog.bind(this));
+
       // Set up details toggling
       $showDetails.click(function () {
         self.$details.is(':visible') ? self._hideDetails() : self._showDetails();
@@ -680,6 +687,37 @@ if (typeof global.process === 'undefined')
       }
     },
 
+    _downloadCSV: function () {
+      if (!this._resultCount) return alert('Please execute a query to download');
+      else {
+        let csvContent = 'data:text/csv;charset=utf-8,';
+        let header = Object.keys(this.bindingResults[0]);
+        csvContent += [header].map(e => e.join(',')) + '\n';
+        this.bindingResults.forEach(function (v, i, a) {
+          let line = [];
+          header.forEach(function (h, i) {
+            line.push(v[h]);
+          });
+          csvContent += [line].map(e => e.join(',')) + '\n';
+        });
+        let encodedUri = encodeURI(csvContent);
+        window.open(encodedUri);
+      }
+    },
+    _downloadLog: function () {
+      let filename = 'execution.log';
+
+      let blob = new Blob([this.logs], { type: 'text/json' });
+      let e    = document.createEvent('MouseEvents');
+      let a    = document.createElement('a');
+
+      a.download = filename;
+      a.href = window.URL.createObjectURL(blob);
+      a.dataset.downloadurl =  ['text/json', a.download, a.href].join(':');
+      e.initMouseEvent('click', true, false, window, 0, 0, 0, 0, 0, false, false, false, false, 0, null);
+      a.dispatchEvent(e);
+    },
+
     // Starts query execution
     _startExecution: function () {
       var datasources = this.$datasources.val() || [];
@@ -694,6 +732,8 @@ if (typeof global.process === 'undefined')
       }
 
       // Clear results and log
+      this.bindingResults = [];
+      this.logs = [];
       this.$stop.show();
       this.$start.hide();
       this._resultsScroller.removeAll();
@@ -799,6 +839,7 @@ if (typeof global.process === 'undefined')
       // For SELECT queries, add the rows to the result
       case 'bindings':
         this._writeResult = function (row) {
+          this.bindingResults.push(row);
           this._resultsScroller.addContent([row]);
         };
         this._writeEnd = function () {
@@ -971,7 +1012,9 @@ if (typeof global.process === 'undefined')
         case 'queryInfo': return self._initResults(data.queryType);
         case 'result':    return self._addResult(data.result);
         case 'end':       return self._endResults();
-        case 'log':       return self._logAppender(data.log);
+        case 'log':
+          self.logs += data.log;
+          return self._logAppender(data.log);
         case 'error':     return this.onerror(data.error);
         case 'webIdName': return self._setWebIdName(data.name);
         }
diff --git a/styles/ldf-client.css b/styles/ldf-client.css
index c515a557..3637854d 100644
--- a/styles/ldf-client.css
+++ b/styles/ldf-client.css
@@ -706,3 +706,14 @@ li.search-choice-focus .search-choice-close {
 .extra-information.highlighted {
   background-color: grey;
 }
+
+button.download{
+  float: right;
+  display: block;
+  margin-right: 0;
+  margin-left: auto;
+}
+
+.padded-top {
+  padding-top: 10px;
+}
\ No newline at end of file

From 17fc65b0d86e555e92a0fca1b5f90c2f73345ce8 Mon Sep 17 00:00:00 2001
From: Harit <hpatel@renci.org>
Date: Wed, 3 Apr 2024 19:30:49 -0400
Subject: [PATCH 2/8] Add logic to dynamically choose the appropriate
 datasource under the hood

---
 settings.json        | 21 +++++++-----------
 src/ldf-client-ui.js | 52 ++++++++++++++++++++++++++++++++++----------
 2 files changed, 49 insertions(+), 24 deletions(-)

diff --git a/settings.json b/settings.json
index e94ebb3f..247846c2 100644
--- a/settings.json
+++ b/settings.json
@@ -21,24 +21,19 @@
   },
   "datasources": [
     {
-      "name": "FRINK Wikidata SPARQL",
-      "url": "https://frink.apps.renci.org/wikidata/sparql"
+      "name": "FRINK Wikidata",
+      "url": "https://frink.apps.renci.org/wikidata/sparql",
+      "multisource": "https://frink.apps.renci.org/ldf/wikidata"
     },
     {
-      "name": "FRINK Wikidata TPF",
-      "url": "https://frink.apps.renci.org/ldf/wikidata"
-    },
-    {
-      "name": "FRINK Ubergraph SPARQL",
-      "url": "https://frink.apps.renci.org/ubergraph/sparql"
-    },
-    {
-      "name": "FRINK Ubergraph TPF",
-      "url": "https://frink.apps.renci.org/ldf/ubergraph"
+      "name": "FRINK Ubergraph",
+      "url": "https://frink.apps.renci.org/ubergraph/sparql",
+      "multisource": "https://frink.apps.renci.org/ldf/ubergraph"
     },
     {
       "name": "KnowWhereGraph SPARQL",
-      "url": "sparql@https://stko-kwg.geog.ucsb.edu/sparql"
+      "url": "sparql@https://stko-kwg.geog.ucsb.edu/sparql",
+      "multisource": ""
     }
   ],
   "prefixes": {
diff --git a/src/ldf-client-ui.js b/src/ldf-client-ui.js
index 61508684..c825a09e 100644
--- a/src/ldf-client-ui.js
+++ b/src/ldf-client-ui.js
@@ -25,6 +25,9 @@ require('leaflet/dist/images/marker-icon.png');
 require('leaflet/dist/images/marker-icon-2x.png');
 require('leaflet/dist/images/marker-shadow.png');
 
+// Import datasource settings
+var settings = require('../settings.json');
+
 // Polyfill process for readable-stream when it is not defined
 if (typeof global.process === 'undefined')
   global.process = require('process');
@@ -145,12 +148,32 @@ if (typeof global.process === 'undefined')
         create_option_text: 'Add datasource',
       });
       $datasources.change(function () {
-        // Inherit the transience of the previous selected datasources
-        var newSelection = toHash($datasources.val(), 'persistent');
-        Object.keys(options.selectedDatasources).forEach(function (lastValue) {
-          if (lastValue in newSelection)
-            newSelection[lastValue] = options.selectedDatasources[lastValue];
-        });
+        // Check if multiple datasources are selected
+        var newSelection = {};
+        if ($datasources.val()?.length > 1) {
+          var multiDatasourceArray = [];
+          var urlsToRehash = [];
+
+          $datasources.val().forEach(function (url, index) {
+            var multiDatasourceUrl = settings.datasources.find(ds => ds.url === url).multisource;
+            multiDatasourceArray.push(multiDatasourceUrl);
+            if (url in options.selectedDatasources)
+              urlsToRehash.push(multiDatasourceUrl);
+          });
+
+          newSelection = toHash(multiDatasourceArray, 'persistent');
+        }
+        // When a single/no datasource is selected
+        else {
+          newSelection = toHash($datasources.val(), 'persistent');
+
+          // Inherit the transience of the previous selected datasources
+          Object.keys(options.selectedDatasources).forEach(function (lastValue) {
+            if (lastValue in newSelection)
+              newSelection[lastValue] = options.selectedDatasources[lastValue];
+          });
+        }
+
         self._setOption('selectedDatasources', newSelection);
       });
 
@@ -436,15 +459,22 @@ if (typeof global.process === 'undefined')
         $options.each(function (index) {
           if (index > 0) {
             var $option = $(this), url = $(this).val();
-            $option.prop('selected', url in selected);
+            $option.prop('selected', url in selected || settings.datasources.find(ds => ds.url === url).multisource in selected);
             $option.toggleClass('search-choice-transient', !!(url in selected && value[url] === 'transient'));
-            selected[url] = 'default';
+            if (url in selected)
+              selected[url] = 'default';
+            else if (settings.datasources.find(ds => ds.url === url).multisource in selected)
+              selected[settings.datasources.find(ds => ds.url === url).multisource] = 'default';
           }
         });
         // Add and select chosen datasources that were not in the list yet
         $datasources.append($.map(selected, function (exists, url) {
-          return exists === 'default' ? null :
-            $('<option>', { text: url, value: url, selected: true });
+          if (exists === 'default')
+            return null;
+          else {
+            var text = settings.datasources.find(ds => ds.multisource === url).name;
+            return $('<option>', { text: text, value: url, selected: true });
+          }
         })).trigger('chosen:updated');
         // Update the query set
         this._loadQueries(value);
@@ -754,7 +784,7 @@ if (typeof global.process === 'undefined')
       // Let the worker execute the query
       var context = {
         ...this._getQueryContext(),
-        sources: datasources.map(function (datasource) {
+        sources: Object.keys(this.options.selectedDatasources).map(function (datasource) {
           var type;
           var posAt = datasource.indexOf('@');
           if (posAt > 0) {

From 876aa5ba0dc72c351ea19caec13e3b87ebc13cd1 Mon Sep 17 00:00:00 2001
From: YaphetKG <kebedey@renci.org>
Date: Wed, 10 Apr 2024 10:51:50 -0400
Subject: [PATCH 3/8] adding csv stream

---
 src/ldf-client-ui.js     | 61 +++++++++++++++++++++++++++++++---------
 src/ldf-client-worker.js | 49 +++++++++++++++++++++++++++++++-
 2 files changed, 95 insertions(+), 15 deletions(-)

diff --git a/src/ldf-client-ui.js b/src/ldf-client-ui.js
index c825a09e..6f17e63d 100644
--- a/src/ldf-client-ui.js
+++ b/src/ldf-client-ui.js
@@ -718,21 +718,54 @@ if (typeof global.process === 'undefined')
     },
 
     _downloadCSV: function () {
-      if (!this._resultCount) return alert('Please execute a query to download');
-      else {
-        let csvContent = 'data:text/csv;charset=utf-8,';
-        let header = Object.keys(this.bindingResults[0]);
-        csvContent += [header].map(e => e.join(',')) + '\n';
-        this.bindingResults.forEach(function (v, i, a) {
-          let line = [];
-          header.forEach(function (h, i) {
-            line.push(v[h]);
-          });
-          csvContent += [line].map(e => e.join(',')) + '\n';
-        });
-        let encodedUri = encodeURI(csvContent);
-        window.open(encodedUri);
+      // Let the worker execute the query
+      var context = {
+        ...this._getQueryContext(),
+        sources: Object.keys(this.options.selectedDatasources).map(function (datasource) {
+          var type;
+          var posAt = datasource.indexOf('@');
+          if (posAt > 0) {
+            type = datasource.substr(0, posAt);
+            datasource = datasource.substr(posAt + 1, datasource.length);
+          }
+          datasource = resolve(datasource, window.location.href);
+          return { type: type, value: datasource };
+        }),
+      };
+      var prefixesString = '';
+      if (this.options.queryFormat === 'sparql') {
+        for (var prefix in this.options.prefixes)
+          prefixesString += 'PREFIX ' + prefix + ': <' + this.options.prefixes[prefix] + '>\n';
       }
+      var query = prefixesString + this.$queryTextsIndexed[this.options.queryFormat].val();
+      this._queryWorker.postMessage({
+        type: 'querycsv',
+        query: query,
+        context: context,
+        resultsToTree: this.options.resultsToTree,
+      });
+      //
+      //   this._queryWorker.postMessage({
+      //   type: 'querycsv',
+      //   query: query,
+      //   context: context,
+      //   resultsToTree: this.options.resultsToTree,
+      // });
+      // if (!this._resultCount) return alert('Please execute a query to download');
+      // else {
+      //   let csvContent = 'data:text/csv;charset=utf-8,';
+      //   let header = Object.keys(this.bindingResults[0]);
+      //   csvContent += [header].map(e => e.join(',')) + '\n';
+      //   this.bindingResults.forEach(function (v, i, a) {
+      //     let line = [];
+      //     header.forEach(function (h, i) {
+      //       line.push(v[h]);
+      //     });
+      //     csvContent += [line].map(e => e.join(',')) + '\n';
+      //   });
+      //   let encodedUri = encodeURI(csvContent);
+      //   window.open(encodedUri);
+      // }
     },
     _downloadLog: function () {
       let filename = 'execution.log';
diff --git a/src/ldf-client-worker.js b/src/ldf-client-worker.js
index 606ba327..258912d2 100644
--- a/src/ldf-client-worker.js
+++ b/src/ldf-client-worker.js
@@ -36,8 +36,56 @@ function initEngine(config) {
     config.context.queryFormat = { language: config.context.queryFormat };
 }
 
+
+
+
+
+
+
+
+
 // Handlers of incoming messages
 var handlers = {
+
+  querycsv: function (config) {
+    initEngine(config);
+    config.context.log = logger;
+    engine.query(config.query, config.context).then(async function (result){
+      const { data } = await engine.resultToString(result, "text/csv");
+      if (result.resultType === 'bindings') {
+
+        const decoder = new TextDecoder("utf-8");
+        const queuingStrategy = new CountQueuingStrategy({ highWaterMark: 1 });
+        let result = "";
+        const writableStream = new WritableStream(
+          {
+            // Implement the sink
+            write(chunk) {
+              return new Promise((resolve, reject) => {
+                const buffer = new ArrayBuffer(1);
+                const view = new Uint8Array(buffer);
+                view[0] = chunk;
+                const decoded = decoder.decode(view, { stream: true });
+                console.log(`Chunk decoded: ${decoded}`);
+                result += decoded;
+                resolve();
+              });
+            },
+            close() {
+                console.log(result)
+            },
+            abort(err) {
+              console.error("Sink error:", err);
+            },
+          },
+          queuingStrategy,
+        );
+        data.pipe(writableStream)
+      }
+
+
+    })
+  },
   // Execute the given query with the given options
   query: function (config) {
     initEngine(config);
@@ -48,7 +96,6 @@ var handlers = {
       .then(async function (result) {
         // Post query metadata
         postMessage({ type: 'queryInfo', queryType: result.resultType });
-
         var bindings = result.resultType === 'bindings';
         var resultsToTree = config.resultsToTree;
         switch (result.resultType) {

From f73c36b9446cceb4d12421d2f1fab458bd748abb Mon Sep 17 00:00:00 2001
From: YaphetKG <kebedey@renci.org>
Date: Thu, 11 Apr 2024 14:59:59 -0400
Subject: [PATCH 4/8] adding streaming of csv

---
 src/ldf-client-ui.js     | 32 +++++++++-------------------
 src/ldf-client-worker.js | 45 +++++++++++++---------------------------
 2 files changed, 24 insertions(+), 53 deletions(-)

diff --git a/src/ldf-client-ui.js b/src/ldf-client-ui.js
index 6f17e63d..0d37fd2d 100644
--- a/src/ldf-client-ui.js
+++ b/src/ldf-client-ui.js
@@ -744,28 +744,6 @@ if (typeof global.process === 'undefined')
         context: context,
         resultsToTree: this.options.resultsToTree,
       });
-      //
-      //   this._queryWorker.postMessage({
-      //   type: 'querycsv',
-      //   query: query,
-      //   context: context,
-      //   resultsToTree: this.options.resultsToTree,
-      // });
-      // if (!this._resultCount) return alert('Please execute a query to download');
-      // else {
-      //   let csvContent = 'data:text/csv;charset=utf-8,';
-      //   let header = Object.keys(this.bindingResults[0]);
-      //   csvContent += [header].map(e => e.join(',')) + '\n';
-      //   this.bindingResults.forEach(function (v, i, a) {
-      //     let line = [];
-      //     header.forEach(function (h, i) {
-      //       line.push(v[h]);
-      //     });
-      //     csvContent += [line].map(e => e.join(',')) + '\n';
-      //   });
-      //   let encodedUri = encodeURI(csvContent);
-      //   window.open(encodedUri);
-      // }
     },
     _downloadLog: function () {
       let filename = 'execution.log';
@@ -1080,6 +1058,16 @@ if (typeof global.process === 'undefined')
           return self._logAppender(data.log);
         case 'error':     return this.onerror(data.error);
         case 'webIdName': return self._setWebIdName(data.name);
+        case 'resultCsv':
+          let filename = 'data.csv';
+          let blob = new Blob([data.data], { type: 'text/json' });
+          let e    = document.createEvent('MouseEvents');
+          let a    = document.createElement('a');
+          a.download = filename;
+          a.href = window.URL.createObjectURL(blob);
+          a.dataset.downloadurl =  ['text/json', a.download, a.href].join(':');
+          e.initMouseEvent('click', true, false, window, 0, 0, 0, 0, 0, false, false, false, false, 0, null);
+          a.dispatchEvent(e);
         }
       };
       this._queryWorker.onerror = function (error) {
diff --git a/src/ldf-client-worker.js b/src/ldf-client-worker.js
index 258912d2..75d3a41a 100644
--- a/src/ldf-client-worker.js
+++ b/src/ldf-client-worker.js
@@ -46,41 +46,24 @@ function initEngine(config) {
 
 // Handlers of incoming messages
 var handlers = {
-
-  querycsv: function (config) {
+  querycsv: async function (config) {
     initEngine(config);
-    config.context.log = logger;
     engine.query(config.query, config.context).then(async function (result){
       const { data } = await engine.resultToString(result, "text/csv");
+      function readableToString(stream) {
+        const chunks = [];
+        return new Promise((res, rej) => {
+          stream.on('data', (chunk) => chunks.push(Buffer.from(chunk)));
+          stream.on('error', (e) => { rej(e); });
+          stream.on('end', () => { res(Buffer.concat(chunks).toString('utf-8')); });
+        });
+      }
       if (result.resultType === 'bindings') {
-
-        const decoder = new TextDecoder("utf-8");
-        const queuingStrategy = new CountQueuingStrategy({ highWaterMark: 1 });
-        let result = "";
-        const writableStream = new WritableStream(
-          {
-            // Implement the sink
-            write(chunk) {
-              return new Promise((resolve, reject) => {
-                const buffer = new ArrayBuffer(1);
-                const view = new Uint8Array(buffer);
-                view[0] = chunk;
-                const decoded = decoder.decode(view, { stream: true });
-                console.log(`Chunk decoded: ${decoded}`);
-                result += decoded;
-                resolve();
-              });
-            },
-            close() {
-                console.log(result)
-            },
-            abort(err) {
-              console.error("Sink error:", err);
-            },
-          },
-          queuingStrategy,
-        );
-        data.pipe(writableStream)
+        resultsCsv = await readableToString(data);
+        postMessage({
+          type: "resultCsv",
+          data: resultsCsv
+        })
       }
 
 

From 046747ccc32aae82568509bf9de2379f2cecb071 Mon Sep 17 00:00:00 2001
From: YaphetKG <kebedey@renci.org>
Date: Thu, 11 Apr 2024 15:01:22 -0400
Subject: [PATCH 5/8] formatting

---
 src/ldf-client-worker.js | 24 +++++++-----------------
 1 file changed, 7 insertions(+), 17 deletions(-)

diff --git a/src/ldf-client-worker.js b/src/ldf-client-worker.js
index 75d3a41a..fd506542 100644
--- a/src/ldf-client-worker.js
+++ b/src/ldf-client-worker.js
@@ -36,20 +36,12 @@ function initEngine(config) {
     config.context.queryFormat = { language: config.context.queryFormat };
 }
 
-
-
-
-
-
-
-
-
 // Handlers of incoming messages
 var handlers = {
   querycsv: async function (config) {
     initEngine(config);
-    engine.query(config.query, config.context).then(async function (result){
-      const { data } = await engine.resultToString(result, "text/csv");
+    engine.query(config.query, config.context).then(async function (result) {
+      const { data } = await engine.resultToString(result, 'text/csv');
       function readableToString(stream) {
         const chunks = [];
         return new Promise((res, rej) => {
@@ -59,15 +51,13 @@ var handlers = {
         });
       }
       if (result.resultType === 'bindings') {
-        resultsCsv = await readableToString(data);
+        let resultsCsv = await readableToString(data);
         postMessage({
-          type: "resultCsv",
-          data: resultsCsv
-        })
+          type: 'resultCsv',
+          data: resultsCsv,
+        });
       }
-
-
-    })
+    });
   },
   // Execute the given query with the given options
   query: function (config) {

From ddef38983f5c9a20eddd7c9e9f25088f6048b654 Mon Sep 17 00:00:00 2001
From: YaphetKG <kebedey@renci.org>
Date: Fri, 12 Apr 2024 15:00:29 -0400
Subject: [PATCH 6/8] adding other formats to download, new datasources too

---
 index.html               |  2 +-
 settings.json            | 26 +++++++++++++++++++++++---
 src/ldf-client-ui.js     |  4 ++--
 src/ldf-client-worker.js | 28 +++++++++++++++++++++++++---
 4 files changed, 51 insertions(+), 9 deletions(-)

diff --git a/index.html b/index.html
index bf8dcac2..5d0ada4c 100644
--- a/index.html
+++ b/index.html
@@ -91,7 +91,7 @@ <h1><a href="#">Query the Web of Linked Data</a></h1>
         <li>
           <label class="padded-top">Query results</label>
           <div class="results"></div>
-          <div><button id="download_csv" class="download">Download CSV</button></div>
+          <div><button id="download_csv" class="download">Download</button></div>
         </li>
 
         <li>
diff --git a/settings.json b/settings.json
index 247846c2..6ce76c85 100644
--- a/settings.json
+++ b/settings.json
@@ -31,9 +31,29 @@
       "multisource": "https://frink.apps.renci.org/ldf/ubergraph"
     },
     {
-      "name": "KnowWhereGraph SPARQL",
-      "url": "sparql@https://stko-kwg.geog.ucsb.edu/sparql",
-      "multisource": ""
+      "name": "DREAM-KG",
+      "url": "https://frink.apps.renci.org/dreamkg/sparql",
+      "multisource": "https://frink.apps.renci.org/ldf/dreamkg"
+    },
+    {
+      "name": "SCALES",
+      "url": "https://frink.apps.renci.org/scales/sparql",
+      "multisource": "https://frink.apps.renci.org/ldf/scales"
+    },
+    {
+      "name": "SemOpenAlex",
+      "url": "https://frink.apps.renci.org/semopenalex/sparql",
+      "multisource": "https://frink.apps.renci.org/ldf/semopenalex"
+    },
+    {
+      "name": "SUD-OKN",
+      "url": "https://frink.apps.renci.org/sudokn/sparql",
+      "multisource": "https://frink.apps.renci.org/ldf/sudokn"
+    },
+    {
+      "name": "UF-OKN",
+      "url": "https://frink.apps.renci.org/ufokn/sparql",
+      "multisource": "https://frink.apps.renci.org/ldf/ufokn"
     }
   ],
   "prefixes": {
diff --git a/src/ldf-client-ui.js b/src/ldf-client-ui.js
index 0d37fd2d..5dc84be3 100644
--- a/src/ldf-client-ui.js
+++ b/src/ldf-client-ui.js
@@ -1058,8 +1058,8 @@ if (typeof global.process === 'undefined')
           return self._logAppender(data.log);
         case 'error':     return this.onerror(data.error);
         case 'webIdName': return self._setWebIdName(data.name);
-        case 'resultCsv':
-          let filename = 'data.csv';
+        case 'downloadFile':
+          let filename = 'data.' + data.format;
           let blob = new Blob([data.data], { type: 'text/json' });
           let e    = document.createEvent('MouseEvents');
           let a    = document.createElement('a');
diff --git a/src/ldf-client-worker.js b/src/ldf-client-worker.js
index fd506542..edda1710 100644
--- a/src/ldf-client-worker.js
+++ b/src/ldf-client-worker.js
@@ -41,7 +41,6 @@ var handlers = {
   querycsv: async function (config) {
     initEngine(config);
     engine.query(config.query, config.context).then(async function (result) {
-      const { data } = await engine.resultToString(result, 'text/csv');
       function readableToString(stream) {
         const chunks = [];
         return new Promise((res, rej) => {
@@ -50,12 +49,35 @@ var handlers = {
           stream.on('end', () => { res(Buffer.concat(chunks).toString('utf-8')); });
         });
       }
-      if (result.resultType === 'bindings') {
+      let { data } = null;
+      switch (result.resultType) {
+      case 'bindings':
+        data  = await engine.resultToString(result, 'text/csv');
         let resultsCsv = await readableToString(data);
         postMessage({
-          type: 'resultCsv',
+          type: 'downloadFile',
           data: resultsCsv,
+          format: 'csv',
         });
+        break;
+      case 'quads':
+        data = await engine.resultToString(result, 'text/turtle');
+        let resultsTurtle = await readableToString(data);
+        postMessage({
+          type: 'downloadFile',
+          data: resultsTurtle,
+          format: 'ttl',
+        });
+        break;
+      case 'boolean':
+        data = await engine.resultToString(result, 'simple');
+        let resultsBool = await readableToString(data);
+        postMessage({
+          type: 'downloadFile',
+          data: resultsBool,
+          format: 'txt',
+        });
+        break;
       }
     });
   },

From 32f6792e46f20d359ac980b7e31ded4849fc0f87 Mon Sep 17 00:00:00 2001
From: YaphetKG <kebedey@renci.org>
Date: Fri, 12 Apr 2024 15:08:25 -0400
Subject: [PATCH 7/8] adding other formats to download, new datasources too

---
 src/ldf-client-worker.js | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/ldf-client-worker.js b/src/ldf-client-worker.js
index edda1710..3e85025e 100644
--- a/src/ldf-client-worker.js
+++ b/src/ldf-client-worker.js
@@ -49,34 +49,37 @@ var handlers = {
           stream.on('end', () => { res(Buffer.concat(chunks).toString('utf-8')); });
         });
       }
-      let { data } = null;
+
       switch (result.resultType) {
-      case 'bindings':
-        data  = await engine.resultToString(result, 'text/csv');
+      case 'bindings': {
+        let { data } = await engine.resultToString(result, 'text/csv');
         let resultsCsv = await readableToString(data);
         postMessage({
           type: 'downloadFile',
           data: resultsCsv,
           format: 'csv',
         });
+      }
         break;
-      case 'quads':
-        data = await engine.resultToString(result, 'text/turtle');
+      case 'quads': {
+        let { data } = await engine.resultToString(result, 'text/turtle');
         let resultsTurtle = await readableToString(data);
         postMessage({
           type: 'downloadFile',
           data: resultsTurtle,
           format: 'ttl',
         });
+      }
         break;
-      case 'boolean':
-        data = await engine.resultToString(result, 'simple');
+      case 'boolean': {
+        let { data } = await engine.resultToString(result, 'simple');
         let resultsBool = await readableToString(data);
         postMessage({
           type: 'downloadFile',
           data: resultsBool,
           format: 'txt',
         });
+      }
         break;
       }
     });

From 2be6276952652db8782a4037e907806e1600dbd7 Mon Sep 17 00:00:00 2001
From: YaphetKG <kebedey@renci.org>
Date: Thu, 18 Apr 2024 17:51:09 -0400
Subject: [PATCH 8/8] add new source

---
 queries/default/types.sparql | 10 ----------
 settings.json                | 10 ++++++++++
 2 files changed, 10 insertions(+), 10 deletions(-)
 delete mode 100644 queries/default/types.sparql

diff --git a/queries/default/types.sparql b/queries/default/types.sparql
deleted file mode 100644
index af10d910..00000000
--- a/queries/default/types.sparql
+++ /dev/null
@@ -1,10 +0,0 @@
-# 10300. Explore object types
-PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
-SELECT DISTINCT ?type ?label WHERE {
-  ?s a ?type.
-  OPTIONAL {
-    ?type rdfs:label ?label.
-  }
- FILTER LANGMATCHES(LANG(?label), "EN")
-}
-LIMIT 100
diff --git a/settings.json b/settings.json
index 6ce76c85..58869fd6 100644
--- a/settings.json
+++ b/settings.json
@@ -45,6 +45,11 @@
       "url": "https://frink.apps.renci.org/semopenalex/sparql",
       "multisource": "https://frink.apps.renci.org/ldf/semopenalex"
     },
+    {
+      "name": "SOC-KG",
+      "url": "https://frink.apps.renci.org/sockg/sparql",
+      "multisource": "https://frink.apps.renci.org/ldf/sockg"
+    },
     {
       "name": "SUD-OKN",
       "url": "https://frink.apps.renci.org/sudokn/sparql",
@@ -54,6 +59,11 @@
       "name": "UF-OKN",
       "url": "https://frink.apps.renci.org/ufokn/sparql",
       "multisource": "https://frink.apps.renci.org/ldf/ufokn"
+    },
+    {
+      "name": "Frink Federated SPARQL",
+      "url": "https://frink.apps.renci.org/federation/sparql",
+      "multisource": ""
     }
   ],
   "prefixes": {