geoblacklight 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5cbe25203c73d542b897ad3d556f55848632394c
-  data.tar.gz: 72c74184a3184e3307c32dd6abfe405f7790b3a4
+  metadata.gz: 1b5f2c417b7e8c11d65f0e3819b17bf6ac266fb3
+  data.tar.gz: 555901edd70f1d935fb07a136054a55e6fd4eedf
 SHA512:
-  metadata.gz: a7edd50a9275357113347cf2965d590641254cbb36280dddc8bba6aee9ec41b609f0bc1bf68a26815dfafa9351eadf4cbe9a6f169c12d249757be25682a77053
-  data.tar.gz: 1b9b2064a3503c9a970fed6dd7f9c63ef1d82cc235da3e9a1bb115ab00202f7b8bd50fb2e0c195c491e1e3a7945591016d742feb9ca9731a53b62db422672e5f
+  metadata.gz: 2ac6496f588232c50468f0176a1bccb49b01b9aa40b3aaa7bb0c2bdddf254cca5362a79431fccf77e70512f53e00e2e981698c618a2d9482f9d0f60689a1f9b3
+  data.tar.gz: 26d04d043092d03618625a3cfec1f79597123f0d0a2659820d1f7ab219c04a5b6c415e93286c1c055bdc1b2b47a882759cab2a0302533cd0593f7c8a22d712a2

data/app/assets/javascripts/geoblacklight/geoblacklight.js

