From 1a6f6596636aa6d45ede73816851f02c20534881 Mon Sep 17 00:00:00 2001
From: MichaelDaum <daum@michaeldaumconsulting.com>
Date: Mon, 13 Aug 2018 12:11:39 +0200
Subject: [PATCH] Item14745:Item14746:

- new alphabetical navigation for wiki users
- fixed searching for summary
- replaced jquery.scrollto with native scroll api
- make number of items suggested configurable in jquery.autosuggest drop-down box
---
 .gitignore                                    |   2 +-
 Makefile                                      |  19 ---
 data/System/SolrPlugin.txt                    |   4 +
 data/System/SolrSearchBaseTemplate.txt        | 126 +++++++++---------
 data/System/SolrWikiUsersViewTemplate.txt     |  13 +-
 lib/Foswiki/Plugins/SolrPlugin.pm             |   4 +-
 lib/Foswiki/Plugins/SolrPlugin/Autosuggest.pm |   2 +-
 lib/Foswiki/Plugins/SolrPlugin/MANIFEST       |   4 +
 lib/Makefile                                  |  19 +++
 pub/System/SolrPlugin/Makefile                |   1 +
 .../SolrPlugin/ajax-solr-init.uncompressed.js |   1 +
 .../ajax-solr-widgets.uncompressed.js         | 114 ++++++++++++++--
 .../jquery.autosuggest.uncompressed.js        |  49 ++++---
 .../SolrPlugin/solr-searchbox.uncompressed.js |  20 ++-
 .../SolrPlugin/solrplugin.uncompressed.css    |   8 +-
 .../AbstractJQueryFacetWidget.uncompressed.js |   2 +-
 .../widgets/AlphaPagerWidget.uncompressed.js  |  42 ++++--
 .../widgets/HierarchyWidget.uncompressed.js   |  10 +-
 .../widgets/PagerWidget.uncompressed.js       |   8 +-
 .../widgets/ResultWidget.uncompressed.js      |  23 +++-
 .../SolrPlugin/wikiusers.uncompressed.css     |   1 +
 .../foswiki_configs/conf/schema.xml           |   1 +
 .../foswiki_configs/conf/solrconfig.xml       |   4 +
 tools/solrjob                                 |   2 +-
 24 files changed, 316 insertions(+), 163 deletions(-)
 delete mode 100644 Makefile
 create mode 100644 lib/Makefile

diff --git a/.gitignore b/.gitignore
index d3e21e9..ad916ed 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,6 +25,6 @@ pub/System/SolrPlugin/ajax-solr-helpers.js
 pub/System/SolrPlugin/ajax-solr/README.md
 pub/System/SolrPlugin/ajax-solr/Rakefile
 genpdf_*
-/webservice-solr
+lib/webservice-solr
 pub/System/SolrPlugin/ajax-solr.evolvingweb
 locale/**/*.mo
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 4f8e7ca..0000000
--- a/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-WEBSERVICE_SOURCES= \
-  lib/WebService/Solr.pm \
-  lib/WebService/Solr/Document.pm \
-  lib/WebService/Solr/Field.pm \
-  lib/WebService/Solr/Query.pm \
-  lib/WebService/Solr/Response.pm
-
-all: $(WEBSERVICE_SOURCES)
-
-git:
-	git clone https://github.com/ilmari/webservice-solr.git
-
-ifneq (,$(wildcard webservice-solr))
-lib/WebService/%: webservice-solr/lib/WebService/%
-	cp $^ $@
-lib/WebService/Solr/%: webservice-solr/lib/WebService/Solr/%
-	cp $^ $@
-endif
-
diff --git a/data/System/SolrPlugin.txt b/data/System/SolrPlugin.txt
index b704a78..d00a6f3 100644
--- a/data/System/SolrPlugin.txt
+++ b/data/System/SolrPlugin.txt
@@ -873,6 +873,10 @@ specific search applications. The destination fields are then analysed using the
 
 ---++ Change History
 %TABLE{columnwidths="7em" tablewidth="100%"}%
+|  13 Aug 2018: | new alphabetical navigation for wiki users; \
+                  fixed searching for summary; \
+                  replaced jquery.scrollto with native scroll api; \
+                  make number of items suggested configurable in jquery.autosuggest drop-down box |
 |  07 Jun 2018: | new index fields =author_title=, =createauthor_title=, =title_first_letter=; \
                   added support indexing arbitrary [[Foswiki:Extensions/MetaDataPlugin][meta data]]; \
                   added support for [[Foswiki:Extensions/ListyPlugin][ListyPlugin]]; \
diff --git a/data/System/SolrSearchBaseTemplate.txt b/data/System/SolrSearchBaseTemplate.txt
index 0e64c1c..855bc73 100644
--- a/data/System/SolrSearchBaseTemplate.txt
+++ b/data/System/SolrSearchBaseTemplate.txt
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="ProjectContributor" comment="" date="1528368504" format="1.1"  version="1"}%
+%META:TOPICINFO{author="micha" comment="" date="1532014702" format="1.1" version="2"}%
 %META:TOPICPARENT{name="SolrPlugin"}%
 %{<verbatim class="tml">}%
 %{ ###########################################################################
@@ -30,14 +30,14 @@
 }%
 %TMPL:DEF{"content"}%<noautolink>
 <div id='solrSearch' style='display:none' data-more-fields='%TMPL:P{"solr::fields"}%' %FORMATLIST{"%TMPL:P{"solr::queryfields"}%" header="data-query-fields='" footer="'" separator=" " split=" "}% data-solr-url='%SCRIPTURL{"rest"}%/SolrPlugin/proxy' data-solr-params='{"topic": "%WEB%.%TOPIC%", "qt":"%TMPL:P{"solr::defaultquerytype"}%", "rows": %TMPL:P{"solr::defaultrows"}%}' data-extra-filter='%TMPL:P{"solr::extrafilter"}%'>
-%TMPL:P{"solr::title"}%<!-- -->
-%TMPL:P{"solr::header"}%<!-- -->
-%TMPL:P{"solr::hits"}%<!-- -->
-%TMPL:P{"solr::footer"}%<!-- -->
-%TMPL:P{"solr::assets"}%<!-- -->
+%TMPL:P{"solr::title"}%%{}%
+%TMPL:P{"solr::header"}%%{}%
+%TMPL:P{"solr::hits"}%%{}%
+%TMPL:P{"solr::footer"}%%{}%
+%TMPL:P{"solr::assets"}%%{}%
 </div>
-%TMPL:P{"solr::templates"}%<!-- -->
-%TMPL:P{"solr::dictionary"}%<!-- -->
+%TMPL:P{"solr::templates"}%%{}%
+%TMPL:P{"solr::dictionary"}%%{}%
 </noautolink>%TMPL:END%
 %{</verbatim>}%
 
@@ -45,19 +45,17 @@
 %{ ###########################################################################
    solr::assets - css and js to be added to the html head
 }%
