Develop3.0.1

pom.xml

@@ -4,14 +4,14 @@
     <parent>
         <artifactId>lutece-global-pom</artifactId>
         <groupId>fr.paris.lutece.tools</groupId>
-        <version>3.0</version>
+        <version>4.0.3</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>fr.paris.lutece.plugins</groupId>
     <artifactId>plugin-solr</artifactId>
     <packaging>lutece-plugin</packaging>
-    <version>3.0.1-SNAPSHOT</version>
+    <version>3.0.4-SNAPSHOT</version>
     <name>Lutece solr search plugin</name>
 
     <repositories>
@@ -35,13 +35,19 @@
         <dependency>
             <groupId>fr.paris.lutece</groupId>
             <artifactId>lutece-core</artifactId>
-            <version>[4.9.9,)</version>
+            <version>[6.1.0,)</version>
             <type>lutece-core</type>
         </dependency>
         <dependency>
             <groupId>org.apache.solr</groupId>
             <artifactId>solr-solrj</artifactId>
-            <version>5.1.0</version>
+            <version>6.5.1</version>
+        </dependency>
+        <dependency>
+            <groupId>fr.paris.lutece.plugins</groupId>
+            <artifactId>plugin-leaflet</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+            <type>lutece-plugin</type>
         </dependency>
     </dependencies>
 
@@ -55,6 +61,7 @@
         <connection>scm:git:https://github.com/lutece-platform/lutece-search-plugin-solr.git</connection>
         <developerConnection>scm:git:https://github.com/lutece-platform/lutece-search-plugin-solr.git</developerConnection>
         <url>https://github.com/lutece-platform/lutece-search-plugin-solr.git</url>
-    </scm>
+        <tag>HEAD</tag>
+  </scm>
 
 </project>

src/java/fr/paris/lutece/plugins/search/resources/search_messages.properties

@@ -31,12 +31,10 @@ solr.adminFeature.fields.form.type=Type
 solr.adminFeature.fields.form.facet=Facet
 solr.adminFeature.fields.form.sort=Sort
 solr.adminFeature.fields.form.description=Description
-solr.adminFeature.fields.form.weight=Weight
-solr.adminFeature.fields.form.weight.low=Low
-solr.adminFeature.fields.form.weight.normal=Normal
-solr.adminFeature.fields.form.weight.high=High
 solr.adminFeature.fields.form.actions=Actions
 solr.adminFeature.buttonDoDel=Del solr index
+solr.adminFeature.operationInProgress=Operation in progress
+solr.adminFeature.operationDone=Operation done
 
 #Display solr result
 solr.display.result.spellchecker=Try with this :  

src/java/fr/paris/lutece/plugins/search/resources/search_messages_fr.properties

@@ -7,36 +7,34 @@ solr.adminFeature.description=Indexe le contenu dans Solr.
 
 #Admin configuration solr search
 solr.adminFeature.configuration.title=Configuration de Solr
-solr.adminFeature.configuration.description=Configuration des propri�t�s de recherche du moteur Solr
+solr.adminFeature.configuration.description=Configuration des propri\u00e9t\u00e9s de recherche du moteur Solr
 solr.adminFeature.configuration.facet.title=Configuration des facettes
-solr.adminFeature.configuration.facet.description=Selectionner les facetes utilis�es pour la recherche.
+solr.adminFeature.configuration.facet.description=Selectionner les facetes utilis\u00e9es pour la recherche.
 solr.adminFeature.configuration.sort.title=Configuration des champs de tri
-solr.adminFeature.configuration.sort.description=Selectionner les champs utilis�s pour le tri lors de la recherche.
+solr.adminFeature.configuration.sort.description=Selectionner les champs utilis\u00e9s pour le tri lors de la recherche.
 solr.adminFeature.configuration.intersection.title=Intersection de Facettes
 solr.adminFeature.configuration.intersection.description=Selectionner deux facettes pour obtenir leurs intersections
 solr.adminFeature.configuration.intersection.field1=Champ 1
 solr.adminFeature.configuration.intersection.field2=Champ 2
-solr.adminFeature.configuration.valid=Modification sauvegard�
+solr.adminFeature.configuration.valid=Modification sauvegard\u00e9
 
 #Admin Solr Fields Management
 solr.adminFeature.fields.title=Gestion des champs Solr
-solr.adminFeature.fields.description=Permet l'ajout, l'update et la suppression de champs solr utils� dans la partie configuration. 
+solr.adminFeature.fields.description=Permet l'ajout, l'update et la suppression de champs solr utils\u00e9 dans la partie configuration. 
 solr.adminFeature.fields.display.title=Champs Solr disponible
 solr.adminFeature.fields.display.description=Liste des champs Solr disponible pour la configuration des facettes, tri, ect ...
-solr.adminFeature.fields.form.create.title=Cr�ation d'un champs
-solr.adminFeature.fields.form.update.title=Mise � jour d'un champs
+solr.adminFeature.fields.form.create.title=Cr\u00e9ation d'un champs
+solr.adminFeature.fields.form.update.title=Mise \u00e0 jour d'un champs
 solr.adminFeature.fields.form.name=Nom
 solr.adminFeature.fields.form.label=Label
 solr.adminFeature.fields.form.type=Type
 solr.adminFeature.fields.form.facet=Facette
 solr.adminFeature.fields.form.sort=Tri
 solr.adminFeature.fields.form.description=Description
