From: Dennis Schafroth Date: Thu, 15 Sep 2011 12:52:49 +0000 (+0200) Subject: Upgrade to 3.3.0 X-Git-Tag: v0.2.0~3 X-Git-Url: http://sru.miketaylor.org.uk/?a=commitdiff_plain;h=a66e2b8cafdcebe63e9ed0afb864266ea8de6afe;p=lui-solr.git Upgrade to 3.3.0 --- diff --git a/solr-conf/solrconfig.xml b/solr-conf/solrconfig.xml index b669c1f..c281730 100644 --- a/solr-conf/solrconfig.xml +++ b/solr-conf/solrconfig.xml @@ -15,174 +15,221 @@ See the License for the specific language governing permissions and limitations under the License. --> - - + + + --> ${solr.abortOnConfigurationError:true} + + + LUCENE_33 - - - - - - + - - + ${solr.data.dir:/var/lib/masterkey/lui/solr/data} + + + + + + WARNING: See also the section below for parameters + that overfor Solr's main Lucene index. + --> - + false 10 - - - + for buffering added documents and deletions before they are + flushed to the Directory. --> 32 - + + + 10000 1000 10000 + - - - - Other implementations of MergePolicy must have a no-argument constructor - --> - + - - + - native - - + + + + - + false 32 10 - - - - + false - + true - - + @@ -192,401 +239,480 @@ + - + false - + For more details see http://wiki.apache.org/solr/SolrJmx + --> + + + + - + - - + when adding documents. + http://wiki.apache.org/solr/UpdateXmlMessages + maxDocs - Maximum number of documents to add since the last + commit before automatically triggering a new commit. + + maxTime - Maximum amount of time that is allowed to pass + since a document was added before automaticly + triggering a new commit. + --> + + + + + - - - - + - - - - 2 - + + - + 1024 - - - - - + + + + + + + + + + + + --> + - - - - - - - - true + + Example of a generic cache. These caches may be accessed by + name through SolrIndexSearcher.getCache(),cacheLookup(), and + cacheInsert(). The purpose is to enable easy caching of + user/application level data. The regenerator argument should + be specified as an implementation of solr.CacheRegenerator + if autowarming is desired. + --> + + --> - - - 20 - - - 200 - - + true + + + + + + 20 + + + 200 + + + local query request for each NamedList in sequence. + --> + solrprice asc + rocksweight asc + --> - - - water - 0 - 10 - true - 1 - date - 10 - subject_exact - 10 - author_exact - 10 - medium_exact - - static firstSearcher warming query from solrconfig.xml + static firstSearcher warming in solrconfig.xml + - + false - + 2 - - - - - - - - - - - + enableRemoteStreaming - enables use of the stream.file + and stream.url parameters for specifying remote streams. + + multipartUploadLimitInKB - specifies the max size of + Multipart File Uploads that Solr will allow in a Request. + + *** WARNING *** + The settings below authorize Solr to fetch remote files, You + should make sure your system has some authentication before + using enableRemoteStreaming="true" + + --> + + + + + + + + + - - - - explicit - - - + http://wiki.apache.org/solr/SolrRequestHandler - - - - + incoming queries will be dispatched to the correct handler + based on the path or the qt (query type) param. - - - - dismax - explicit - 0.01 - - text^0.5 features^1.0 name^1.2 sku^1.5 id^10.0 manu^1.1 cat^1.4 - - - text^0.2 features^1.1 name^1.5 manu^1.4 manu_exact^1.9 - - - popularity^0.5 recip(price,1,1000,1000)^0.3 - - - id,name,price,score - - - 2<-1 5<-2 6<90% - - 100 - *:* - - text features name - - 0 - - name - regex - - + Names starting with a '/' are accessed with the a path equal to + the registered name. Names without a leading '/' are accessed + with: http://host/app/[core/]select?qt=name + + If a /select request is processed with out a qt param + specified, the requestHandler that declares default="true" will + be used. + + If a Request Handler is declared with startup="lazy", then it will + not be initialized until the first request that uses it. - - - - dismax - explicit - text^0.5 features^1.0 name^1.2 sku^1.5 id^10.0 - 2<-1 5<-2 6<90% - - incubationdate_dt:[* TO NOW/DAY-1MONTH]^2.2 - + + + + + explicit + 10 + + - - inStock:true - + - - cat - manu_exact - price:[* TO 500] - price:[500 TO *] + + + + + + + + + explicit + + + velocity + + browse + layout + Solritas + + edismax + *:* + 10 + *,score + + text^0.5 features^1.0 name^1.2 sku^1.5 id^10.0 manu^1.1 cat^1.4 + + text,features,name,sku,id,manu,cat + 3 + + + text^0.5 features^1.0 name^1.2 sku^1.5 id^10.0 manu^1.1 cat^1.4 + + + on + cat + manu_exact + ipod + GB + 1 + cat,inStock + price + 0 + 600 + 50 + after + manufacturedate_dt + NOW/YEAR-10YEARS + NOW + +1YEAR + before + after + + + + on + text features name + 0 + name + + + spellcheck + + + + + + + + + + + + + + + + + + + + + + + text + true + ignored_ + + + true + links + ignored_ + + + + + + + + + + + + + + + + + search + solrpingquery + all + + + + + + + explicit + true + + + + + + + + + myLastComponentName + - + NOTE: The component registered with the name "debug" will + always be executed after the "last-components" + + --> + + textSpell + + + default name - ./spellchecker + spellchecker + - + - + + + + + - - + NOTE: This is purely as an example. The whole purpose of the + SpellCheckComponent is to hook it into the request handler that + handles your normal user queries so that a separate request is + not needed to get suggestions. + + IN OTHER WORDS, THERE IS REALLY GOOD CHANCE THE SETUP BELOW IS + NOT WHAT YOU WANT FOR YOUR PRODUCTION SYSTEM! + + See http://wiki.apache.org/solr/SpellCheckComponent for details + on the request parameters. + --> + - false - false - 1 @@ -714,10 +1157,20 @@ - - - + + + + + true @@ -727,55 +1180,93 @@ - + default - org.carrot2.clustering.lingo.LingoClusteringAlgorithm - 20 + + + clustering/carrot2 + + + ENGLISH stc org.carrot2.clustering.stc.STCClusteringAlgorithm + + - - true - default - true - - name - id - + + true + default + true + + name + id + features true @@ -783,52 +1274,55 @@ false + + edismax + + text^0.5 features^1.0 name^1.2 sku^1.5 id^10.0 manu^1.1 cat^1.4 + + *:* + 10 + *,score - clusteringComponent + clustering - - - - - text - true - ignored_ - - - true - links - ignored_ - - + - + A component to return terms and document frequency of those + terms + --> + - + + true - termsComponent + terms - + string elevate.xml - + explicit @@ -838,210 +1332,196 @@ + - - - - - - - - - - - - - - - - - - - - - - - - - standard - solrpingquery - all - - + + + + + + + 100 + + + + + + + + 70 + + 0.5 + + [-\w ,/\n\"']{20,200} + + + + + + + ]]> + ]]> + + + + + + + + + + + + + + + + + + + + + ,, + ,, + ,, + ,, + ,]]> + ]]> + + + + - - - - explicit - true - - + - - - - 100 - - + Chains of Update Processor Factories for dealing with Update + Requests can be declared, and then used by name in Update + Request Processors - - - - - 70 - - 0.5 - - [-\w ,/\n\"']{20,200} - - + http://wiki.apache.org/solr/UpdateRequestProcessor - - - - ]]> - ]]> - - - + --> + + --> + + + true + id + false + name,features,cat + solr.processor.Lookup3Signature + + + + + --> + + The "default" writer is the default and will be used if 'wt' is + not specified in the request. + --> + + + + - + --> + 5 + + http://wiki.apache.org/solr/SolrQuerySyntax - + Multiple QParserPlugins can be registered by name, and then + used in either the "defType" param for the QueryComponent (used + by SearchHandler) or in LocalParams + --> + + - - - solr + + + + + + + *:* + + +