-%TMPL:DEF{"solr::assets"}%<!-- -->
-%JQREQUIRE{"livequery,focus, serialpager, scrollto, photoswipe, render, jqtwisty, moment, blockui, imagetooltip" warn="off"}%<!-- -->
+%TMPL:DEF{"solr::assets"}%%JQREQUIRE{"livequery,focus, serialpager, photoswipe, render, jqtwisty, moment, blockui, imagetooltip" warn="off"}%%{}%
 %ADDTOZONE{"script"
   id="SOLRPLUGIN::AJAX"
   requires="JQUERYPLUGIN::LIVEQUERY, JQUERYPLUGIN::BLOCKUI, JQUERYPLUGIN::MOMENT"
   text="<script type='text/javascript' src='%PUBURLPATH%/%SYSTEMWEB%/SolrPlugin/ajax-solr.js'></script>
 <script type='text/javascript' src='%PUBURLPATH%/%SYSTEMWEB%/SolrPlugin/ajax-solr-widgets.js'></script>
 <script type='text/javascript' src='%PUBURLPATH%/%SYSTEMWEB%/SolrPlugin/ajax-solr-init.js'></script>"
-}%<!-- -->
-%ADDTOZONE{"head"
+}%%ADDTOZONE{"head"
   id="SOLRPLUGIN"
   text="<link rel='stylesheet' href='%PUBURLPATH%/%SYSTEMWEB%/SolrPlugin/solrplugin.css' type='text/css' media='all' />"
-}%<!-- -->%TMPL:END%
+}%%TMPL:END%
 %{</verbatim>}%
 
 %{<verbatim class="tml">}%
@@ -122,7 +120,7 @@
 %{ ###########################################################################
    solr::templates - defines all jquery.tmpl templates required
 }%
-%TMPL:DEF{"solr::templates"}%<!-- -->
+%TMPL:DEF{"solr::templates"}%%{}%
 %TMPL:P{"solr::templates::hits"}%
 %TMPL:P{"solr::templates::facetfield"}%
 %TMPL:P{"solr::templates::currentselection"}%
@@ -132,7 +130,7 @@
 %TMPL:P{"solr::templates::hierarchy"}%
 %TMPL:P{"solr::templates::resultsperpage"}%
 %TMPL:P{"solr::templates::spellcorrection"}%
-<!-- -->%TMPL:END%
+%{}%%TMPL:END%
 %{</verbatim>}%
 
 %{<verbatim class="tml">}%
@@ -141,13 +139,13 @@
    of different types. each type has got a ...::<name-of-type> sup-template that
    is customized to that type.
 }%
-%TMPL:DEF{"solr::templates::hits"}%<!-- -->
-%TMPL:P{"solr::templates::hits::topic"}%<!-- -->
-%TMPL:P{"solr::templates::hits::image"}%<!-- -->
-%TMPL:P{"solr::templates::hits::comment"}%<!-- -->
-%TMPL:P{"solr::templates::hits::listy"}%<!-- -->
-%TMPL:P{"solr::templates::hits::misc"}%<!-- -->
-%TMPL:P{"solr::templates::hits::ClassifiedTopic"}%<!-- -->
+%TMPL:DEF{"solr::templates::hits"}%%{}%
+%TMPL:P{"solr::templates::hits::topic"}%%{}%
+%TMPL:P{"solr::templates::hits::image"}%%{}%
+%TMPL:P{"solr::templates::hits::comment"}%%{}%
+%TMPL:P{"solr::templates::hits::listy"}%%{}%
+%TMPL:P{"solr::templates::hits::misc"}%%{}%
+%TMPL:P{"solr::templates::hits::ClassifiedTopic"}%%{}%
 <script id="solrHitTemplate" type="text/x-jsrender"> 
 {{include tmpl=~getTemplateName() /}}
 </script>%TMPL:END%
@@ -175,6 +173,7 @@
         %MAKETEXT{"in [_1]" args="<a href='{{:container_url}}'>{{:container_title}}</a>"}%
       </span>
     </h3>
+    <div class='foswikiTopicSummary'>{{:summary}}</div>
     <div class='solrRevision'> 
       {{:~formatDate(date,'%TMPL:P{"solr::dateformat"}%')}}, {{:author_title}}
     </div>
@@ -201,6 +200,7 @@
         %MAKETEXT{"in [_1]" args="<a href='{{:container_url}}'>{{:container_title}}</a>"}%
       </span>
     </h3>
+    <div class='foswikiTopicSummary'>{{:summary}}</div>
     <div class='solrRevision'> 
       {{:~formatDate(date,'%TMPL:P{"solr::dateformat"}%')}}, {{:author_title}}
     </div>
@@ -227,6 +227,7 @@
         %MAKETEXT{"in [_1]" args="<a href='{{:container_url}}'>{{:container_title}}</a>"}%
       </span>
     </h3>
+    <div class='foswikiTopicSummary'>{{:summary}}</div>
     <div class='solrRevision'> 
       {{:~formatDate(date,'%TMPL:P{"solr::dateformat"}%')}}, {{:author_title}}
     </div>
@@ -244,6 +245,7 @@
         %MAKETEXT{"in [_1]" args="<a href='{{:container_url}}'>{{:container_title}}</a>"}%
       </span>
     </h3>
+    <div class='foswikiTopicSummary'>{{:summary}}</div>
     <div class='solrRevision'> 
       {{:~formatDate(date,'%TMPL:P{"solr::dateformat"}%')}}, {{:author_title}}
     </div>
@@ -264,6 +266,7 @@
         %MAKETEXT{"in [_1]" args="<a href='{{:container_url}}'>{{:container_title}}</a>"}%
       </span>
     </h3>
+    <div class='foswikiTopicSummary'>{{:summary}}</div>
     <div class='solrRevision'> 
       {{:~formatDate(date,'%TMPL:P{"solr::dateformat"}%')}}, {{:author_title}}
     </div>
@@ -274,7 +277,6 @@
 </script>%TMPL:END%
 %{</verbatim>}%
 
-
 %{<verbatim class="tml">}%
 %TMPL:DEF{"solr::templates::hits::misc"}%<script id="solrHitTemplate_misc" type="text/x-jsrender">
   <div class='solrSearchHit solrMiscHit clearfix'>
@@ -285,6 +287,7 @@
         %MAKETEXT{"in [_1]" args="<a href='{{:container_url}}'>{{:container_title}}</a>"}%
       </span>
     </h3>
+    <div class='foswikiTopicSummary'>{{:summary}}</div>
     <div class='solrRevision'> 
       {{:~formatDate(date,'%TMPL:P{"solr::dateformat"}%')}}, {{:author_title}}
     </div>
@@ -420,7 +423,7 @@
 }%
 %TMPL:DEF{"solr::header"}%<div class='solrHeader'>
 %TMPL:P{"solr::searchform"}%
-%TMPL:P{"DISsolr::hierarchystep"}%<!-- -->
+%TMPL:P{"DISsolr::hierarchystep"}%%{}%
 %TMPL:P{"solr::spellchecker"}%
 %TMPL:P{"solr::resultsperpage"}%
 %TMPL:P{"solr::pager"}%
