[nutch] 13/23: scope variables

[sn...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

snagel pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nutch.git

commit 67dc52cc0f76c51e6fd36dc88f87994c0b2386d8
Author: Nicola Marcacci Rossi <ni...@gmail.com>
AuthorDate: Fri Dec 15 15:05:38 2017 +0100

    scope variables
---
 conf/nutch-default.xml                                     | 14 +++++++-------
 .../indexwriter/elasticrest/ElasticRestConstants.java      |  6 +++---
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/conf/nutch-default.xml b/conf/nutch-default.xml
index f35e787..8ed0f86 100644
--- a/conf/nutch-default.xml
+++ b/conf/nutch-default.xml
@@ -2116,30 +2116,30 @@ visit https://wiki.apache.org/nutch/SimilarityScoringFilter-->
 </property>
 
 <property>
-    <name>elastic.rest.languages</name>
+    <name>elastic.rest.index.languages</name>
     <value></value>
     <description>
         A list of strings denoting the supported languages (e.g. `en,de,fr,it`).
         If this value is empty all documents will be sent to index ${elastic.rest.index}.
         If not empty the Rest client will distribute documents in different indices based on their `lang` property.
-        Indices are named with the following schema: ${elastic.rest.index}${elastic.rest.separator}${lang} (e.g. `nutch_de`).
-        Entries with an unsupported `lang` value will be added to index ${elastic.rest.index}${elastic.rest.separator}${elastic.rest.sink} (e.g. `nutch_others`).
+        Indices are named with the following schema: ${elastic.rest.index}${elastic.rest.index.separator}${lang} (e.g. `nutch_de`).
+        Entries with an unsupported `lang` value will be added to index ${elastic.rest.index}${elastic.rest.index.separator}${elastic.rest.index.sink} (e.g. `nutch_others`).
     </description>
 </property>
 
 <property>
-    <name>elastic.rest.separator</name>
+    <name>elastic.rest.index.separator</name>
     <value>_</value>
     <description>
-        Default value is `_`. Is used only if `elastic.rest.languages` is defined to build the index name (i.e. ${elastic.rest.index}${elastic.rest.separator}${lang}). 
+        Default value is `_`. Is used only if `elastic.rest.index.languages` is defined to build the index name (i.e. ${elastic.rest.index}${elastic.rest.index.separator}${lang}). 
     </description>
 </property>
 
 <property>
-    <name>elastic.rest.sink</name>
+    <name>elastic.rest.index.sink</name>
     <value>others</value>
     <description>
-        Default value is `others`. Is used only if `elastic.rest.languages` is defined to build the index name where to store documents with unsupported languages (i.e. ${elastic.rest.index}${elastic.rest.separator}${elastic.rest.sink}).
+        Default value is `others`. Is used only if `elastic.rest.index.languages` is defined to build the index name where to store documents with unsupported languages (i.e. ${elastic.rest.index}${elastic.rest.index.separator}${elastic.rest.index.sink}).
     </description>
 </property>
 
diff --git a/src/plugin/indexer-elastic-rest/src/java/org/apache/nutch/indexwriter/elasticrest/ElasticRestConstants.java b/src/plugin/indexer-elastic-rest/src/java/org/apache/nutch/indexwriter/elasticrest/ElasticRestConstants.java
index c0f5fe7..b36f027 100644
--- a/src/plugin/indexer-elastic-rest/src/java/org/apache/nutch/indexwriter/elasticrest/ElasticRestConstants.java
+++ b/src/plugin/indexer-elastic-rest/src/java/org/apache/nutch/indexwriter/elasticrest/ElasticRestConstants.java
@@ -31,7 +31,7 @@ public interface ElasticRestConstants {
   public static final String HTTPS = ELASTIC_PREFIX + "https";
   public static final String HOSTNAME_TRUST = ELASTIC_PREFIX + "trustallhostnames";
   
-  public static final String LANGUAGES = ELASTIC_PREFIX + "languages";
-  public static final String SEPARATOR = ELASTIC_PREFIX + "separator";
-  public static final String SINK = ELASTIC_PREFIX + "sink";
+  public static final String LANGUAGES = INDEX + ".languages";
+  public static final String SEPARATOR = INDEX + ".separator";
+  public static final String SINK = INDEX + ".sink";
 }

-- 
To stop receiving notification emails like this one, please contact
"commits@nutch.apache.org" <co...@nutch.apache.org>.