inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

CMIS: Normalisation of scores in 0..1 range (due to standard statements) (#377)

Browse Source
This commit is contained in:
Angel Borroy
2019-03-26 10:31:34 +01:00
committed by GitHub
parent 2bd95949e9
commit f643b62834
3 changed files with 63 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/main/java/org/alfresco/opencmis/search/CMISResultSetColumn.java
View File

@@ -37,7 +37,13 @@ import org.apache.chemistry.opencmis.commons.enums.PropertyType;
public class CMISResultSetColumn implements ResultSetColumn public class CMISResultSetColumn implements ResultSetColumn
{ {
private String name; // Constant used at alfresco-data-model > org.alfresco.opencmis.search.CMISQueryParser.buildColumns()
public static final String SCORE_SELECTOR_ID = "SEARCH_SCORE";
public static final String SCORE_SELECTOR_FUNCTION = "Score";
private String name;
private String functionName;
private PropertyDefinitionWrapper propertyDefinition; private PropertyDefinitionWrapper propertyDefinition;
@@ -45,12 +51,13 @@ public class CMISResultSetColumn implements ResultSetColumn
private QName alfrescoPropertyQName; private QName alfrescoPropertyQName;
private QName alfrescoDataTypeQName; private QName alfrescoDataTypeQName;
CMISResultSetColumn(String name, PropertyDefinitionWrapper propertyDefinition, PropertyType dataType, CMISResultSetColumn(String name, String functionName, PropertyDefinitionWrapper propertyDefinition, PropertyType dataType,
QName alfrescoPropertyQName, QName alfrescoDataTypeQName) QName alfrescoPropertyQName, QName alfrescoDataTypeQName)
{ {
this.name = name; this.name = name;
this.functionName = functionName;
this.propertyDefinition = propertyDefinition; this.propertyDefinition = propertyDefinition;
this.dataType = dataType; this.dataType = dataType;
this.alfrescoPropertyQName = alfrescoPropertyQName; this.alfrescoPropertyQName = alfrescoPropertyQName;
@@ -60,6 +67,11 @@ public class CMISResultSetColumn implements ResultSetColumn
public String getName() public String getName()
{ {
return name; return name;
}
public String getFunctionName()
{
return functionName;
} }
public PropertyDefinitionWrapper getCMISPropertyDefinition() public PropertyDefinitionWrapper getCMISPropertyDefinition()
@@ -80,5 +92,6 @@ public class CMISResultSetColumn implements ResultSetColumn
public QName getPropertyType() public QName getPropertyType()
{ {
return alfrescoPropertyQName; return alfrescoPropertyQName;
} }
} }

3
src/main/java/org/alfresco/opencmis/search/CMISResultSetMetaData.java
View File

@@ -106,7 +106,8 @@ public class CMISResultSetMetaData implements ResultSetMetaData
{ {
alfrescoDataTypeQName = cmisDictionaryService.findAlfrescoDataType(type); alfrescoDataTypeQName = cmisDictionaryService.findAlfrescoDataType(type);
} }
CMISResultSetColumn cmd = new CMISResultSetColumn(column.getAlias(), propertyDefinition, type, CMISResultSetColumn cmd = new CMISResultSetColumn(column.getAlias(), column.getFunction().getName(),
propertyDefinition, type,
alfrescoPropertyQName, alfrescoDataTypeQName); alfrescoPropertyQName, alfrescoDataTypeQName);
columnMetaData.put(cmd.getName(), cmd); columnMetaData.put(cmd.getName(), cmd);
} }

66
src/main/java/org/alfresco/opencmis/search/CMISResultSetRow.java
View File

@@ -25,22 +25,22 @@
*/ */
package org.alfresco.opencmis.search; package org.alfresco.opencmis.search;
import java.io.Serializable; import java.io.Serializable;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
import java.util.Map; import java.util.Map;
import org.alfresco.opencmis.dictionary.CMISDictionaryService; import org.alfresco.opencmis.dictionary.CMISDictionaryService;
import org.alfresco.opencmis.dictionary.CMISNodeInfo; import org.alfresco.opencmis.dictionary.CMISNodeInfo;
import org.alfresco.repo.search.impl.querymodel.Column; import org.alfresco.repo.search.impl.querymodel.Column;
import org.alfresco.repo.search.impl.querymodel.PropertyArgument; import org.alfresco.repo.search.impl.querymodel.PropertyArgument;
import org.alfresco.repo.search.impl.querymodel.Query; import org.alfresco.repo.search.impl.querymodel.Query;
import org.alfresco.repo.search.impl.querymodel.impl.functions.PropertyAccessor; import org.alfresco.repo.search.impl.querymodel.impl.functions.PropertyAccessor;
import org.alfresco.repo.search.results.ResultSetSPIWrapper; import org.alfresco.repo.search.results.ResultSetSPIWrapper;
import org.alfresco.service.cmr.repository.ChildAssociationRef; import org.alfresco.service.cmr.repository.ChildAssociationRef;
import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService; import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.cmr.search.ResultSet; import org.alfresco.service.cmr.search.ResultSet;
import org.alfresco.service.cmr.search.ResultSetRow; import org.alfresco.service.cmr.search.ResultSetRow;
import org.alfresco.service.namespace.QName; import org.alfresco.service.namespace.QName;
/** /**
@@ -58,8 +58,8 @@ public class CMISResultSetRow implements ResultSetRow
*/ */
private int index; private int index;
private Map<String, Float> scores; private Map<String, Float> scores;
private NodeService nodeService; private NodeService nodeService;
private Map<String, NodeRef> nodeRefs; private Map<String, NodeRef> nodeRefs;
@@ -118,8 +118,8 @@ public class CMISResultSetRow implements ResultSetRow
overall = (overall * (count / (count + 1.0f))) + (score / (count + 1.0f)); overall = (overall * (count / (count + 1.0f))) + (score / (count + 1.0f));
} }
return overall; return overall;
} }
/* /*
* (non-Javadoc) * (non-Javadoc)
* *
@@ -176,7 +176,14 @@ public class CMISResultSetRow implements ResultSetRow
context.setScore(getScore()); context.setScore(getScore());
for (Column column : query.getColumns()) for (Column column : query.getColumns())
{ {
if (column.getAlias().equals(columnName))
// When an SCORE selector is included, score must be adapted to range 0..1 due to CMIS specification
if (column.getAlias().equals(CMISResultSetColumn.SCORE_SELECTOR_ID) ||
column.getFunction().getName().equals(CMISResultSetColumn.SCORE_SELECTOR_FUNCTION))
{
return getNormalisedScore();
}
else if (column.getAlias().equals(columnName))
{ {
return column.getFunction().getValue(column.getFunctionArguments(), context); return column.getFunction().getValue(column.getFunctionArguments(), context);
} }
@@ -220,7 +227,18 @@ public class CMISResultSetRow implements ResultSetRow
} }
} }
return null; return null;
} }
/**
/**
* CMIS Specification states that scoring results must be in a 0..1 range
* This function re-adapt the scores when any scoring field or expression is requested by the query.
* It's a safe approach, as includes negative numbers and also paged requests.
* @return
*/
private float getNormalisedScore() {
return (float) (Math.atan(getScore()) / Math.PI) + 0.5f;
}
/* /*
* (non-Javadoc) * (non-Javadoc)
@@ -287,6 +305,6 @@ public class CMISResultSetRow implements ResultSetRow
public Serializable getValue(QName qname) public Serializable getValue(QName qname)
{ {
throw new UnsupportedOperationException(); throw new UnsupportedOperationException();
} }
} }