@@ -430,8 +433,8 @@
 %{<verbatim class="tml">}%
 %TMPL:DEF{"solr::spellchecker"}%<div class='solrSpellchecking'></div>%TMPL:END%
 %TMPL:DEF{"solr::resultsperpage"}%<div class='solrResultsPerPage'></div>%TMPL:END%
-%TMPL:DEF{"solr::pager"}%<div class='solrPager' data-next-text="%MAKETEXT{"Next"}%" data-prev-text="%MAKETEXT{"Previous"}%" data-enable-scroll="%IF{"'%scroll%'=~'^(true|false)$'" then="%scroll%" else="false"}%" ></div>%TMPL:END%
-%TMPL:DEF{"solr::footer"}%<div class='solrFooter'>%TMPL:P{"solr::pager" scroll="true"}%</div>%TMPL:END%
+%TMPL:DEF{"solr::pager"}%<div class='solrPager clearfix' data-next-text="%MAKETEXT{"Next"}%" data-prev-text="%MAKETEXT{"Previous"}%"></div>%TMPL:END%
+%TMPL:DEF{"solr::footer"}%<div class='solrFooter'>%TMPL:P{"solr::pager"}%</div>%TMPL:END%
 %{</verbatim>}%
 
 %{<verbatim class="tml">}%
@@ -439,22 +442,22 @@
    solr::searchform - this calls the separate steps comprising the form steps.
    this macro can be redefined to include more steps as needed.
 }%
-%TMPL:DEF{"solr::searchform"}%<!-- -->
+%TMPL:DEF{"solr::searchform"}%%{}%
 %TMPL:P{"solr::formstart"}%
 %TMPL:P{"solr::inputstep"}%
-%TMPL:P{"solr::tagcloudstep"}%<!-- -->
+%TMPL:P{"solr::tagcloudstep"}%%{}%
 %TMPL:P{"solr::formend"}%
-<!-- -->%TMPL:END%
+%{}%%TMPL:END%
 %{</verbatim>}%
 
 %{<verbatim class="tml">}%
 %{ ###########################################################################
    solr::formstart - beginning of the solr::searchform. contains the starting form 
 }%
-%TMPL:DEF{"solr::formstart"}%<!-- -->
+%TMPL:DEF{"solr::formstart"}%%{}%
 <form name="searchform" class='solrSearchForm' id='solrSearchBox' data-instant-search='%TMPL:P{"solr::instantsearch"}%'>
 <div class='foswikiFormSteps'>
-<!-- -->%TMPL:END%
+%{}%%TMPL:END%
 %{</verbatim>}%
 
 %{<verbatim class="tml">}%
@@ -462,7 +465,7 @@
    solr::inputstep - this is a part of the solr::searchform defining the 
    actual input field, as well as some basic select and checkboxes
 }%
-%TMPL:DEF{"solr::inputstep"}%<!-- -->
+%TMPL:DEF{"solr::inputstep"}%%{}%
 <div class='foswikiFormStep clearfix'>
   <div class='foswikiLeft'>
     <table class='foswikiNullTable'>
@@ -475,24 +478,24 @@
         </td>
       </tr>
     </table>
-    %TMPL:P{"solr::input::checkboxes"}%<!-- -->
+    %TMPL:P{"solr::input::checkboxes"}%%{}%
   </div>
   <div class='foswikiRight'>
-    %TMPL:P{"solr::sortby"}%<!-- -->
-    %TMPL:P{"DISsolr::displayas"}%<!-- -->
+    %TMPL:P{"solr::sortby"}%%{}%
+    %TMPL:P{"DISsolr::displayas"}%%{}%
   </div>
 </div>
-<!-- -->%TMPL:END%
+%{}%%TMPL:END%
 %{</verbatim>}%
 
 %{<verbatim class="tml">}%
 %{ ###########################################################################
    solr::formend - closing markup of the solr::searchform
 }%
-%TMPL:DEF{"solr::formend"}%<!-- -->
+%TMPL:DEF{"solr::formend"}%%{}%
 </div>
 </form>
-<!-- -->%TMPL:END%
+%{}%%TMPL:END%
 %{</verbatim>}%
 
 %{<verbatim class="tml">}%
@@ -501,7 +504,7 @@
    widget is the "your selection" area displaying a summary of the current filters
    followed by the list of facets. Each facet is displayed calling the "facet" macro
 }%
-%TMPL:DEF{"solr::sidebar"}%<!-- -->
+%TMPL:DEF{"solr::sidebar"}%%{}%
 <noautolink>
 %TMPL:P{"solr::selection"}%
 </noautolink>
@@ -516,7 +519,7 @@
   exclusion="true" 
   sort="title" 
   limit="-1"
-}%<!-- -->
+}%%{}%
 %TMPL:P{"solr::facet"
   id="type"
   title="%MAKETEXT{"Media"}%"
@@ -548,7 +551,7 @@
   title="%MAKETEXT{"Language"}%"
   hidefilter="true"
 }%
-<!-- -->%TMPL:END%
+%{}%%TMPL:END%
 %{</verbatim>}%
 
 %{<verbatim class="tml">}%
@@ -706,7 +709,7 @@
 %{ ###########################################################################
    solr::selection - renders the "your selection" part in the solr::sidebar
 }%
-%TMPL:DEF{"solr::selection"}%<!-- -->
+%TMPL:DEF{"solr::selection"}%%{}%
 <h2 class='solrFilterResultsHeading' >%MAKETEXT{"Filter results"}%</h2>
 <div id='solrCurrentSelection'>
   <h3>%MAKETEXT{"Your selection"}%:</h3>
@@ -716,21 +719,21 @@
   <a href='#' class="solrClear">%MAKETEXT{"Clear"}%</a>
   <span class='foswikiClear'></span>
 </div>
-<!-- -->%TMPL:END%
+%{}%%TMPL:END%
 %{</verbatim>}%
 
 %{<verbatim class="tml">}%
 %{ ###########################################################################
    solr::hits - display all search hits
 }%
-%TMPL:DEF{"solr::hits"}%<div class="solrSearchHits jqPhotoSwipe" data-history="false" data-item-selector=".solrImageFrame a" data-block-ui="window"></div>%TMPL:END%
+%TMPL:DEF{"solr::hits"}%<div class="solrSearchHits jqPhotoSwipe" data-history="false" data-enable-scroll="true" data-item-selector=".solrImageFrame a" data-block-ui="window"></div>%TMPL:END%
 %{</verbatim>}%
 
 %{<verbatim class="tml">}%
 %{ ###########################################################################
    solr::sortby - renders the sort interface
 }%
-%TMPL:DEF{"solr::sortby"}%<!-- -->
+%TMPL:DEF{"solr::sortby"}%%{}%
 <table class='foswikiNullTable'>
   <tr>
     <th>%MAKETEXT{"Sort by"}%:&nbsp;</th>
@@ -744,14 +747,14 @@
     </td>
   </tr>
 </table>
