Item13280: updated documentation

also: - removed some useless scripts - further lowered max length of StrFields using solr.TruncateFieldUpdateProcessorFactory to 32764 chars - down'ed throttle from 10 to 5 seconds in solrjob
foswiki · Feb 27, 2015 · 60075f2 · 60075f2
1 parent d3c2cb0
commit 60075f2
Show file tree

Hide file tree

Showing 31 changed files with 419 additions and 299 deletions.
diff --git a/bin/solrsearch b/bin/solrsearch
diff --git a/data/System/NatSkinSolrSearchViewTemplate.txt b/data/System/NatSkinSolrSearchViewTemplate.txt
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="ProjectContributor" comment="" date="1424859947" format="1.1"  version="1"}%
+%META:TOPICINFO{author="ProjectContributor" comment="" date="1425044056" format="1.1"  version="1"}%
 %META:TOPICPARENT{name="SolrSearchViewTemplate"}%
 %{<verbatim class="tml">}%
 %TMPL:INCLUDE{"SolrSearchView"}%

diff --git a/data/System/NatSkinWebChangesViewTemplate.txt b/data/System/NatSkinWebChangesViewTemplate.txt
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="ProjectContributor" comment="" date="1424859947" format="1.1" version="1"}%
+%META:TOPICINFO{author="ProjectContributor" comment="" date="1425044056" format="1.1" version="1"}%
 %{<verbatim class="tml">}%
 %TMPL:INCLUDE{"WebChangesView"}%
 %{</verbatim>}%

diff --git a/data/System/PatternSkinSolrSearchViewTemplate.txt b/data/System/PatternSkinSolrSearchViewTemplate.txt
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="ProjectContributor" comment="" date="1424859947" format="1.1"  version="1"}%
+%META:TOPICINFO{author="ProjectContributor" comment="" date="1425044056" format="1.1"  version="1"}%
 %META:TOPICPARENT{name="SolrSearchBase"}%
 %{<verbatim class="tml">}%
 %TMPL:INCLUDE{"SolrSearchBase"}%

diff --git a/data/System/PatternSkinWebChangesViewTemplate.txt b/data/System/PatternSkinWebChangesViewTemplate.txt
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="ProjectContributor" comment="" date="1424859947" format="1.1" version="1"}%
+%META:TOPICINFO{author="ProjectContributor" comment="" date="1425044056" format="1.1" version="1"}%
 %{<verbatim class="tml">}%
 %TMPL:INCLUDE{"WebChangesView"}%
 %{</verbatim>}%

diff --git a/data/System/SiteChangesViewTemplate.txt b/data/System/SiteChangesViewTemplate.txt
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="ProjectContributor" comment="" date="1424859947" format="1.1" version="1"}%
+%META:TOPICINFO{author="ProjectContributor" comment="" date="1425044056" format="1.1" version="1"}%
 %{<verbatim class="tml">}%
 %TMPL:INCLUDE{"WebChangesView"}%
 %{</verbatim>}%

diff --git a/data/System/SolrPlugin.txt b/data/System/SolrPlugin.txt
diff --git a/data/System/SolrSearch.txt b/data/System/SolrSearch.txt
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="ProjectContributor" date="1424859947" format="1.1" version="1"}%
+%META:TOPICINFO{author="ProjectContributor" date="1425044056" format="1.1" version="1"}%
 %META:TOPICPARENT{name="WebHome"}%
 
 %META:PREFERENCE{name="VIEW_TEMPLATE" title="VIEW_TEMPLATE" type="Set" value="SolrSearchView"}%
diff --git a/data/System/SolrSearchBaseTemplate.txt b/data/System/SolrSearchBaseTemplate.txt
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="ProjectContributor" comment="" date="1424859947" format="1.1"  version="1"}%
+%META:TOPICINFO{author="ProjectContributor" comment="" date="1425044056" format="1.1"  version="1"}%
 %META:TOPICPARENT{name="SolrPlugin"}%
 %{<verbatim class="tml">}%
 %{ ###########################################################################

diff --git a/data/System/SolrSearchViewTemplate.txt b/data/System/SolrSearchViewTemplate.txt
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="ProjectContributor" comment="" date="1424859947" format="1.1" version="1"}%
+%META:TOPICINFO{author="ProjectContributor" comment="" date="1425044056" format="1.1" version="1"}%
 %META:TOPICPARENT{name="SolrSearchBase"}%
 %{<verbatim class="tml">}%
 %TMPL:INCLUDE{"SolrSearchBase"}%

diff --git a/data/System/SolrSideBar.txt b/data/System/SolrSideBar.txt
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="ProjectContributor" comment="" date="1424859947" format="1.1"  version="1"}%
+%META:TOPICINFO{author="ProjectContributor" comment="" date="1425044056" format="1.1"  version="1"}%
 ---+!! %TOPIC%
 
 This is a set of widgets to be used in a sidebar navigation. This is used like this:

