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

Refactoring 'special facet id' handling as the injection of special values has broken the build. ACE-2639.

Browse Source 
Sadly I'm going back to hard-coded special values.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85798 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Neil McErlean
2014-09-26 14:13:45 +00:00
parent f3fb147553
commit 9e9357088b
5 changed files with 5 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/alfresco/application-context-core.xml
View File

@@ -29,7 +29,6 @@
<import resource="classpath:alfresco/ownable-services-context.xml" /> <import resource="classpath:alfresco/ownable-services-context.xml" />
<import resource="classpath:alfresco/template-services-context.xml" /> <import resource="classpath:alfresco/template-services-context.xml" />
<import resource="classpath:alfresco/script-services-context.xml" /> <import resource="classpath:alfresco/script-services-context.xml" />
<import resource="classpath:alfresco/solr-facets-context.xml" />
<import resource="classpath:alfresco/authority-services-context.xml" /> <import resource="classpath:alfresco/authority-services-context.xml" />
<import resource="classpath:alfresco/authentication-services-context.xml" /> <import resource="classpath:alfresco/authentication-services-context.xml" />
<import resource="classpath:alfresco/usage-services-context.xml" /> <import resource="classpath:alfresco/usage-services-context.xml" />

3
config/alfresco/script-services-context.xml
View File

@@ -113,9 +113,6 @@
<property name="repositoryHelper"> <property name="repositoryHelper">
<ref bean="repositoryHelper"/> <ref bean="repositoryHelper"/>
</property> </property>
<property name="solrFacetHelper">
<ref bean="solrFacetHelper"/>
</property>
<property name="storeUrl"> <property name="storeUrl">
<value>${spaces.store}</value> <value>${spaces.store}</value>
</property> </property>

15
config/alfresco/solr-facets-context.xml
View File

@@ -43,19 +43,4 @@
<value>${solr_facets.root}</value> <value>${solr_facets.root}</value>
</property> </property>
</bean> </bean>
<bean id="solrFacetHelper" class="org.alfresco.repo.search.impl.solr.facet.SolrFacetHelper">
<constructor-arg index="0" ref="ServiceRegistry" />
<property name="specialFacetIds">
<set>
<value>SITE</value>
<value>TAG</value>
<value>ANCESTOR</value>
<value>PARENT</value>
<value>ASPECT</value>
<value>TYPE</value>
<value>OWNER</value>
</set>
</property>
</bean>
</beans> </beans>

6
source/java/org/alfresco/repo/jscript/Search.java
View File

@@ -101,11 +101,7 @@ public class Search extends BaseScopableProcessorExtension implements Initializi
public void afterPropertiesSet() throws Exception public void afterPropertiesSet() throws Exception
{ {
PropertyCheck.mandatory(this, "services", services); PropertyCheck.mandatory(this, "services", services);
} this.solrFacetHelper = new SolrFacetHelper(services);
public void setSolrFacetHelper(SolrFacetHelper solrFacetHelper)
{
this.solrFacetHelper = solrFacetHelper;
} }
/** /**

12
source/java/org/alfresco/repo/search/impl/solr/facet/SolrFacetHelper.java
View File

@@ -19,6 +19,7 @@
package org.alfresco.repo.search.impl.solr.facet; package org.alfresco.repo.search.impl.solr.facet;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections; import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
@@ -107,14 +108,9 @@ public class SolrFacetHelper
} }
/** These facet IDs are recognised by SOLR and can be used directly within facetted searches. */ /** These facet IDs are recognised by SOLR and can be used directly within facetted searches. */
private Set<String> specialFacetIds = Collections.emptySet(); private final List<String> specialFacetIds = Arrays.asList(new String[] {
{ "SITE", "TAG", "ANCESTOR",
} "PARENT", "ASPECT", "TYPE", "OWNER" });
public void setSpecialFacetIds(Set<String> ids)
{
this.specialFacetIds = ids;
}
/** Facet value and facet query display label handlers */ /** Facet value and facet query display label handlers */
private Map<String, FacetLabelDisplayHandler> displayHandlers; private Map<String, FacetLabelDisplayHandler> displayHandlers;