Merge remote-tracking branch 'refs/remotes/litvinovg/reporting-deploy…

…ment' into angular-1.14.1-snapshot
litvinovg · Aug 13, 2024 · a944b14 · a944b14
2 parents d8d2c81 + a95c342
commit a944b14
Showing 1 changed file with 33 additions and 2 deletions.
diff --git a/...src/main/resources/rdf/dynapiAbox/everytime/endpoint_procedure_create_report_generator.n3 b/...src/main/resources/rdf/dynapiAbox/everytime/endpoint_procedure_create_report_generator.n3
@@ -41,7 +41,7 @@
         	dynapi:name                         ?report_generator_name ;
         	dynapi:description                  ?report_generator_description ;
         	dynapi:hasFirstStep                 ?current_step_uri ;
-                dynapi:providesParameter            ?report_param_uri .
+            dynapi:providesParameter            ?report_param_uri .
 
 	?report_param_uri
 		a                                   dynapi:Parameter ;
@@ -361,7 +361,7 @@
 
 <https://vivoweb.org/procedure/add_report_generator_select_query/get_graph_name/step>
         a                                   dynapi:OperationalStep ;
-        dynapi:hasNextStep                  <https://vivoweb.org/procedure/add_report_generator_select_query/get_graph_uri/step> ;
+        dynapi:hasNextStep                  <https://vivoweb.org/procedure/add_report_generator_select_query/conditional_step> ;
         dynapi:hasOperation                 <https://vivoweb.org/procedure/add_report_generator_select_query/get_graph_name/operation> .
 
 <https://vivoweb.org/procedure/add_report_generator_select_query/get_graph_name/operation>
@@ -370,6 +370,30 @@
         dynapi:requiresParameter            <https://vivoweb.org/procedure/create_report/parameter/graph_key> ;
         dynapi:providesParameter            <https://vivoweb.org/procedure/create_report/parameter/graph_name> .       
 
+#IF CONTAINER CONTAINS GRAPH NAME, then USE it, else provide DEFAULT QUERY GRAPH URI
+
+<https://vivoweb.org/procedure/add_report_generator_select_query/conditional_step>
+        a                                   dynapi:ConditionalStep ;
+        dynapi:nextIfSatisfied              <https://vivoweb.org/procedure/add_report_generator_select_query/get_graph_uri/step> ;
+        dynapi:nextIfNotSatisfied           <https://vivoweb.org/procedure/add_report_generator_select_query/condition_not_satisfied_step> ;     
+        dynapi:hasCondition                 <https://vivoweb.org/procedure/add_report_generator_select_query/condition_container_contains> .
+
+<https://vivoweb.org/procedure/add_report_generator_select_query/condition_container_contains> 
+        a                                   dynapi:ConditionContainerContains ;
+        dynapi:targetContainer              <https://vivoweb.org/procedure/create_report/parameter/container/query_graph_names> ;
+        dynapi:requiresParameter            <https://vivoweb.org/procedure/create_report/parameter/graph_name> .
+
+<https://vivoweb.org/procedure/add_report_generator_select_query/condition_not_satisfied_step>
+        a                                   dynapi:OperationalStep ;
+        dynapi:hasNextStep                  <https://vivoweb.org/procedure/report_generator_select_query_fill_in/step> ;
+        dynapi:hasOperation                 <https://vivoweb.org/procedure/add_report_generator_select_query/assignDefaultGraphUri> .
+
+<https://vivoweb.org/procedure/add_report_generator_select_query/assignDefaultGraphUri>
+        a                                   dynapi:AssignOperation ;
+        dynapi:assignableParameter          <https://vivoweb.org/procedure/create_report/parameter/default_graph_parameter_uri> ;
+        dynapi:targetParameter              <https://vivoweb.org/procedure/create_report/parameter/graph_parameter_uri> .
+
+
 <https://vivoweb.org/procedure/add_report_generator_select_query/get_graph_uri/step>
         a                                   dynapi:OperationalStep ;
         dynapi:hasNextStep                  <https://vivoweb.org/procedure/report_generator_select_query_fill_in/step> ;
@@ -681,6 +705,13 @@
         dynapi:isInternal                   "true"^^xsd:boolean ;
         dynapi:hasType                      <https://vivoweb.org/ontology/vitro-dynamic-api/parameter/type/generated-uri> .
 
+<https://vivoweb.org/procedure/create_report/parameter/default_graph_parameter_uri>
+        a                                   dynapi:Parameter ;
+        dynapi:name                         "default_graph_parameter_uri" ;
+        dynapi:defaultValue                 "https://vivoweb.org/ontology/vitro-dynamic-api/model/full_union" ;
+        dynapi:isInternal                   "true"^^xsd:boolean ;
+        dynapi:hasType                      <https://vivoweb.org/ontology/vitro-dynamic-api/parameter/type/uri> .
+
 <https://vivoweb.org/procedure/create_report/parameter/data_source_parameter_uri>
         a                                   dynapi:Parameter ;
         dynapi:name                         "data_source_parameter_uri" ;