@@ -20,7 +20,7 @@
 
   var GeoBlacklight = L.Class.extend({
     statics: {
-      __version__: '1.0.1',
+      __version__: '1.0.2',
 
       debounce: function(fn, delay) {
         var timeout = null;

data/app/assets/stylesheets/geoblacklight/modules/home.scss

@@ -14,10 +14,6 @@
   }
 }
 
-.home-facet-link {
-  
-}
-
 .category-block {
   @extend .col-md-6;
   @extend .text-center;

data/lib/geoblacklight/version.rb

@@ -1,3 +1,3 @@
 module Geoblacklight
-  VERSION = '1.0.1'.freeze
+  VERSION = '1.0.2'.freeze
 end

data/lib/tasks/configure_solr.rake

@@ -7,17 +7,8 @@ namespace :geoblacklight do
   desc 'Configures Solr for local jetty instance'
   task :configure_solr do
     root = Gem::Specification.find_by_name('geoblacklight').gem_dir rescue '.'
-    [
-      {
-        src: "schema/solr/conf/schema.xml",
-        file: 'schema.xml'
-      },
-      {
-        src: "schema/solr/conf/solrconfig.xml",
-        file: 'solrconfig.xml'
-      }
-    ].each do |item|
-      FileUtils.cp File.join(root, item[:src]), "jetty/solr/blacklight-core/conf/#{item[:file]}", verbose: true
-    end
+    FileUtils.cp Dir.glob(File.join(root, 'schema', 'solr', 'conf', '*.*')),
+                 'jetty/solr/blacklight-core/conf/',
+                 verbose: true
   end
 end

data/schema/geoblacklight-schema.json

@@ -172,7 +172,7 @@
           "items": {
             "type": "string"
           },
-          "description": "Holding dataset for the layer, such as the name of a collection. *Optional*",
+          "description": "Holding entity for the layer, such as the title of a collection. *Optional*",
           "example": "Village Maps of India"
         },
         "georss_point_s": {

data/schema/geoblacklight-schema.md

@@ -19,7 +19,7 @@ A GIS data layer. See [this example](https://github.com/OpenGeoMetadata/edu.stan
 | **dc_subject_sm** | *array* | Subjects for the layer, preferrably in a controlled vocabulary. *Optional* | `"Census, Human settlements"` |
 | **dc_title_s** | *string* | Title for the layer. | `"My Title"` |
 | **dc_type_s** | *string* | Resource type of the layer, using DCMI Type Vocabulary, usually a `Dataset`. *Optional*<br/> **one of:**`"Dataset"` or `"Image"` or `"PhysicalObject"` | `"Dataset"` |
-| **dct_isPartOf_sm** | *array* | Holding dataset for the layer, such as the name of a collection. *Optional* | `"Village Maps of India"` |
+| **dct_isPartOf_sm** | *array* | Holding entity for the layer, such as the title of a collection. *Optional* | `"Village Maps of India"` |
 | **dct_issued_dt** | *date-time* | Issued date for the layer, using XML Schema dateTime format (YYYY-MM-DDThh:mm:ssZ). *Optional* | `"2015-01-01T12:00:00Z"` |
 | **dct_provenance_s** | *string* | Institution who holds the layer. | `"Stanford"` |
 | **dct_references_s** | *string* | External resources that are available for the layer. The value is a JSON hash where each key is a URI for the protocol or format, and the value is the URL to the external resource. See `dct_references_s` [detailed documentation](http://geoblacklight.org/tutorial/2015/02/09/geoblacklight-overview.html) | `"{ ... }"` |
@@ -35,5 +35,3 @@ A GIS data layer. See [this example](https://github.com/OpenGeoMetadata/edu.stan
 | **solr_geom** | *string* | Bounding box of the layer as a ENVELOPE WKT (from the CQL standard) using coordinates in (West, East, North, South) order. Note that this field is indexed as a Solr spatial (RPT) field.<br/> **pattern:** `ENVELOPE(.*,.*,.*,.*)` | `"ENVELOPE(76.76, 84.76, 19.91, 12.62)"` |
 | **solr_year_i** | *integer* | *DEPRECATED* (only used by the Blacklight range plugin, not core GeoBlacklight, and generally you want a multi-valued field here): *Derived from* `dct_temporal_sm`. Year for which layer is valid and only a single value. Note that this field is indexed as a Solr numeric field. | `"1989"` |
 | **uuid** | *string* | *DEPRECATED* (use `dc_identifier_s`): Unique identifier for layer that is globally unique. | `"http://purl.stanford.edu/vr593vj7147"` |
-
-

data/schema/solr/conf/schema.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<schema name="geoblacklight-schema" version="1.5">
+<schema name="geoblacklight-schema" version="1.6">
   <uniqueKey>layer_slug_s</uniqueKey>
   <fields>
     <field name="_version_" type="long"   stored="true" indexed="true"/>
@@ -39,6 +39,10 @@
                                 termVectors="true" termPositions="true" termOffsets="true"/>
     <dynamicField name="*_sort" type="text_sort" stored="false" indexed="true" multiValued="false"/>
 
+    <dynamicField name="*spell" type="textSpell" indexed="true" stored="false" multiValued="true" />
+
+    <dynamicField name="*suggest" type="textSuggest" indexed="true" stored="false" multiValued="true" />
+
     <!-- Spatial field types:
 
          Solr3:
@@ -58,9 +62,8 @@
 
       -->
     <dynamicField name="*_pt"   type="location"     stored="true" indexed="true"/>
-    <dynamicField name="*_bbox" type="location_rpt" stored="true" indexed="true"/>
+    <dynamicField name="*_bbox" type="location_rpt" stored="true" indexed="true"/><!-- deprecated -->
     <dynamicField name="*_geom" type="location_rpt" stored="true" indexed="true"/>
-    <!-- <dynamicField name="*_jts"  type="location_jts" stored="true" indexed="true"/> -->
   </fields>
 
   <types>
@@ -82,7 +85,7 @@
 
     <!-- A text field with defaults appropriate for English: it
          tokenizes with StandardTokenizer, removes English stop words
-         (lang/stopwords_en.txt), down cases, protects words from protwords.txt, and
+         (stopwords_en.txt), down cases, protects words from protwords.txt, and
          finally applies Porter's stemming.  The query time analyzer
          also applies synonyms from synonyms.txt. -->
     <fieldType name="text_en" class="solr.TextField" positionIncrementGap="100">
@@ -115,6 +118,27 @@
       </analyzer>
     </fieldType>
 
+    <!-- for spell checking -->
+    <fieldType name="textSpell" class="solr.TextField" positionIncrementGap="100" >
+      <analyzer>
+        <tokenizer class="solr.StandardTokenizerFactory"/>
+        <filter class="solr.StopFilterFactory" ignoreCase="true" words="stopwords_en.txt"/>
+        <filter class="solr.StandardFilterFactory"/>
+        <filter class="solr.LowerCaseFilterFactory"/>
+        <filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
+      </analyzer>
+    </fieldType>
+
+    <!-- for suggestions -->
+    <fieldType class="solr.TextField" name="textSuggest" positionIncrementGap="100">
+      <analyzer>
+        <tokenizer class="solr.KeywordTokenizerFactory"/>
+        <filter class="solr.StandardFilterFactory"/>
+        <filter class="solr.LowerCaseFilterFactory"/>
+        <filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
+      </analyzer>
+    </fieldType>
+
     <!-- Spatial field types -->
     <fieldType name="location" class="solr.LatLonType" subFieldSuffix="_d"/>
 
@@ -123,14 +147,6 @@
                maxDistErr="0.000009"
                units="degrees"
             />
-
-    <!-- JTS-enabled spatial predicates; requires JTS installation -->
-    <!-- <fieldType name="location_jts" class="solr.SpatialRecursivePrefixTreeFieldType"
-               spatialContextFactory="com.spatial4j.core.context.jts.JtsSpatialContextFactory"
-               distErrPct="0.025"
-               maxDistErr="0.000009"
-               units="degrees"
-            /> -->
   </types>
 
   <!-- for scoring formula -->
@@ -158,4 +174,19 @@
   <copyField source="dc_publisher_s"     dest="dc_publisher_sort"/>
   <copyField source="dc_title_s"         dest="dc_title_sort"/>
 
+  <!-- for spell checking -->
+  <copyField source="dc_title_s" dest="spell"/>
+  <copyField source="dc_creator_sm" dest="spell"/>
+  <copyField source="dc_publisher_s" dest="spell"/>
+  <copyField source="dct_provenance_s" dest="spell"/>
+  <copyField source="dc_subject_sm" dest="spell"/>
+  <copyField source="dct_spatial_sm" dest="spell"/>
+
+  <!-- for suggestions -->
+  <copyField source="dc_title_s" dest="suggest"/>
+  <copyField source="dc_creator_sm" dest="suggest"/>
+  <copyField source="dc_publisher_s" dest="suggest"/>
+  <copyField source="dct_provenance_s" dest="suggest"/>
+  <copyField source="dc_subject_sm" dest="suggest"/>
+  <copyField source="dct_spatial_sm" dest="suggest"/>
 </schema>

data/schema/solr/conf/solrconfig.xml

@@ -15,9 +15,9 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -->
-<!-- 
+<!--
      For more details about configurations options that may appear in
-     this file, see http://wiki.apache.org/solr/SolrConfigXml. 
+     this file, see http://wiki.apache.org/solr/SolrConfigXml.
 -->
 <config>
   <luceneMatchVersion>4.7</luceneMatchVersion>
@@ -40,16 +40,16 @@
     </autoCommit>
   </updateHandler>
 
-  <!-- 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 
+  <!-- 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. -->
   <requestHandler name="/get" class="solr.RealTimeGetHandler">
     <lst name="defaults">
       <str name="omitHeader">true</str>
     </lst>
-  </requestHandler>  
-  
-  <requestHandler name="/replication" class="solr.ReplicationHandler" startup="lazy" /> 
+  </requestHandler>
+
+  <requestHandler name="/replication" class="solr.ReplicationHandler" startup="lazy" />
 
   <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
        Query section - these settings control query time things like caches
@@ -147,7 +147,12 @@
       <str name="facet.field">dc_subject_sm</str>
       <str name="facet.field">layer_geom_type_s</str>
       <str name="facet.field">solr_year_i</str>
+
+      <str name="spellcheck">true</str>
     </lst>
+    <arr name="last-components">
+      <str>spellcheck</str>
+    </arr>
   </requestHandler>
 
   <requestHandler name="/update" class="solr.UpdateRequestHandler"/>
@@ -161,18 +166,65 @@
     <lst name="defaults">
       <str name="echoParams">all</str>
     </lst>
-    <!-- An optional feature of the PingRequestHandler is to configure the 
-         handler with a "healthcheckFile" which can be used to enable/disable 
+    <!-- An optional feature of the PingRequestHandler is to configure the
+         handler with a "healthcheckFile" which can be used to enable/disable
          the PingRequestHandler.
-         relative paths are resolved against the data dir 
+         relative paths are resolved against the data dir
       -->
     <str name="healthcheckFile">server-enabled.txt</str>
   </requestHandler>
-  
-  <requestHandler name="/analysis/field" 
+
+  <requestHandler name="/analysis/field"
                   startup="lazy"
                   class="solr.FieldAnalysisRequestHandler" />
-                  
+
+  <searchComponent name="spellcheck" class="solr.SpellCheckComponent">
+    <!-- a spellchecker built from a field of the main index -->
+    <lst name="spellchecker">
+      <str name="name">default</str>
+      <str name="field">spell</str>
+      <str name="classname">solr.DirectSolrSpellChecker</str>
+      <!-- the spellcheck distance measure used, the default is the internal levenshtein -->
+      <str name="distanceMeasure">internal</str>
+      <!-- minimum accuracy needed to be considered a valid spellcheck suggestion -->
+      <float name="accuracy">0.5</float>
+      <!-- the maximum #edits we consider when enumerating terms: can be 1 or 2 -->
+      <int name="maxEdits">2</int>
+      <!-- the minimum shared prefix when enumerating terms -->
+      <int name="minPrefix">1</int>
+      <!-- maximum number of inspections per result. -->
+      <int name="maxInspections">5</int>
+      <!-- minimum length of a query term to be considered for correction -->
+      <int name="minQueryLength">4</int>
+      <!-- maximum threshold of documents a query term can appear to be considered for correction -->
+      <float name="maxQueryFrequency">0.01</float>
+      <!-- uncomment this to require suggestions to occur in 1% of the documents
+        <float name="thresholdTokenFrequency">.01</float>
+      -->
+    </lst>
+  </searchComponent>
+
+  <searchComponent name="suggest" class="solr.SuggestComponent">
+    <lst name="suggester">
+      <str name="name">mySuggester</str>
+      <str name="lookupImpl">FuzzyLookupFactory</str>
+      <str name="suggestAnalyzerFieldType">textSuggest</str>
+      <str name="buildOnCommit">true</str>
+      <str name="field">suggest</str>
+    </lst>
+  </searchComponent>
+
+  <requestHandler name="/suggest" class="solr.SearchHandler" startup="lazy">
+    <lst name="defaults">
+      <str name="suggest">true</str>
+      <str name="suggest.count">5</str>
+      <str name="suggest.dictionary">mySuggester</str>
+    </lst>
+    <arr name="components">
+      <str>suggest</str>
+    </arr>
+  </requestHandler>
+
   <!-- Legacy config for the admin interface -->
   <admin>
     <defaultQuery>*:*</defaultQuery>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geoblacklight
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Mike Graves
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-30 00:00:00.000000000 Z
+date: 2016-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blacklight
@@ -385,7 +385,6 @@ files:
 - lib/tasks/geoblacklight.rake
 - schema/geoblacklight-schema.json
 - schema/geoblacklight-schema.md
-- schema/solr/conf/lang/stopwords_en.txt
 - schema/solr/conf/protwords.txt
 - schema/solr/conf/schema.xml
 - schema/solr/conf/solrconfig.xml

data/schema/solr/conf/lang/stopwords_en.txt

@@ -1,34 +0,0 @@
-# Standard english stop words taken from Lucene's StopAnalyzer
-a
-an
-and
-are
-as
-at
-be
-but
-by
-for
-if
-in
-into
-is
-it
-no
-not
-of
-on
-or
-such
-that
-the
-their
-then
-there
-these
-they
-this
-to
-was
-will
-with