-<!-- -->%TMPL:END%
+%{}%%TMPL:END%
 %{</verbatim>}%
 
 %{<verbatim class="tml">}%
 %{ ###########################################################################
    solr::displayas - render the display switcher
 }%
-%TMPL:DEF{"solr::displayas"}%<!-- -->
+%TMPL:DEF{"solr::displayas"}%%{}%
 <table class='foswikiLayoutTable'>
   <tr>
     <th>%MAKETEXT{"Display as"}%:</th>
@@ -765,7 +768,7 @@
     </td>
   </tr>
 </table>
-<!-- -->%TMPL:END%
+%{}%%TMPL:END%
 %{</verbatim>}%
 
 %{<verbatim class="tml">}%
@@ -776,9 +779,9 @@
 %IF{"'%TMPL:P{"solr::defaultweb"}%'='all'" 
   then="$percntTMPL:P{\"solr::input::checkboxes::incurrentweb\"}$percnt"
   else="$percntTMPL:P{\"solr::input::checkboxes::inallwebs\"}$percnt"
-}%<!-- -->
-%TMPL:P{"solr::input::checkboxes::inweb"}%<!-- -->
-%TMPL:P{"solr::input::checkboxes::exactsearch"}%<!-- -->
+}%%{}%
+%TMPL:P{"solr::input::checkboxes::inweb"}%%{}%
+%TMPL:P{"solr::input::checkboxes::exactsearch"}%%{}%
 </div>%TMPL:END%
 %{</verbatim>}%
 
@@ -786,43 +789,43 @@
 %{ ###########################################################################
    solr::input::checkboxes::inweb - display a "Search in current web only" checkbox
 }%
-%TMPL:DEF{"solr::input::checkboxes::incurrentweb"}%<!-- -->
+%TMPL:DEF{"solr::input::checkboxes::incurrentweb"}%%{}%
 <span class='solrToggleFacet' data-field='web' data-value='%FORMATLIST{"%BASEWEB%" split="/" separator="."}%' data-title='%MAKETEXT{"In current web"}%'></span>
-<!-- -->%TMPL:END%
+%{}%%TMPL:END%
 %{</verbatim>}%
 
 %{<verbatim class="tml">}%
 %{ ###########################################################################
    solr::input::checkboxes::inallwebs - display a "Search in all webs" checkbox
 }%
-%TMPL:DEF{"solr::input::checkboxes::inallwebs"}%<!-- -->
+%TMPL:DEF{"solr::input::checkboxes::inallwebs"}%%{}%
 <span class='solrToggleFacet' data-field='web' data-value='%TMPL:P{"solr::defaultweb"}%' data-inverse='true' data-title='%MAKETEXT{"In all webs"}%'></span>
-<!-- -->%TMPL:END%
+%{}%%TMPL:END%
 %{</verbatim>}%
 
 %{<verbatim class="tml">}%
 %{ ###########################################################################
    solr::input::checkboxes::inmycontribs - display a "Search in my contribs" checkbox
 }%
-%TMPL:DEF{"solr::input::checkboxes::inmycontribs"}%<!-- -->
+%TMPL:DEF{"solr::input::checkboxes::inmycontribs"}%%{}%
 <span class='solrToggleFacet' data-field='contributor' data-value='%USERINFO{format="$wikiname"}%' data-title='%MAKETEXT{"In my contributions"}%'></span>
-<!-- -->%TMPL:END%
+%{}%%TMPL:END%
 %{</verbatim>}%
 
 %{<verbatim class="tml">}%
 %{ ###########################################################################
    solr::input::checkboxes::exactsearch - display a "Exact Search" checkbox
 }%
-%TMPL:DEF{"solr::input::checkboxes::exactsearch"}%<!-- -->
+%TMPL:DEF{"solr::input::checkboxes::exactsearch"}%%{}%
 <span class='solrToggle' data-field='qf' data-value='title_std^7 catchall' data-title='%MAKETEXT{"Exact search"}%'></span>
-<!-- -->%TMPL:END%
+%{}%%TMPL:END%
 %{</verbatim>}%
 
 %{<verbatim class="tml">}%
 %{ ###########################################################################
    solr::tagcloudstep - part of the solr::searchform. this contains the tagcloud facet
 }%
-%TMPL:DEF{"solr::tagcloudstep"}%<!-- -->
+%TMPL:DEF{"solr::tagcloudstep"}%%{}%
 <div class='foswikiFormStep solrTagCloud' data-field='tag' data-start-color="[%TAGCLOUD_START{default="111, 169, 255"}%]" data-end-color='[%TAGCLOUD_END{default="0, 89, 224"}%]'>
   <div class='foswikiFormStep'>
     <hr />
@@ -836,7 +839,7 @@
 %{ ###########################################################################
    solr::hierarchystep - part of the solr::searchform. this contains the category list
 }%
-%TMPL:DEF{"solr::hierarchystep"}%<!-- -->
+%TMPL:DEF{"solr::hierarchystep"}%%{}%
 <div class='solrHierarchy' data-field='webcat' data-facet-sort='title'>
   <div class='solrHierarchyBreadcrumbs'>
     <span class='solrHierarchyBreadcrumbsTitle'>%MAKETEXT{"You are here:"}%</span>
@@ -846,5 +849,4 @@
 </div>
 %{</verbatim>}%
 
-%META:PREFERENCE{name="ALLOWTOPICVIEW" title="ALLOWTOPICVIEW" type="Set" value="*"}%
 %META:PREFERENCE{name="PERMSET_VIEW" title="PERMSET_VIEW" type="Local" value="everybody"}%
diff --git a/data/System/SolrWikiUsersViewTemplate.txt b/data/System/SolrWikiUsersViewTemplate.txt
index 10d390d..9030800 100644
--- a/data/System/SolrWikiUsersViewTemplate.txt
+++ b/data/System/SolrWikiUsersViewTemplate.txt
@@ -10,12 +10,12 @@
 %{</verbatim>}%
 
 %{<verbatim class="tml">}%
-%TMPL:DEF{"solr::defaultrows"}%9%TMPL:END%
+%TMPL:DEF{"solr::defaultrows"}%12%TMPL:END%
 %TMPL:DEF{"solr::defaultsort"}%title_sort asc%TMPL:END%
 %TMPL:DEF{"solr::extrafilter"}%form:%QUERY{"{SolrPlugin}{PersonDataForm}"}% web:%USERSWEB%%TMPL:END%
 %TMPL:DEF{"solr::fields"}%field_Location_s, field_Profession_s, field_Email_s, field_LoginName_s, field_Telephone_s, web, topic, title, thumbnail%TMPL:END%