diff --git a/data/System/SolrWikiUsersViewTemplate.txt b/data/System/SolrWikiUsersViewTemplate.txt
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="ProjectContributor" comment="" date="1424859947" format="1.1" version="1"}%
+%META:TOPICINFO{author="ProjectContributor" comment="" date="1425044056" format="1.1" version="1"}%
 %META:TOPICPARENT{name="WebHome"}%
 %{<verbatim class="tml">}%
 %TMPL:INCLUDE{"SolrSearchView"}%

diff --git a/data/System/WebChangesViewTemplate.txt b/data/System/WebChangesViewTemplate.txt
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="ProjectContributor" comment="" date="1424859947" format="1.1" version="1"}%
+%META:TOPICINFO{author="ProjectContributor" comment="" date="1425044056" format="1.1" version="1"}%
 %{<verbatim class="tml">}%
 %TMPL:INCLUDE{"SolrSearchBase"}%
 %{</verbatim>}%

diff --git a/lib/Foswiki/Plugins/SolrPlugin.pm b/lib/Foswiki/Plugins/SolrPlugin.pm
@@ -1,6 +1,6 @@
 # Plugin for Foswiki - The Free and Open Source Wiki, http://foswiki.org/
 #
-# Copyright (C) 2009-2014 Michael Daum http://michaeldaumconsulting.com
+# Copyright (C) 2009-2015 Michael Daum http://michaeldaumconsulting.com
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -31,8 +31,8 @@ BEGIN {
   }
 }
 
-our $VERSION = '3.00_0001';
-our $RELEASE = '25 Feb 2015';
+our $VERSION = '3.00_0002';
+our $RELEASE = '27 Feb 2015';
 our $SHORTDESCRIPTION = 'Enterprise Search Engine for Foswiki based on [[http://lucene.apache.org/solr/][Solr]]';
 our $NO_PREFS_IN_TOPIC = 1;
 our %searcher;

diff --git a/lib/Foswiki/Plugins/SolrPlugin/Autosuggest.pm b/lib/Foswiki/Plugins/SolrPlugin/Autosuggest.pm
@@ -1,6 +1,6 @@
 # Plugin for Foswiki - The Free and Open Source Wiki, http://foswiki.org/
 #
-# Copyright (C) 2013-2014 Michael Daum http://michaeldaumconsulting.com
+# Copyright (C) 2013-2015 Michael Daum http://michaeldaumconsulting.com
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License

diff --git a/lib/Foswiki/Plugins/SolrPlugin/Base.pm b/lib/Foswiki/Plugins/SolrPlugin/Base.pm
@@ -1,6 +1,6 @@
 # Plugin for Foswiki - The Free and Open Source Wiki, http://foswiki.org/
 #
-# Copyright (C) 2009-2014 Michael Daum http://michaeldaumconsulting.com
+# Copyright (C) 2009-2015 Michael Daum http://michaeldaumconsulting.com
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License

diff --git a/lib/Foswiki/Plugins/SolrPlugin/Crawler.pm b/lib/Foswiki/Plugins/SolrPlugin/Crawler.pm
@@ -1,6 +1,6 @@
 # Plugin for Foswiki - The Free and Open Source Wiki, http://foswiki.org/
 #
-# Copyright (C) 2012-2014 Michael Daum http://michaeldaumconsulting.com
+# Copyright (C) 2012-2015 Michael Daum http://michaeldaumconsulting.com
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License

diff --git a/lib/Foswiki/Plugins/SolrPlugin/Crawler/FileSystemCrawler.pm b/lib/Foswiki/Plugins/SolrPlugin/Crawler/FileSystemCrawler.pm
@@ -1,6 +1,6 @@
 # Plugin for Foswiki - The Free and Open Source Wiki, http://foswiki.org/
 #
-# Copyright (C) 2012-2014 Michael Daum http://michaeldaumconsulting.com
+# Copyright (C) 2012-2015 Michael Daum http://michaeldaumconsulting.com
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License

diff --git a/lib/Foswiki/Plugins/SolrPlugin/Index.pm b/lib/Foswiki/Plugins/SolrPlugin/Index.pm
@@ -1,6 +1,6 @@
 # Plugin for Foswiki - The Free and Open Source Wiki, http://foswiki.org/
 #
-# Copyright (C) 2009-2014 Michael Daum http://michaeldaumconsulting.com
+# Copyright (C) 2009-2015 Michael Daum http://michaeldaumconsulting.com
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License

