From a54fc4cb49ab4d0d10a6557b4ca378440aefb937 Mon Sep 17 00:00:00 2001 From: Ferdinando Villa Date: Wed, 11 Sep 2024 16:06:44 +0200 Subject: [PATCH] More OS parsing --- .../klab/services/resources/lang/LanguageAdapter.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/klab.services.resources/src/main/java/org/integratedmodelling/klab/services/resources/lang/LanguageAdapter.java b/klab.services.resources/src/main/java/org/integratedmodelling/klab/services/resources/lang/LanguageAdapter.java index 1b2be091..ae41c214 100644 --- a/klab.services.resources/src/main/java/org/integratedmodelling/klab/services/resources/lang/LanguageAdapter.java +++ b/klab.services.resources/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); }