-%TMPL:DEF{"DISsolr::pager"}%<div class='solrAlphaPager' data-field="title_first_letter" data-title="%MAKETEXT{"alphabetical"}%" data-all-text="%MAKETEXT{"All"}%" ></div>%TMPL:END%
-%TMPL:DEF{"DISsolr::footer"}%<div class='solrFooter'></div>%TMPL:END%
+%TMPL:DEF{"solr::pager"}%<div class='solrAlphaPager clearfix' data-field="title_first_letter" data-title="%MAKETEXT{"alphabetical"}%" data-all-text="%MAKETEXT{"All"}%" ></div>%TMPL:END%
+%TMPL:DEF{"solr::footer"}%<div class='solrFooter'><div class='solrPager clearfix' data-next-text="%MAKETEXT{"Next"}%" data-prev-text="%MAKETEXT{"Previous"}%"></div></div>%TMPL:END%
 %{</verbatim>}%
 
 %{<verbatim class="tml">}%
@@ -110,9 +110,10 @@
           <td>
             <select class='foswikiSelect'>
               <option class='foswikiOption' value="9">9</option>
-              <option class='foswikiOption' value="18">18</option>
-              <option class='foswikiOption' value="36">36</option>
-              <option class='foswikiOption' value="72">72</option>
+              <option class='foswikiOption' value="12">12</option>
+              <option class='foswikiOption' value="24">24</option>
+              <option class='foswikiOption' value="48">48</option>
+              <option class='foswikiOption' value="96">96</option>
             </select>
           </td>
         </tr>
diff --git a/lib/Foswiki/Plugins/SolrPlugin.pm b/lib/Foswiki/Plugins/SolrPlugin.pm
index e5dbd5d..8d90b87 100644
--- a/lib/Foswiki/Plugins/SolrPlugin.pm
+++ b/lib/Foswiki/Plugins/SolrPlugin.pm
@@ -30,8 +30,8 @@ BEGIN {
   }
 }
   
-our $VERSION = '7.00';
-our $RELEASE = '07 Jun 2018';
+our $VERSION = '7.10';
+our $RELEASE = '13 Aug 2018';
 our $SHORTDESCRIPTION = 'Enterprise Search Engine for Foswiki based on 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
index 9e50419..5d63b96 100644
--- a/lib/Foswiki/Plugins/SolrPlugin/Autosuggest.pm
+++ b/lib/Foswiki/Plugins/SolrPlugin/Autosuggest.pm
@@ -24,7 +24,7 @@ sub new {
   my $this = bless(
     $class->SUPER::new(
       name => 'Autosuggest',
-      version => '2.10',
+      version => '2.20',
       author => 'Michael Daum',
       homepage => 'http://foswiki.org/Extensions/SolrPlugin',
       css => ['jquery.autosuggest.css'],
diff --git a/lib/Foswiki/Plugins/SolrPlugin/MANIFEST b/lib/Foswiki/Plugins/SolrPlugin/MANIFEST
index d303e5d..4730625 100644
--- a/lib/Foswiki/Plugins/SolrPlugin/MANIFEST
+++ b/lib/Foswiki/Plugins/SolrPlugin/MANIFEST
@@ -22,6 +22,7 @@ lib/Foswiki/Plugins/SolrPlugin/Index.pm 0644
 lib/Foswiki/Plugins/SolrPlugin.pm 0644
 lib/Foswiki/Plugins/SolrPlugin/Search.pm 0644
 lib/Foswiki/Plugins/SolrPlugin/WebHierarchy.pm 0644
+lib/Makefile 0644
 lib/WebService/Solr/Document.pm 0644
 lib/WebService/Solr/Field.pm 0644
 lib/WebService/Solr.pm 0644
@@ -91,6 +92,7 @@ pub/System/SolrPlugin/toggle-small-collapse.png 0644
 pub/System/SolrPlugin/toggle-small.png 0644
 pub/System/SolrPlugin/widgets/AbstractJQueryFacetWidget.uncompressed.js 0644
 pub/System/SolrPlugin/widgets/AbstractJQueryWidget.uncompressed.js 0644
+pub/System/SolrPlugin/widgets/AlphaPagerWidget.uncompressed.js 0644
 pub/System/SolrPlugin/widgets/CurrentSelectionWidget.uncompressed.js 0644
 pub/System/SolrPlugin/widgets/FacetFieldWidget.uncompressed.js 0644
 pub/System/SolrPlugin/widgets/HierarchyWidget.uncompressed.js 0644
@@ -176,3 +178,5 @@ tools/solrindex 0755
 tools/solrjob 0755
 tools/virtualhosts-solrdelete 0755
 tools/virtualhosts-solrindex 0755
+WebService-Solr-Moo.patch 0644
+WebService-Solr.patch 0644
diff --git a/lib/Makefile b/lib/Makefile
new file mode 100644
index 0000000..1ccf507
--- /dev/null
+++ b/lib/Makefile
@@ -0,0 +1,19 @@
+WEBSERVICE_SOURCES= \
+  WebService/Solr.pm \
+  WebService/Solr/Document.pm \
+  WebService/Solr/Field.pm \
+  WebService/Solr/Query.pm \
+  WebService/Solr/Response.pm
+
+all: $(WEBSERVICE_SOURCES)
+
+git:
+	git clone https://github.com/ilmari/webservice-solr.git
+
+ifneq (,$(wildcard webservice-solr))
+WebService/%: webservice-solr/lib/WebService/%
+	cp $^ $@
+WebService/Solr/%: webservice-solr/lib/WebService/Solr/%
+	cp $^ $@
+endif
+
diff --git a/pub/System/SolrPlugin/Makefile b/pub/System/SolrPlugin/Makefile
index e43247c..73dec40 100644
--- a/pub/System/SolrPlugin/Makefile
+++ b/pub/System/SolrPlugin/Makefile
@@ -37,6 +37,7 @@ AJAX_SOLR_WIDGETS_SOURCE=\
   widgets/ToggleWidget.uncompressed.js \
   widgets/ToggleFacetWidget.uncompressed.js \
   widgets/PagerWidget.uncompressed.js \
+  widgets/AlphaPagerWidget.uncompressed.js \
   widgets/ResultsPerPageWidget.uncompressed.js \
   widgets/ResultWidget.uncompressed.js \
   widgets/SearchBoxWidget.uncompressed.js \
diff --git a/pub/System/SolrPlugin/ajax-solr-init.uncompressed.js b/pub/System/SolrPlugin/ajax-solr-init.uncompressed.js
index abdf26d..4d81016 100644
--- a/pub/System/SolrPlugin/ajax-solr-init.uncompressed.js
+++ b/pub/System/SolrPlugin/ajax-solr-init.uncompressed.js
@@ -62,6 +62,7 @@
     $(".solrResultsPerPage").solrResultsPerPageWidget(manager);
     $(".solrSearchHits").solrResultWidget(manager);
     $(".solrPager").solrPagerWidget(manager);
+    $(".solrAlphaPager").solrAlphaPagerWidget(manager);
     $("#solrSorting").solrSortWidget(manager);
     $(".solrTagCloud").solrTagCloudWidget(manager);
     $(".solrHierarchy").solrHierarchyWidget(manager);
diff --git a/pub/System/SolrPlugin/ajax-solr-widgets.uncompressed.js b/pub/System/SolrPlugin/ajax-solr-widgets.uncompressed.js
index 5cb39a2..3a57dda 100644
--- a/pub/System/SolrPlugin/ajax-solr-widgets.uncompressed.js
+++ b/pub/System/SolrPlugin/ajax-solr-widgets.uncompressed.js
@@ -40,7 +40,7 @@
         value = query.value;
       }
 
-      value = value.replace(/^(.*?):/, '');
+      value = value.toString().replace(/^(.*?):/, '');
 
       return self.inQuery(value) >= 0;
     },
@@ -625,10 +625,7 @@
   AjaxSolr.PagerWidget = AjaxSolr.AbstractJQueryWidget.extend({
     defaults:  {
       prevText: 'Previous',
-      nextText: 'Next',
-      enableScroll: false,
-      scrollTarget: '.solrPager:first',
-      scrollSpeed: 250
+      nextText: 'Next'
     },
 
     perPage: function () {
@@ -642,9 +639,6 @@
         //console.log("page=",page,"start=",start);
         //self.manager.store.get('start').val(start);
         self.manager.doRequest(start);
-        if (self.options.enableScroll) {
-          $.scrollTo(self.options.scrollTarget, self.options.scrollSpeed);
-        }
         return false;
       }
     },
@@ -734,6 +728,77 @@
   // integrate into jQuery 
   AjaxSolr.Helpers.build("PagerWidget");
 
+})(jQuery);
+(function ($) {
+"use strict";
+
+  AjaxSolr.AlphaPagerWidget = AjaxSolr.AbstractJQueryFacetWidget.extend({
+    defaults:  {
+      allText: 'All',
+      union: true,
+      title: "alpha",
+      exclusion: true,
+      enableScroll: false,
+      scrollTarget: '.solrPager:first',
+      scrollSpeed: 250
+    },
+
+    getCurrentVal: function() {
+      var self = this, 
+          value, match, field,
+          fq = self.manager.store.values('fq');
+
+      for (var i = 0, l = fq.length; i < l; i++) {
+        match = fq[i].match(/^(?:{!.*?})?(.*?):(.*)$/);
+        field = match[1];
+        value = match[2]; 
+        
+        if (field === self.field) {
+          return value;
+        }
+      }
+
+      return;
+    },
+
+    afterRequest: function () {
+      var self = this,
+          currentVal = self.getCurrentVal() || '',
+          marker;
+
+      self.$target.empty();
+      self.facetCounts = self.getFacetCounts();
+
+      marker = currentVal?'':'current';
+      $("<a href='#' class='"+marker+"'>"+self.options.allText+"</a>").click(self.unclickHandler(currentVal)).appendTo(self.$target);
+
+      $.each(self.facetCounts.sort(function(a, b) {
+          var facA = a.facet.toUpperCase(),
+              facB = b.facet.toUpperCase();
+          if (facA < facB) {
+            return -1;
+          }
+          if (facA > facB) {
+            return 1;
+          }
+          return 0;
+      }), function(i, item) {
+        marker = currentVal == item.facet ? 'current':'';
+        $("<a href='#' class='"+marker+"'>"+item.facet+"</a>").on("click", self.clickHandler(item.facet)).appendTo(self.$target);
+      });
+    },
+
+    init: function() {
+      var self = this;
+
+      self._super();
+      AjaxSolr.Dicts["default"].set(self.field, self.options.title);
+    }
+  });
+
+  // integrate into jQuery 
+  AjaxSolr.Helpers.build("AlphaPagerWidget");
+
 })(jQuery);
 (function ($) {
 "use strict";
@@ -808,7 +873,27 @@
       displayAs: '.solrDisplay',
       defaultDisplay: 'list',
       dateFormat: 'dddd, Do MMMM YYYY, HH:mm',
-      dictionary: 'default'
+      dictionary: 'default',
+      enableScroll: true,
+      scrollTarget: '.solrSearchHits'
+    },
+
+    scrollIntoView: function() {
+      var self = this, 
+          rect, elem;
+
+      if (self.options.enableScroll) {
+        elem = $(self.options.scrollTarget)[0];
+        rect = elem.getBoundingClientRect();
+
+        if (rect.top < 0) {
+          elem.scrollIntoView({
+            block: "start",
+            inline: "nearest",
+            behavior: "smooth"
+          });
+        } 
+      }
     },
 
     beforeRequest: function () {
@@ -992,6 +1077,7 @@
       ));
 
       self.$target.trigger("update");
