Changeset 6112


Ignore:
Timestamp:
03/18/15 08:25:32 (9 years ago)
Author:
Twan Goosen
Message:

first changes for relevance based result ranking (refs #575)

Location:
vlo/branches/vlo-3.2-ticket575
Files:
6 edited
2 copied

Legend:

Unmodified
Added
Removed

  • vlo/branches/vlo-3.2-ticket575/vlo-solr/src/main/solr_conf/solr/collection1/conf/solrconfig.xml

    r5915 r6112  
    364364     <lst name="defaults">
    365365       <str name="echoParams">explicit</str>
     366     <str name="defType">dismax</str>
     367     <str name="q.alt">*:*</str>
     368     <str name="qf">
     369        name^8 description^4 keywords^2 languageCode^2 country^2 organisation^2 collection^1 modality^1 genre^1 continent^.5 id^.1
     370     </str>
     371     <!-- TODO: use bf to boost records with one or more resources -->
    366372       <!--
    367373       <int name="rows">10</int>

  • vlo/branches/vlo-3.2-ticket575/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/service/solr/impl/AbstractSolrQueryFactory.java

    r5202 r6112  
    3232public abstract class AbstractSolrQueryFactory {
    3333
    34     protected static final String SOLR_SEARCH_ALL = "*:*";
     34    protected static final String SOLR_SEARCH_ALL = null;
    3535
    3636    protected final void addQueryFacetParameters(final SolrQuery query, QueryFacetsSelection queryFacetsSelections) {

  • vlo/branches/vlo-3.2-ticket575/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/service/solr/impl/SolrDocumentQueryFactoryImpl.java

    r5202 r6112  
    4242        defaultQueryTemplate = new SolrQuery();
    4343        defaultQueryTemplate.setFields(documentFields.toArray(new String[]{}));
    44         defaultQueryTemplate.setSort(SolrQuery.SortClause.asc(FacetConstants.FIELD_NAME));
     44//        //TODO: qf (all fields with weights - make configurable (later)
     45//        defaultQueryTemplate.setParam(DisMaxParams.QF, "name^20 description^10");
    4546    }
    4647

  • vlo/branches/vlo-3.2-ticket575/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/service/solr/impl/SearchResultsDaoImplTest.java

    r4972 r6112  
    105105        query.setStart(0);
    106106        query.setFields(FIELD_NAME, FIELD_ID, FIELD_DESCRIPTION);
    107         query.setQuery("*:*");
     107        query.setQuery(null);
    108108
    109109        query.setFacet(true);
    … …  
    133133        query.setStart(0);
    134134        query.setFields(FIELD_NAME, FIELD_ID, FIELD_DESCRIPTION);
    135         query.setQuery("*:*");
    136135        {
    137136            // all documents should match this

  • vlo/branches/vlo-3.2-ticket575/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/service/solr/impl/SolrFacetQueryFactoryImplTest.java

    r4963 r6112  
    5858
    5959        // default: query selects all values
    60         assertEquals("*:*", query.getQuery());
     60        assertNull(query.getQuery());
    6161
    6262        // no selection -> no filter queries
    … …  
    8282
    8383        // default: query selects all values
    84         assertEquals("*:*", query.getQuery());
     84        assertNull(query.getQuery());
    8585
    8686        // Only empty selections -> no filter queries
    … …  
    107107
    108108        // default: query selects all values
    109         assertEquals("*:*", query.getQuery());
     109        assertNull(query.getQuery());
    110110
    111111        // Expecting three filter queries as three values have been selected in total

  • vlo/branches/vlo-3.2-ticket575/vlo-web-app/src/test/resources/solr/collection1/conf/solrconfig.xml

    r5916 r6112  
    7272       If replication is in use, this should match the replication configuration. -->
    7373<!--   <dataDir></dataDir>-->
    74 
     74       
    7575  <!--  Enables JMX if and only if an existing MBeanServer is found, use this
    7676    if you want to configure JMX through JVM parameters. Remove this to disable
    … …  
    359359     <lst name="defaults">
    360360       <str name="echoParams">explicit</str>
     361     <str name="defType">edismax</str>
     362     <str name="q.alt">*:*</str>
    361363       <!--
    362364       <int name="rows">10</int>
    … …  
    401403     <str name="echoParams">explicit</str>
    402404     <float name="tie">0.01</float>
    403      <str name="qf">
     405<!--     <str name="qf">
    404406        text^0.5 features^1.0 name^1.2 sku^1.5 id^10.0 manu^1.1 cat^1.4
     407     </str>-->
     408     <str name="pf">
     409        name^4 description^2
    405410     </str>
    406      <str name="pf">
    407         text^0.2 features^1.1 name^1.5 manu^1.4 manu_exact^1.9
    408      </str>
     411     <!--
    409412     <str name="bf">
    410413        popularity^0.5 recip(price,1,1000,1000)^0.3
    … …  
    416419        2&lt;-1 5&lt;-2 6&lt;90%
    417420     </str>
    418      <int name="ps">100</int>
     421     <int name="ps">100</int>-->
    419422     <str name="q.alt">*:*</str>
    420      <!-- example highlighter config, enable per-query with hl=true -->
     423<!--      example highlighter config, enable per-query with hl=true
    421424     <str name="hl.fl">text features name</str>
    422      <!-- for this field, we want no fragmenting, just highlighting -->
     425      for this field, we want no fragmenting, just highlighting
    423426     <str name="f.name.hl.fragsize">0</str>
    424      <!-- instructs Solr to return the field itself if no query terms are
    425           found -->
     427      instructs Solr to return the field itself if no query terms are
     428          found
    426429     <str name="f.name.hl.alternateField">name</str>
    427      <str name="f.text.hl.fragmenter">regex</str> <!-- defined below -->
     430     <str name="f.text.hl.fragmenter">regex</str> defined below -->
    428431    </lst>
    429432  </requestHandler>
    … …  
    907910       every xsltCacheLifetimeSeconds. 
    908911   -->
    909 <!--  <queryResponseWriter name="xslt" class="org.apache.solr.response.XSLTResponseWriter">
     912  <queryResponseWriter name="xslt" class="org.apache.solr.response.XSLTResponseWriter">
    910913    <int name="xsltCacheLifetimeSeconds">5</int>
    911   </queryResponseWriter>-->
     914  </queryResponseWriter>
    912915
    913916
Note: See TracChangeset for help on using the changeset viewer.