From 16f61ed1f93c93be6a9e461f9e842e61ee94799e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A9lix=20Poullet-Pag=C3=A8s?=
 <felix.poullet-pages@cnrs.fr>
Date: Fri, 22 Sep 2023 11:05:20 +0200
Subject: [PATCH] hotfix isDerivedFrom

---
 src/services/queries.js | 50 +++++++++++++++++++++++------------------
 1 file changed, 28 insertions(+), 22 deletions(-)

diff --git a/src/services/queries.js b/src/services/queries.js
index 85930793..0be75f99 100644
--- a/src/services/queries.js
+++ b/src/services/queries.js
@@ -141,45 +141,51 @@ PREFIX zarlino1558: <https://w3id.org/polifonia/ontology/modal-tonal#>
 PREFIX praetorius1619: <http://modality-tonality.huma-num.fr/static/ontologies/modalityTonality_Praetorius#>
 CONSTRUCT {
     ?project a mr:Analysis.
-    ?project mr:involvesAnalyst ?user1.
+    ?project mr:involvesAnalyst ?analyst.
     ?project core:title ?label.
     ?project mr:hasAnnotation ?annotation.
 
-    ?annotation a mr:Annotation.
-    ?annotation mr:hasAnnotator ?user2.
-    ?annotation dcterms:created ?date1.
-
     ?score a mr:MusicContent.
     ?score a mm:Score.
     ?score mr:hasAnnotation ?annotation.
 
-    ?assignment a mr:Observation.
-    ?annotation mr:hasObservation ?assignment.
-    ?assignment mr:hasSubject ?concept.
-    ?annotation dcterms:created ?date2.
+    ?annotation a mr:Annotation.
+    ?annotation mr:hasAnnotator ?annotator.
+    ?annotation dcterms:created ?annotationDate.
 
-    ?link core:isDerivedFrom ?sup
+    ?observation a mr:Observation.
+    ?annotation mr:hasObservation ?observation.
+    ?observation mr:hasSubject ?concept.
+    ?observation dcterms:created ?observationDate.
+
+    ?subAnnotation core:isDerivedFrom ?supAnnotation
 }
 FROM <http://data-iremus.huma-num.fr/graph/sherlock>
 WHERE {
     BIND (<${projectIri}> AS ?project).
 
-    ?project dcterms:creator ?user1.
+    ?project dcterms:creator ?analyst.
     ?project crm:P1_is_identified_by ?label.
     ?project crm:P9_consists_of ?annotation.
+    ?project crm:P9_consists_of ?observation.
+    ?project crm:P9_consists_of ?linking.
 
-    ?annotation crm:P141_assigned ?entity.
-    ?entity dcterms:creator ?x.
-    ?annotation dcterms:creator ?user2.
-    ?annotation dcterms:created ?date1.
+    ?annotation crm:P177_assigned_property_of_type crm:P67_refers_to.
+    ?annotation dcterms:creator ?annotator.
+    ?annotation dcterms:created ?annotationDate.
     ?annotation sherlock:has_document_context ?score.
-
-    ?assignment crm:P140_assigned_attribute_to ?entity.
-    ?annotation dcterms:created ?date2.
-    ?assignment crm:P141_assigned ?concept.
-
-    ?link crm:P177_assigned_property_of_type <guillotel:has_line>.
-    ?link crm:P140_assigned_attribute_to ?sub.
+    ?annotation crm:P141_assigned ?entity.
+    
+    ?observation crm:P140_assigned_attribute_to ?entity.
+    ?observation crm:P177_assigned_property_of_type crm:P2_has_type.
+    ?observation dcterms:created ?observationDate.
+    ?observation crm:P141_assigned ?concept.
+
+    ?linking crm:P177_assigned_property_of_type <guillotel:has_line>.
+    ?linking crm:P141_assigned ?sub.
+    ?linking crm:P140_assigned_attribute_to ?sup.
+    ?subAnnotation crm:P141_assigned ?sub.
+    ?supAnnotation crm:P141_assigned ?sup.
 }
 `