+      self.scrollIntoView();
     },
 
     update: function() {
@@ -1427,10 +1513,10 @@
         $.ajax({
           url: foswiki.getPreference('SCRIPTURL')+'/rest/SolrPlugin/webHierarchy',
           async: false,
-	  data: {
-	    //root:self.options.root, SMELL
-	    web:self.options.web
-	  },
+          data: {
+            //root:self.options.root, SMELL
+            web:self.options.web
+          },
           success: function(data) {
             self.hierarchy = data;
           }
@@ -1516,7 +1602,7 @@
       breadcrumbs.push("<a href='#' class='solrFacetValue root' data-value='"+current+"'>"+_("Root")+"</a>");
       if (typeof(current) !== 'undefined') {
         $.each(current.split(/\s*\.\s*/), function(i, val) {
-	  prefix.push(val);
+          prefix.push(val);
           breadcrumbs.push("<a href='#' class='solrFacetValue' data-value='"+prefix.join(".")+"'>"+_(val)+"</a>");
         });
       }
diff --git a/pub/System/SolrPlugin/jquery.autosuggest.uncompressed.js b/pub/System/SolrPlugin/jquery.autosuggest.uncompressed.js
index 279010d..1760547 100644
--- a/pub/System/SolrPlugin/jquery.autosuggest.uncompressed.js
+++ b/pub/System/SolrPlugin/jquery.autosuggest.uncompressed.js
@@ -1,5 +1,5 @@
 /*
- * jQuery autosuggest plugin 2.11
+ * jQuery autosuggest plugin 2.20
  *
  * Copyright (c) 2013-2018 Michael Daum http://michaeldaumconsulting.com
  *
@@ -17,9 +17,14 @@
       delay: 500,
       minLength: 3,
       extraParams: {
-        limit: 3,
         fields: "name,web,topic,container_title,title,type,thumbnail,icon,url,field_Telephone_s,field_Phone_s,field_Mobile_s"
       },
+      limits: {
+        "global": 3,
+        "persons": 3,
+        "topics": 3,
+        "attachments": 3
+      },
       position: {
         my: "right top",
         at: "right+5 bottom+11",
@@ -80,6 +85,8 @@
         elem.addClass(self.options.menuClass);
       }
 
+      self.options.extraParams.limit = self.options.limits.global;
+
       // compiled templates
       self.templates = {};
     },
@@ -176,31 +183,31 @@
           });
 
           $.each(section.docs, function(index, item) {
+            var limit = self.options.limits[section.group];
 
-            if (section.group === 'topics') {
-              item.url = foswiki.getScriptUrl("view", item.web, item.topic);
-            } 
+            if (index < limit) {
+              if (section.group === 'topics') {
+                item.url = foswiki.getScriptUrl("view", item.web, item.topic);
+              } 
 
-            item.phoneNumber = item.field_Telephone_s || item.field_Phone_s || item.field_Mobile_s;
-            item.group = section.group;
+              item.phoneNumber = item.field_Telephone_s || item.field_Phone_s || item.field_Mobile_s;
+              item.group = section.group;
 
-            if (index === 0) {
-              item.isFirst = 'ui-autosuggest-first-in-group';
-              item.header = header;
-            } else {
-              item.isFirst = '';
-              item.header = '';
-            }
+              if (index === 0) {
+                item.isFirst = 'ui-autosuggest-first-in-group';
+                item.header = header;
+              } else {
+                item.isFirst = '';
+                item.header = '';
+              }
 
-            if (index === self.options.extraParams.limit - 1 || index === numDocs - 1) {
-              item.isLast = 'ui-autosuggest-last-in-group';
-              if (numDocs < self.options.extraParams.limit) {
+              if (index === self.options.limits.global - 1 || index === numDocs - 1) {
+                item.isLast = 'ui-autosuggest-last-in-group';
+              } else {
+                item.isLast = '';
               }
-            } else {
-              item.isLast = '';
+              self._renderItemData(ul, item);
             }
-
-            self._renderItemData(ul, item);
           });
 
           // render footer
diff --git a/pub/System/SolrPlugin/solr-searchbox.uncompressed.js b/pub/System/SolrPlugin/solr-searchbox.uncompressed.js
index cfd39c3..2c643e2 100644
--- a/pub/System/SolrPlugin/solr-searchbox.uncompressed.js
+++ b/pub/System/SolrPlugin/solr-searchbox.uncompressed.js
@@ -2,17 +2,16 @@
 jQuery(function($) {
   $(".solrSearchBox:not(.solrSearchBoxInited)").livequery(function() {
     var $this = $(this),
-        extraFilter = $this.data("solrExtraFilter"),
-        itemData = $this.data("solrItemData"),
-	$form = $this.find("form:first"),
+        opts = $this.data(),
+        $form = $this.find("form:first"),
         action = $form.attr("action"),
         $input = $form.find("input[type=text]"),
         position = $.extend({
           my: "right top",
           at: "right bottom+11",
         }, {
-          my: $form.data("position-my"),
-          at: $form.data("position-at"),
+          my: opts.positionMy,
+          at: opts.positionAt
         });
 
     $this.addClass("solrSearchBoxInited");
@@ -29,9 +28,16 @@ jQuery(function($) {
     if (typeof($.fn.autosuggest) === 'function') { // make sure autosuggest realy is present
       $input.autosuggest({
         extraParams: {
-          filter: extraFilter
+          filter: opts.solrExtraFilter,
+          groups: opts.groups
         },
-        itemData: itemData,
+        limits: {
+          "global": opts.limit,
+          "persons": opts.limitPersons,
+          "topics": opts.limitTopics,
+          "attachments": opts.limitAttachments,
+        },
+        itemData: opts.solrItemData,
         position: position,
         menuClass: 'natSearchBoxMenu',
         search: function() {
diff --git a/pub/System/SolrPlugin/solrplugin.uncompressed.css b/pub/System/SolrPlugin/solrplugin.uncompressed.css
index f7511c1..959293f 100644
--- a/pub/System/SolrPlugin/solrplugin.uncompressed.css
+++ b/pub/System/SolrPlugin/solrplugin.uncompressed.css
@@ -173,7 +173,8 @@
 .solrHeader .foswikiFormSteps {
   margin-top:0px;
 }
-.solrFooter .solrPager {
+.solrFooter .solrPager,
+.solrFooter .solrAlphaPager {
   margin:2em 0em 0em;
   border-top:1px solid #ddd;
 }
@@ -181,9 +182,10 @@
 .solrPagerNext,
 .solrAlphaPager a,
 .solrPager a {
-  margin:0px 1px;
-  padding:2px 5px;
+  margin:0 1px;
+  padding:0 5px;
   text-decoration:none;
+  float:left;
 }
 .solrHover input,
 .solrHover label {
diff --git a/pub/System/SolrPlugin/widgets/AbstractJQueryFacetWidget.uncompressed.js b/pub/System/SolrPlugin/widgets/AbstractJQueryFacetWidget.uncompressed.js
index 17cc1ab..e3f5c84 100644
--- a/pub/System/SolrPlugin/widgets/AbstractJQueryFacetWidget.uncompressed.js
+++ b/pub/System/SolrPlugin/widgets/AbstractJQueryFacetWidget.uncompressed.js
@@ -25,7 +25,7 @@
         value = query.value;
       }
 
-      value = value.replace(/^(.*?):/, '');
+      value = value.toString().replace(/^(.*?):/, '');
 
       return self.inQuery(value) >= 0;
     },
diff --git a/pub/System/SolrPlugin/widgets/AlphaPagerWidget.uncompressed.js b/pub/System/SolrPlugin/widgets/AlphaPagerWidget.uncompressed.js
index 219b5e2..bf33074 100644
--- a/pub/System/SolrPlugin/widgets/AlphaPagerWidget.uncompressed.js
+++ b/pub/System/SolrPlugin/widgets/AlphaPagerWidget.uncompressed.js
@@ -14,28 +14,46 @@
 
     getCurrentVal: function() {
       var self = this, 
-          val,
+          value, match, field,
           fq = self.manager.store.values('fq');
 
-console.log("fq=",fq);
-      return val;
+      for (var i = 0, l = fq.length; i < l; i++) {
+        match = fq[i].match(/^(?:{!.*?})?(.*?):(.*)$/);
+        field = match[1];
+        value = match[2]; 
+        
+        if (field === self.field) {
+          return value;
+        }
+      }
+
+      return;
     },
 
     afterRequest: function () {
       var self = this,
-          response = self.manager.response,
-          responseHeader = response.responseHeader,
-          currentVal = self.getCurrentVal(),
-          lastVal = "Z";
+          currentVal = self.getCurrentVal() || '',
+          marker;
+
       self.$target.empty();
       self.facetCounts = self.getFacetCounts();
 
-      console.log("facetCounts=",self.facetCounts,"currentVal=",currentVal);
-
-      $("<a href='#'>"+self.options.allText+"</a>").click(self.clickHandler()).appendTo(self.$target);
+      marker = currentVal?'':'current';
+      $("<a href='#' class='"+marker+"'>"+self.options.allText+"</a>").click(self.unclickHandler(currentVal)).appendTo(self.$target);
 
-      $.each(self.facetCounts, function(i, item) {
-        $("<a href='#' class=''>"+item.facet+"</a>").on("click", self.clickHandler(item.facet)).appendTo(self.$target);
+      $.each(self.facetCounts.sort(function(a, b) {
+          var facA = a.facet.toUpperCase(),
+              facB = b.facet.toUpperCase();
+          if (facA < facB) {
+            return -1;
+          }
+          if (facA > facB) {
+            return 1;
+          }
+          return 0;
+      }), function(i, item) {
+        marker = currentVal == item.facet ? 'current':'';
+        $("<a href='#' class='"+marker+"'>"+item.facet+"</a>").on("click", self.clickHandler(item.facet)).appendTo(self.$target);
       });
     },
 
diff --git a/pub/System/SolrPlugin/widgets/HierarchyWidget.uncompressed.js b/pub/System/SolrPlugin/widgets/HierarchyWidget.uncompressed.js
index 2af3910..a717ff5 100644
--- a/pub/System/SolrPlugin/widgets/HierarchyWidget.uncompressed.js
+++ b/pub/System/SolrPlugin/widgets/HierarchyWidget.uncompressed.js
@@ -18,10 +18,10 @@
         $.ajax({
           url: foswiki.getPreference('SCRIPTURL')+'/rest/SolrPlugin/webHierarchy',
           async: false,
-	  data: {
-	    //root:self.options.root, SMELL
-	    web:self.options.web
-	  },
+          data: {
+            //root:self.options.root, SMELL
+            web:self.options.web
+          },
           success: function(data) {
             self.hierarchy = data;
           }
@@ -107,7 +107,7 @@
       breadcrumbs.push("<a href='#' class='solrFacetValue root' data-value='"+current+"'>"+_("Root")+"</a>");
       if (typeof(current) !== 'undefined') {
         $.each(current.split(/\s*\.\s*/), function(i, val) {
-	  prefix.push(val);
+          prefix.push(val);
           breadcrumbs.push("<a href='#' class='solrFacetValue' data-value='"+prefix.join(".")+"'>"+_(val)+"</a>");
         });
       }
