Released version 3.5.13 for archive.

Author: Daniel-KM

Module.php

@@ -92,21 +92,27 @@ public function install(ServiceLocatorInterface $serviceLocator)
     {
         $this->setServiceLocator($serviceLocator);
         $connection = $serviceLocator->get('Omeka\Connection');
+        $translator = $serviceLocator->get('MvcTranslator');
+        $messenger = new Messenger;
+
+        $message = new Message(sprintf(
+            $translator->translate('This module is deprecated and will not receive new improvements any more. The module %1$sSearchSolr%2$s replaces it.'), // @translate
+            '<a href="https://github.com/Daniel-KM/Omeka-S-module-SearchSolr" target="_blank">', '</a>'
+        ));
+        $message->setEscapeHtml(false);
+        $messenger->addWarning($message);
 
         if (!extension_loaded('solr')) {
-            $translator = $serviceLocator->get('MvcTranslator');
             $message = $translator->translate('Solr module requires PHP Solr extension, which is not loaded.');
             throw new ModuleCannotInstallException($message);
         }
 
         if (!class_exists('SolrDisMaxQuery')) {
-            $translator = $serviceLocator->get('MvcTranslator');
             $solrVersion = class_exists('SolrUtils') ? \SolrUtils::getSolrVersion() : $translator->translate('[unknown]');
             $message = new Message(
                 $translator->translate('To use advanced query options (and/or, distance max, etc.), Solr module requires PHP Solr library 2.1.0 or above (lastest recommended, current %s).'),
                 $solrVersion
             );
-            $messenger = new Messenger();
             $messenger->addWarning($message);
         }
 

README.md

@@ -1,10 +1,14 @@
-Solr (module for Omeka S)
+Solr (module for Omeka S) [archived]
 =========================
 
 [![Build Status](https://travis-ci.org/biblibre/omeka-s-module-Solr.svg?branch=master)](https://travis-ci.org/biblibre/omeka-s-module-Solr)
 
 [Solr] is a module for [Omeka S] that provides a [Search] adapter for [Apache Solr].
 
+**IMPORTANT**
+This fork of the module [Solr of BibLibre] is deprecated and replaced by the
+module [Search adapter for Solr] in order to manage improvements.
+
 
 Installation
 ------------
@@ -44,7 +48,7 @@ Quick start
     3. This default node can be customized if needed, for example to force the
        queries to be a "OR" query (default) or a "AND" query (more common).
 3. In Search admin
-    1 . Create an index
+    1. Create an index
         1. Add a new index with name `Default` or whatever you want, using the
         Solr adapter and the `default` node.
         2. Launch the indexation by clicking on the "reindex" button (two arrows
@@ -109,15 +113,15 @@ it via `dpkg`. The process is the same  for Red Hat and derivatives.
 The module works with Solr 5.5.5 (Java [1.7 u55]) and Solr 6.6.6 (Java [1.8]), but
 not Solr 7.2.1 (indexing works, not the search).
 
-```bash
+```sh
 cd /opt
 # Check if java is installed with the good version.
 java -version
 # If not installed, install it (uncomment)
 #sudo apt install default-jre
-# The certificate is currently obsolete on Apache server, so don’t check it.
+# If the certificate is obsolete on Apache server, add --no-check-certificate.
 # To install another version, just change all next version numbers below.
-wget --no-check-certificate https://www.eu.apache.org/dist/lucene/solr/6.6.6/solr-6.6.6.tgz
+wget https://archive.apache.org/dist/lucene/solr/6.6.6/solr-6.6.6.tgz
 # Extract the install script
 tar zxvf solr-6.6.6.tgz solr-6.6.6/bin/install_solr_service.sh --strip-components=2
 # Launch the install script (by default, Solr is installed in /opt; check other options if needed)
@@ -133,12 +137,19 @@ rm install_solr_service.sh
 
 Solr may be managed as a system service:
 
-```bash
+```sh
 sudo systemctl status solr
 sudo systemctl stop solr
 sudo systemctl start solr
 ```
 
+The result may be more complete with direct command:
+```sh
+sudo su - solr -c "/opt/solr/bin/solr status"
+sudo su - solr -c "/opt/solr/bin/solr stop"
+sudo su - solr -c "/opt/solr/bin/solr start"
+```
+
 Solr is automatically launched and available in your browser at [http://localhost:8983].
 
 Solr is available via command line too at `/opt/solr/bin/solr`.
@@ -210,11 +221,11 @@ search engine to add such a protection.
 Before upgrade, you should backup the folder `/var/solr` if you want to upgrade
 a previous config:
 
-```bash
+```sh
 cd /opt
 java -version
 #sudo apt install default-jre
-wget --no-check-certificate https://www.eu.apache.org/dist/lucene/solr/6.6.6/solr-6.6.6.tgz
+wget https://archive.apache.org/dist/lucene/solr/6.6.6/solr-6.6.6.tgz
 tar zxvf solr-6.6.6.tgz solr-6.6.6/bin/install_solr_service.sh --strip-components=2
 # The "-f" means "upgrade". The symlink /opt/solr is automatically updated.
 sudo bash ./install_solr_service.sh solr-6.6.6.tgz -f
@@ -229,7 +240,7 @@ When Solr is installed manually, there is no automatic uninstallation process.
 The next commands are dangerous, so check the commands above twice before
 executing, in particular don’t add whitespace after the slashs "/".
 
-```bash
+```sh
 sudo systemctl stop solr
 sudo update-rc.d -f solr remove
 sudo rm /etc/init.d/solr
@@ -255,7 +266,7 @@ At least one index ("node", "collection" or "core")  should be created in Solr
 to be used with Omeka. The simpler is to create one via the command line to
 avoid permissions issues.
 
-```
+```sh
 sudo su - solr -c "/opt/solr/bin/solr create -c omeka -n data_driven_schema_configs"
 ```
 
@@ -274,7 +285,8 @@ The config files are saved in `/var/solr/data` by default.
 If you choose a data driven schema, you can remove it and create a new one with
 the same name.
 
-```
+```sh
+# Warning: These commands are used for data driven indexation. Else, backup your config first.
 sudo su - solr -c "/opt/solr/bin/solr delete -c omeka"
 sudo su - solr -c "/opt/solr/bin/solr create -c omeka -n data_driven_schema_configs"
 ```
@@ -354,9 +366,11 @@ See commits for full list of contributors.
 
 
 [Solr]: https://github.com/BibLibre/Omeka-S-module-Solr
+[Search adapter for Solr]: https://github.com/Daniel-KM/Omeka-S-module-SearchSolr
 [Omeka S]: https://omeka.org/s
-[Search]: https://github.com/biblibre/omeka-s-module-Search
+[Search]: https://github.com/Daniel-KM/omeka-s-module-Search
 [Apache Solr]: https://lucene.apache.org/solr/
+[Solr of BibLibre]: https://github.com/biblibre/omeka-s-module-Solr
 [Solr module]: https://github.com/biblibre/omeka-s-module-Solr
 [Installing a module]: http://dev.omeka.org/docs/s/user-manual/modules/#installing-modules
 [documentation]: https://lucene.apache.org/solr/guide/7_5/the-dismax-query-parser.html#q-alt-parameter

config/module.ini

@@ -1,12 +1,12 @@
 [info]
-name         = "Search adapter for Solr"
+name         = "Search Solr (archived)"
 description  = "Search Omeka resources instantly and deeply with Lucene / Solr"
 tags         = "Solr, Lucene, search, facet, filter, indexation, autocompletion"
 license      = "CECILL-2.1"
-author       = "BibLibre, improved by Daniel Berthereau"
+author       = "Daniel Berthereau (forked from module Solr of BibLibre)"
 author_link  = "https://github.com/biblibre"
 module_link  = "https://github.com/biblibre/omeka-s-module-Solr"
 support_link = "https://github.com/biblibre/omeka-s-module-Solr/issues"
 configurable = false
-version      = "3.5.12"
+version      = "3.5.13"
 omeka_version_constraint = "^1.2.0 || ^2.0.0"

data/scripts/upgrade.php

@@ -238,3 +238,18 @@
         }
     }
 }
+
+if (version_compare($oldVersion, '3.5.14', '<=')) {
+    $translator = $serviceLocator->get('MvcTranslator');
+    $messenger = new \Omeka\Mvc\Controller\Plugin\Messenger;
+    $message = new \Omeka\Stdlib\Message(sprintf(
+        $translator->translate('This module is deprecated and will not receive new improvements any more. The module %1$sSearchSolr%2$s replaces it.'), // @translate
+        '<a href="https://github.com/Daniel-KM/Omeka-S-module-SearchSolr" target="_blank">', '</a>'
+    ));
+    $message->setEscapeHtml(false);
+    $messenger->addWarning($message);
+    $message = new \Omeka\Stdlib\Message(
+        $translator->translate('The upgrade from fhis old module to the new one is automatic.') // @translate
+    );
+    $messenger->addWarning($message);
+}