Merge pull request #175 from camicroscope/develop

For 3.9.6
camicroscope · Aug 5, 2021 · 0dee194 · 0dee194
2 parents 854bc51 + d36a078
commit 0dee194
Show file tree

Hide file tree

Showing 6 changed files with 116 additions and 9 deletions.
diff --git a/caMicroscope.yml b/caMicroscope.yml
@@ -27,9 +27,9 @@ services:
       - mongo
   back:
     build:
-      context: "https://github.com/camicroscope/caracal.git#v3.9.4"
+      context: "https://github.com/camicroscope/caracal.git#v3.9.6"
       args:
-        viewer: "v3.9.4"
+        viewer: "v3.9.6"
     depends_on:
       - "mongo"
     ports:

diff --git a/config/mongo_idx.js b/config/mongo_idx.js
@@ -6,6 +6,7 @@ db.mark.createIndex({"provenance.image.slide":1,"provenance.analysis": 1})
 db.mark.createIndex({"provenance.image.slide": 1, "provenance.analysis.execution_id": 1})
 db.mark.createIndex({"provenance.image.slide": 1, "provenance.analysis.source": 1})
 db.mark.createIndex({"provenance.image.slide": 1})
+db.mark.createIndex({"provenance.analysis.labelId": 1})
 db.slide.createIndex({'study':1, 'specimen': 1, 'name': 1})
 db.template.createIndex({'id': 1})
 db.template.createIndex({'name': 1})

diff --git a/config/routes.json b/config/routes.json
@@ -165,6 +165,12 @@
     "handlers":[
       {"function":"findMarkTypes", "args": []}
     ]
+  },{
+    "route":"/data/Mark/updateMarksLabel",
+    "method":"post",
+    "handlers":[
+      {"function":"updateMarksLabel", "args": []}
+    ]
   },{
     "route":"/data/Presetlabels/add",
     "method":"post",