Merge pull request #553 from camicroscope/develop

For 3.9.9
camicroscope · Nov 8, 2021 · 0365e1f · 0365e1f
2 parents 6337bda + acd80c2
commit 0365e1f
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 7 deletions.
diff --git a/apps/viewer/init.js b/apps/viewer/init.js
@@ -150,6 +150,7 @@ function initCore() {
     slideQuery.id = $D.params.slideId;
     slideQuery.name = $D.params.slide;
     slideQuery.location = $D.params.location;
+    slideQuery.collection = $D.params.collection;
     opt.addRulerCallback = onAddRuler;
     opt.deleteRulerCallback = onDeleteRuler;
     $CAMIC = new CaMic('main_viewer', slideQuery, opt);

diff --git a/apps/viewer/viewer.html b/apps/viewer/viewer.html
@@ -418,12 +418,13 @@
         $D.params.collection
       )
     ) {
-      let STORE = new Store();
+      let STORE = new Store('../../data/');
       STORE.findSlide(
         $D.params.slide,
         $D.params.study,
         $D.params.specimen,
         $D.params.location,
+        null,
         $D.params.collection
       )
         .then(x => {

diff --git a/common/PathdbMods.js b/common/PathdbMods.js
@@ -90,7 +90,7 @@ function PathDbMods() {
   }
   console.warn("{PathDB mods enabled}")
   Store.prototype.default_findSlide = Store.prototype.findSlide;
-  Store.prototype.findSlide = function(slide, specimen, study, location, collection) {
+  Store.prototype.findSlide = function(slide, specimen, study, location, q, collection) {
     var url = `/idlookup/${collection}/${study}/${specimen}/${slide}?_format=json`
     return fetch(url, {
       mode: "cors",

diff --git a/core/CaMic.js b/core/CaMic.js
@@ -158,7 +158,7 @@ class CaMic {
     } else {
       slidePromise = this.store.findSlide(this.slideQuery.name,
           this.slideQuery.study, this.slideQuery.specimen,
-          this.slideQuery.location);
+          this.slideQuery.location, this.slideQuery.collection);
     }
     slidePromise
         .then((x)=>{

diff --git a/core/Store.js b/core/Store.js
@@ -634,15 +634,15 @@ class Store {
    * @param {string} [q] - override query - ignores all other params if set
    * @return {promise} - promise which resolves with data
    **/
-  findSlide(slide, specimen, study, location, q) {
-    let query;
+  findSlide(name, specimen, study, location, q) {
+    let query = {};
     const suffix = 'Slide/find';
     const url = this.base + suffix;
     if (q) {
       query = q;
     } else {
-      if (slide) {
-        query.slide = slide;
+      if (name) {
+        query.name = name;
       }
       if (study) {
         query.study = study;