Create global rank profiles

2 files changed, 7 insertions, 3 deletions

diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/RankProfile.java b/config-model/src/main/java/com/yahoo/searchdefinition/RankProfile.java
index d87c46ef3cb..9d6a1351724 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/RankProfile.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/RankProfile.java
@@ -548,8 +548,11 @@ public class RankProfile implements Serializable, Cloneable {
         return null;
     }
 
-    public void addMacro(String name, boolean inline) {
-        macros.put(name, new Macro(name, inline));
+    /** Creates a new (empty) macro and returns it */
+    public Macro addMacro(String name, boolean inline) {
+        Macro macro = new Macro(name, inline);
+        macros.put(name, macro);
+        return macro;
     }
 
     /** Returns an unmodifiable view of the macros in this */
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/VespaModel.java b/config-model/src/main/java/com/yahoo/vespa/model/VespaModel.java
index d699c12da9a..ffb36bccf7f 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/VespaModel.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/VespaModel.java
@@ -212,8 +212,9 @@ public final class VespaModel extends AbstractConfigProducerRoot implements Seri
     private ImmutableList<RankProfile> createGlobalRankProfiles(ImportedModels importedModels) {
         List<RankProfile> profiles = new ArrayList<>();
         for (ImportedModel model : importedModels.all()) {
+            RankProfile profile = new RankProfile(model.name(), this, deployState.rankProfileRegistry());
             for (Pair<String, RankingExpression> entry : model.outputExpressions(model.name())) {
-                //RankProfile profile = new RankProfile(entry.getFirst());
+                profile.addMacro(entry.getFirst(), false).setRankingExpression(entry.getSecond());
             }
         }
         return ImmutableList.copyOf(profiles);