More OS parsing

integratedmodelling · Sep 11, 2024 · a54fc4c · a54fc4c
1 parent 0315d01
commit a54fc4c
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/...s/src/main/java/org/integratedmodelling/klab/services/resources/lang/LanguageAdapter.java b/...s/src/main/java/org/integratedmodelling/klab/services/resources/lang/LanguageAdapter.java
@@ -540,7 +540,7 @@ private KimObservationStrategy adaptStrategy(ObservationStrategySyntax strategy,
             // and these are comma-separated filters in a 'for'
             for (var match : filter.getMatch()) {
 
-                var f = new KimObservationStrategyImpl.FilterImpl();            // TODO
+                var f = new KimObservationStrategyImpl.FilterImpl();
                 f.setNegated(match.isNegated());
                 if (match.getObservable() != null /* which it should */) {
                     f.setMatch(adaptSemantics(match.getObservable(), namespace, projectName,
@@ -571,10 +571,11 @@ private KimObservationStrategy adaptStrategy(ObservationStrategySyntax strategy,
                         KlabAsset.KnowledgeClass.OBSERVATION_STRATEGY_DOCUMENT));
             }
             if (!operation.getFunctions().isEmpty()) {
-
+                o.getFunctions().addAll(operation.getFunctions().stream().map(f -> adaptServiceCall(f,
+                        namespace, projectName, KlabAsset.KnowledgeClass.OBSERVATION_STRATEGY)).toList());
             }
             if (!operation.getDeferredStrategies().isEmpty()) {
-
+                o.getDeferredStrategies().addAll(operation.getDeferredStrategies().stream().map(s -> adaptStrategy(s, namespace, projectName)).toList());
             }
             ret.getOperations().add(o);
         }