diff --git a/pub/System/SolrPlugin/widgets/PagerWidget.uncompressed.js b/pub/System/SolrPlugin/widgets/PagerWidget.uncompressed.js
index 60d5f20..e0a493f 100644
--- a/pub/System/SolrPlugin/widgets/PagerWidget.uncompressed.js
+++ b/pub/System/SolrPlugin/widgets/PagerWidget.uncompressed.js
@@ -4,10 +4,7 @@
   AjaxSolr.PagerWidget = AjaxSolr.AbstractJQueryWidget.extend({
     defaults:  {
       prevText: 'Previous',
-      nextText: 'Next',
-      enableScroll: false,
-      scrollTarget: '.solrPager:first',
-      scrollSpeed: 250
+      nextText: 'Next'
     },
 
     perPage: function () {
@@ -21,9 +18,6 @@
         //console.log("page=",page,"start=",start);
         //self.manager.store.get('start').val(start);
         self.manager.doRequest(start);
-        if (self.options.enableScroll) {
-          $.scrollTo(self.options.scrollTarget, self.options.scrollSpeed);
-        }
         return false;
       }
     },
diff --git a/pub/System/SolrPlugin/widgets/ResultWidget.uncompressed.js b/pub/System/SolrPlugin/widgets/ResultWidget.uncompressed.js
index d159409..db97819 100644
--- a/pub/System/SolrPlugin/widgets/ResultWidget.uncompressed.js
+++ b/pub/System/SolrPlugin/widgets/ResultWidget.uncompressed.js
@@ -9,7 +9,27 @@
       displayAs: '.solrDisplay',
       defaultDisplay: 'list',
       dateFormat: 'dddd, Do MMMM YYYY, HH:mm',
-      dictionary: 'default'
+      dictionary: 'default',
+      enableScroll: true,
+      scrollTarget: '.solrSearchHits'
+    },
+
+    scrollIntoView: function() {
+      var self = this, 
+          rect, elem;
+
+      if (self.options.enableScroll) {
+        elem = $(self.options.scrollTarget)[0];
+        rect = elem.getBoundingClientRect();
+
+        if (rect.top < 0) {
+          elem.scrollIntoView({
+            block: "start",
+            inline: "nearest",
+            behavior: "smooth"
+          });
+        } 
+      }
     },
 
     beforeRequest: function () {
@@ -193,6 +213,7 @@
       ));
 
       self.$target.trigger("update");