-solr.adminFeature.fields.form.weight.low=Basse
-solr.adminFeature.fields.form.weight.normal=Normal
-solr.adminFeature.fields.form.weight.high=Haute
-solr.adminFeature.fields.form.weight=Pond�ration
 solr.adminFeature.fields.form.actions=Actions
 solr.adminFeature.buttonDoDel=Effacer l'index
+solr.adminFeature.operationInProgress=Op\u00e9ration en cours
+solr.adminFeature.operationDone=Op\u00e9ration termin\u00e9e
 
 #Display solr result
 solr.display.result.spellchecker=Essayez avec ceci :  

src/java/fr/paris/lutece/plugins/search/solr/business/SolrFacetedResult.java

@@ -34,7 +34,6 @@
 package fr.paris.lutece.plugins.search.solr.business;
 
 import org.apache.solr.client.solrj.response.FacetField;
-import org.apache.solr.client.solrj.response.SpellCheckResponse;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -61,9 +60,6 @@ public class SolrFacetedResult
     /**Commentaire. **/
     private Map<String, ArrayList<FacetField>> facetIntersection;
 
-    /**spellcheck. **/
-    private SpellCheckResponse solrSpellCheckResponse;
-
     private int _nCount;
 
     /**
@@ -143,12 +139,4 @@ public final void setFacetIntersection( Map<String, ArrayList<FacetField>> facet
     {
         this.facetIntersection = facetIntersection;
     }
-
-	public SpellCheckResponse getSolrSpellCheckResponse() {
-		return this.solrSpellCheckResponse;
-	}
-
-	public void setSolrSpellCheckResponse(SpellCheckResponse solrSpellCheckResponse) {
-		this.solrSpellCheckResponse = solrSpellCheckResponse;
-	}
 }

src/java/fr/paris/lutece/plugins/search/solr/business/SolrSearchAppConf.java

@@ -0,0 +1,141 @@
+/*
+ * Copyright (c) 2002-2015, Mairie de Paris
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *  1. Redistributions of source code must retain the above copyright notice
+ *     and the following disclaimer.
+ *
+ *  2. Redistributions in binary form must reproduce the above copyright notice
+ *     and the following disclaimer in the documentation and/or other materials
+ *     provided with the distribution.
+ *
+ *  3. Neither the name of 'Mairie de Paris' nor 'Lutece' nor the names of its
+ *     contributors may be used to endorse or promote products derived from
+ *     this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * License 1.0
+ */
+package fr.paris.lutece.plugins.search.solr.business;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import fr.paris.lutece.plugins.search.solr.service.SolrSearchAppConfService;
+import fr.paris.lutece.plugins.search.solr.util.SolrConstants;
+
+
+/**
+ *
+ * SolrSearchAppConf
+ *
+ */
+public class SolrSearchAppConf
+{
+    private String _strCode = SolrSearchAppConfService.EMPTY_CODE;
+    private String _strFilterQuery = SolrConstants.CONSTANT_DEFAULT_FILTER_QUERY;
+    private String _strTemplate = SolrConstants.CONSTANT_DEFAULT_TEMPLATE;
+    private boolean _bExtraMappingQuery = SolrConstants.CONSTANT_DEFAULT_EXTRA_MAPPING_QUERY;
+    private List<String> _listAddonBeanNames = new ArrayList<String>(  );
+
+    /**
+     * Returns the code
+     * @return the code
+     */
+    public String getCode(  )
+    {
+        return _strCode;
+    }
+
+    /**
+     * Sets the code
+     * @param code the code
+     */
+    public void setCode( String code )
+    {
+        _strCode = code;
+    }
+
+    /**
+     * Returns the template
+     * @return the template
+     */
+    public String getTemplate(  )
+    {
+        return _strTemplate;
+    }
+
+    /**
+     * Sets the template
+     * @param template the template
+     */
+    public void setTemplate( String template )
+    {
+        _strTemplate = template;
+    }
+
+    /**
+     * Returns the filter query
+     * @return the filter query
+     */
+    public String getFilterQuery(  )
+    {
+        return _strFilterQuery;
+    }
+
+    /**
+     * Sets the filter query
+     * @param filter query the code
+     */
+    public void setFilterQuery( String strFilterQuery )
+    {
+        _strFilterQuery = strFilterQuery;
+    }
+
+    /**
+     * Returns the boolean indicating if we need an extra query for mapping
+     * @return the boolean indicating if we need an extra query for mapping
+     */
+    public boolean getExtraMappingQuery(  )
+    {
+        return _bExtraMappingQuery;
+    }
+
+    /**
+     * Sets the boolean indicating if we need an extra query for mapping
+     * @param bExtraMappingQuery the boolean indicating if we need an extra query for mapping
+     */
+    public void setExtraMappingQuery( boolean bExtraMappingQuery )
+    {
+        _bExtraMappingQuery = bExtraMappingQuery;
+    }
+
+    /**
+     * @return the AddonBeanNames
+     */
+    public List<String> getAddonBeanNames() {
+        return _listAddonBeanNames;
+    }
+
+    /**
+     * @param listAddonBeanNames the AddonBeanNames to set
+     */
+    public void setAddonBeanNames(List<String> listAddonBeanNames) {
+        this._listAddonBeanNames = listAddonBeanNames;
+    }
+}