diff --git a/lib/Foswiki/Plugins/SolrPlugin/MANIFEST b/lib/Foswiki/Plugins/SolrPlugin/MANIFEST
@@ -1,4 +1,3 @@
-bin/solrsearch 0755
 data/System/NatSkinSolrSearchViewTemplate.txt 0644
 data/System/NatSkinWebChangesViewTemplate.txt 0644
 data/System/PatternSkinSolrSearchViewTemplate.txt 0644
@@ -146,7 +145,6 @@ solr/.htaccess 0644
 templates/viewtopbar.solr.tmpl 0644
 tools/solrdelete 0755
 tools/solrindex 0755
-tools/solrindex_all 0755
 tools/solrjob 0755
 tools/virtualhosts-solrdelete 0755
 tools/virtualhosts-solrindex 0755

diff --git a/lib/Foswiki/Plugins/SolrPlugin/Search.pm b/lib/Foswiki/Plugins/SolrPlugin/Search.pm
@@ -1,6 +1,6 @@
 # Plugin for Foswiki - The Free and Open Source Wiki, http://foswiki.org/
 #
-# Copyright (C) 2009-2014 Michael Daum http://michaeldaumconsulting.com
+# Copyright (C) 2009-2015 Michael Daum http://michaeldaumconsulting.com
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License

diff --git a/lib/Foswiki/Plugins/SolrPlugin/WebHierarchy.pm b/lib/Foswiki/Plugins/SolrPlugin/WebHierarchy.pm
@@ -1,6 +1,6 @@
 # Plugin for Foswiki - The Free and Open Source Wiki, http://foswiki.org/
 #
-# Copyright (C) 2013-2014 Michael Daum http://michaeldaumconsulting.com
+# Copyright (C) 2013-2015 Michael Daum http://michaeldaumconsulting.com
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License