+      self.scrollIntoView();
     },
 
     update: function() {
diff --git a/pub/System/SolrPlugin/wikiusers.uncompressed.css b/pub/System/SolrPlugin/wikiusers.uncompressed.css
index 6184e23..b483cd9 100644
--- a/pub/System/SolrPlugin/wikiusers.uncompressed.css
+++ b/pub/System/SolrPlugin/wikiusers.uncompressed.css
@@ -50,6 +50,7 @@
 .solrSearchHits:after {
   visibility:hidden;
   content:"";
+  min-height:1px;
   -webkit-flex-grow:9999999; 
           flex-grow:9999999;
 }
diff --git a/solr/configsets/foswiki_configs/conf/schema.xml b/solr/configsets/foswiki_configs/conf/schema.xml
index d6923e0..74d8905 100644
--- a/solr/configsets/foswiki_configs/conf/schema.xml
+++ b/solr/configsets/foswiki_configs/conf/schema.xml
@@ -1265,6 +1265,7 @@
    <copyField source="type" dest="catchall"/>
    <copyField source="concept" dest="catchall"/>
    <copyField source="sentence" dest="catchall"/>
+   <copyField source="summary" dest="catchall"/>
 
    <copyField source="attachment" dest="charnorm"/>
    <copyField source="category" dest="charnorm"/>
diff --git a/solr/configsets/foswiki_configs/conf/solrconfig.xml b/solr/configsets/foswiki_configs/conf/solrconfig.xml
index 96a6a98..6b8fbbc 100644
--- a/solr/configsets/foswiki_configs/conf/solrconfig.xml
+++ b/solr/configsets/foswiki_configs/conf/solrconfig.xml
@@ -823,6 +823,7 @@
         title_std^7.0 
         topic_std^7.0 
         title_search^5.0 
+        summary^3.0
         topic_search^2.0 
         title_prefix
         web_search 
@@ -844,6 +845,7 @@
         title_std^7.0 
         topic_std^7.0 
         title_search^5.0 
+        summary^3.0
         topic_search^2.0 
         title_prefix
         web_search 
@@ -883,6 +885,7 @@
         title_std^7.0 
         topic_std^7.0 
         title_search^5.0 
+        summary^3.0
         topic_search^2.0 
         title_prefix
         web_search 
@@ -904,6 +907,7 @@
         title_std^7.0 
         topic_std^7.0 
         title_search^5.0 
+        summary^3.0
         topic_search^2.0 
         title_prefix
         web_search
diff --git a/tools/solrjob b/tools/solrjob
index e0e10e9..99285d1 100755
--- a/tools/solrjob
+++ b/tools/solrjob
@@ -73,7 +73,7 @@ done
 export TIME
 
 (
-  /usr/bin/flock -x -n 200 && (
+  flock -x -n 200 && (
     cd $FOSWIKI_ROOT/tools 
     SOLRINDEX=./solrindex
     SOLRINDEX_ARGS=