/**
 * Licensed to the Apache Software Foundation (ASF) under one
 * or more contributor license agreements.  See the NOTICE file
 * distributed with this work for additional information
 * regarding copyright ownership.  The ASF licenses this file
 * to you under the Apache License, Version 2.0 (the
 * "License"); you may not use this file except in compliance
 * with the License.  You may obtain a copy of the License at
 *
 *     http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */

package org.apache.jena.query.text ;

import java.util.function.Function;

import org.apache.jena.sparql.core.Var;
import org.apache.jena.sparql.engine.binding.Binding;
import org.apache.jena.sparql.engine.binding.BindingFactory;
import org.apache.jena.sparql.engine.binding.BindingMap;
import org.apache.jena.sparql.util.NodeFactoryExtra;

/** Class that converts TextHits to Bindings that can be returned from query */ 
public class TextHitConverter implements Function<TextHit, Binding>
{
    private Binding binding;
    private Var match;
    private Var score;

    public TextHitConverter(Binding binding, Var match, Var score) {
        this.binding = binding;
        this.match = match;
        this.score = score;
    }
    
    public Binding apply(TextHit hit) {
        BindingMap bmap = BindingFactory.create(binding);
        bmap.add(match, hit.getNode());
        if (score != null) {
            bmap.add(score, NodeFactoryExtra.floatToNode(hit.getScore()));
        }
        return bmap;
    }
}

@@ -1573,24 +1573,125 @@
 tHit hit) %7B%0A
+        if (score == null)%0A            return BindingFactory.binding(binding, match, hit.getNode());%0A
         Bind
@@ -1780,41 +1780,8 @@
 ));%0A
-        if (score != null) %7B%0A    
     
@@ -1851,18 +1851,8 @@
 ));%0A
-        %7D%0A
     

use singleton binding if no score is requested