diff --git a/pub/System/SolrPlugin/jquery.autosuggest.uncompressed.js b/pub/System/SolrPlugin/jquery.autosuggest.uncompressed.js
@@ -1,7 +1,7 @@
 /*
  * jQuery autosuggest plugin 2.00
  *
- * Copyright (c) 2013-2014 Michael Daum http://michaeldaumconsulting.com
+ * Copyright (c) 2013-2015 Michael Daum http://michaeldaumconsulting.com
  *
  * Dual licensed under the MIT and GPL licenses:
  *   http://www.opensource.org/licenses/mit-license.php

diff --git a/solr/configsets/foswiki_configs/conf/solrconfig.xml b/solr/configsets/foswiki_configs/conf/solrconfig.xml
@@ -820,14 +820,14 @@
       <str name="echoParams">explicit</str>
       <float name="tie">0.01</float>
       <str name="qf"> 
-        title_search^3.0 
+        title_search^10.0 
         topic_search^8.0 
         web_search^5.0 
         category_search^2.0 
         tag_search^2.0 
         catchall
-        substrings^0.5
-        charnorm^0.5
+        substrings
+        charnorm
         <!-- enable this if you like to add sound-like search hits 
              phonetic^0.0001 
         -->
@@ -846,8 +846,8 @@
         category_search^2.0 
         tag_search^2.0 
         catchall
-        substrings^0.5
-        charnorm^0.5
+        substrings
+        charnorm
         <!-- enable this if you like to add sound-like search hits 
              phonetic^0.0001 
         -->
@@ -871,6 +871,63 @@
     </arr>
   </requestHandler>
 
+  <requestHandler name="edismax" class="solr.SearchHandler">
+    <lst name="defaults">
+      <str name="defType">edismax</str>
+      <str name="echoParams">explicit</str>
+      <float name="tie">0.01</float>
+      <str name="qf"> 
+        title_search^10.0 
+        topic_search^8.0 
+        web_search^5.0 
+        category_search^2.0 
+        tag_search^2.0 
+        catchall
+        substrings
+        charnorm
+        <!-- enable this if you like to add sound-like search hits 
+             phonetic^0.0001 
+        -->
+      </str>
+      <!-- boost more recent documents -->
+      <str name="bf">
+        recip(ms(NOW,date),3.16e-11,1,1)
+        <!-- recip(rord(date),1,1000,1000) -->
+      </str>
+      <!-- boost topics in favor of attachments -->
+      <str name="bq">type:topic^16</str>
+      <str name="pf">
+        title_search^10.0 
+        topic_search^8.0 
+        web_search^5.0 
+        category_search^2.0 
+        tag_search^2.0
+        catchall
+        substrings
+        charnorm
+        <!-- enable this if you like to add sound-like search hits 
+             phonetic^0.0001 
+        -->
+      </str>
+      <int name="ps">1</int>
+      <int name="qs">1</int>
+      <!--str name="mm">
+         2&lt;-1 5&lt;-2 
+      </str-->
+      <str name="q.alt">*:*</str>
+      <str name="hl.fl">text</str>
+      <!-- By default, don't spell check -->
+      <str name="spellcheck">false</str>
+      <str name="spellcheck.thresholdTokenFreuqncy">0.01</str>
+      <str name="spellcheck.count">10</str>
+      <str name="spellcheck.collate">true</str>
+    </lst>
+    <arr name="last-components">
+      <str>spellcheck</str>
+    </arr>
+  </requestHandler>
+
+
   <!-- A request handler that returns indented JSON by default -->
   <requestHandler name="/query" class="solr.SearchHandler">
      <lst name="defaults">
@@ -920,8 +977,8 @@
         category_search^2.0 
         tag_search^2.0 
         catchall
-        substrings^0.5
-        charnorm^0.5
+        substrings
+        charnorm
         phonetic^0.0001 
       </str>
 
@@ -939,8 +996,8 @@
         category_search^2.0 
         tag_search^2.0
         catchall
-        substrings^0.5
-        charnorm^0.5
+        substrings
+        charnorm
         phonetic^0.0001 
       </str>
       <int name="ps">1</int>
@@ -972,62 +1029,6 @@
   </requestHandler>
 
 
-  <requestHandler name="edismax" class="solr.SearchHandler">
-    <lst name="defaults">
-      <str name="defType">edismax</str>
-      <str name="echoParams">explicit</str>
-      <float name="tie">0.01</float>
-      <str name="qf"> 
-        title_search^10.0 
-        topic_search^8.0 
-        web_search^5.0 
-        category_search^2.0 
-        tag_search^2.0 
-        catchall
-        substrings^0.5
-        charnorm^0.5
-        <!-- enable this if you like to add sound-like search hits 
-             phonetic^0.0001 
-        -->
-      </str>
-      <!-- boost more recent documents -->
-      <str name="bf">
-        recip(ms(NOW,date),3.16e-11,1,1)
-        <!-- recip(rord(date),1,1000,1000) -->
-      </str>
-      <!-- boost topics in favor of attachments -->
-      <str name="bq">type:topic^16</str>
-      <str name="pf">
-        title_search^10.0 
-        topic_search^8.0 
-        web_search^5.0 
-        category_search^2.0 
-        tag_search^2.0
-        catchall
-        substrings^0.5
-        charnorm^0.5
-        <!-- enable this if you like to add sound-like search hits 
-             phonetic^0.0001 
-        -->
-      </str>
-      <int name="ps">1</int>
-      <int name="qs">1</int>
-      <!--str name="mm">
-         2&lt;-1 5&lt;-2 
-      </str-->
-      <str name="q.alt">*:*</str>
-      <str name="hl.fl">text</str>
-      <!-- By default, don't spell check -->
-      <str name="spellcheck">false</str>
-      <str name="spellcheck.thresholdTokenFreuqncy">0.01</str>
-      <str name="spellcheck.count">10</str>
-      <str name="spellcheck.collate">true</str>
-    </lst>
-    <arr name="last-components">
-      <str>spellcheck</str>
-    </arr>
-  </requestHandler>
-
   <!-- realtime get handler, guaranteed to return the latest stored fields of
        any document, without the need to commit or open a new searcher.  The
        current implementation relies on the updateLog feature being enabled. -->
@@ -1786,7 +1787,7 @@
   <updateRequestProcessorChain name="foswiki_chain">
     <processor class="solr.TruncateFieldUpdateProcessorFactory">
       <str name="typeClass">solr.StrField</str>
-      <int name="maxLength">32765</int>
+      <int name="maxLength">32764</int>
     </processor>
     <processor class="org.apache.solr.update.processor.LangDetectLanguageIdentifierUpdateProcessorFactory">
     <!-- processor class="org.apache.solr.update.processor.TikaLanguageIdentifierUpdateProcessorFactory"-->

diff --git a/tools/solrdelete b/tools/solrdelete
@@ -1,6 +1,6 @@
 #!/usr/bin/env perl
 #
-# Copyright (C) 2009-2014 Michael Daum http://michaeldaumconsulting.com
+# Copyright (C) 2009-2015 Michael Daum http://michaeldaumconsulting.com
 #
 # For licensing info read LICENSE file in the Foswiki root.
 # This program is free software; you can redistribute it and/or

diff --git a/tools/solrindex b/tools/solrindex
@@ -1,6 +1,6 @@
 #!/usr/bin/env perl
 #
-# Copyright (C) 2009-2014 Michael Daum http://michaeldaumconsulting.com
+# Copyright (C) 2009-2015 Michael Daum http://michaeldaumconsulting.com
 #
 # For licensing info read LICENSE file in the Foswiki root.
 # This program is free software; you can redistribute it and/or