Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into 1358-datastore-ui
- Loading branch information
Showing
17 changed files
with
240 additions
and
116 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,30 +1,12 @@ | ||
| CKAN SOLR schemas | ||
| ================= | ||
| CKAN Solr schema | ||
| ================ | ||
|
|
||
| This folder contains the latest and previous versions of the SOLR XML | ||
| schema files used by CKAN. These can be use on the SOLR server to | ||
| override the default SOLR schema. Please note that not all schemas are | ||
| backwards compatible with old CKAN versions. Check the CHANGELOG.txt file | ||
| in this same folder to check which version of the schema should you use | ||
| depending on the CKAN version you are using. | ||
| This folder contains the Solr schema file used by CKAN (schema.xml). | ||
|
|
||
| Developers, when pushing changes to the SOLR schema: | ||
| Starting from 2.2 this is the only file that should be used by users and | ||
| modified by devs. The rest of files (schema-{version}.xml) are kept for | ||
| backwards compatibility purposes and should not be used, as they might be | ||
| removed in future versions. | ||
|
|
||
| * Note that updates on the schema are only release based, i.e. all changes | ||
| in the schema between releases will be part of the same new version of | ||
| the schema. | ||
|
|
||
| * Name the new version of the file using the following convention:: | ||
|
|
||
| schema-<version>.xml | ||
|
|
||
| * Update the `version` attribute of the `schema` tag in the new file:: | ||
|
|
||
| <schema name="ckan" version="<version>"> | ||
|
|
||
| * Update the SUPPORTED_SCHEMA_VERSIONS list in `ckan/lib/search/__init__.py` | ||
| Consider if the changes introduced are or are not compatible with | ||
| previous schema versions. | ||
|
|
||
| * Update the CHANGELOG.txt file with the new version, the CKAN version | ||
| required and changes made to the schema. | ||
| When upgrading CKAN, always check the CHANGELOG on each release to see if | ||
| you need to update the schema file and reindex your datasets. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,165 @@ | ||
| <?xml version="1.0" encoding="UTF-8" ?> | ||
| <!-- | ||
| Licensed to the Apache Software Foundation (ASF) under one or more | ||
| contributor license agreements. See the NOTICE file distributed with | ||
| this work for additional information regarding copyright ownership. | ||
| The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| (the "License"); you may not use this file except in compliance with | ||
| the License. You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| --> | ||
|
|
||
| <schema name="ckan" version="2.0"> | ||
|
|
||
| <types> | ||
| <fieldType name="string" class="solr.StrField" sortMissingLast="true" omitNorms="true"/> | ||
| <fieldType name="boolean" class="solr.BoolField" sortMissingLast="true" omitNorms="true"/> | ||
| <fieldtype name="binary" class="solr.BinaryField"/> | ||
| <fieldType name="int" class="solr.TrieIntField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/> | ||
| <fieldType name="float" class="solr.TrieFloatField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/> | ||
| <fieldType name="long" class="solr.TrieLongField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/> | ||
| <fieldType name="double" class="solr.TrieDoubleField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/> | ||
| <fieldType name="tint" class="solr.TrieIntField" precisionStep="8" omitNorms="true" positionIncrementGap="0"/> | ||
| <fieldType name="tfloat" class="solr.TrieFloatField" precisionStep="8" omitNorms="true" positionIncrementGap="0"/> | ||
| <fieldType name="tlong" class="solr.TrieLongField" precisionStep="8" omitNorms="true" positionIncrementGap="0"/> | ||
| <fieldType name="tdouble" class="solr.TrieDoubleField" precisionStep="8" omitNorms="true" positionIncrementGap="0"/> | ||
| <fieldType name="date" class="solr.TrieDateField" omitNorms="true" precisionStep="0" positionIncrementGap="0"/> | ||
| <fieldType name="tdate" class="solr.TrieDateField" omitNorms="true" precisionStep="6" positionIncrementGap="0"/> | ||
|
|
||
| <fieldType name="text" class="solr.TextField" positionIncrementGap="100"> | ||
| <analyzer type="index"> | ||
| <tokenizer class="solr.WhitespaceTokenizerFactory"/> | ||
| <filter class="solr.WordDelimiterFilterFactory" generateWordParts="1" generateNumberParts="1" catenateWords="1" catenateNumbers="1" catenateAll="0" splitOnCaseChange="1"/> | ||
| <filter class="solr.LowerCaseFilterFactory"/> | ||
| <filter class="solr.SnowballPorterFilterFactory" language="English" protected="protwords.txt"/> | ||
| <filter class="solr.ASCIIFoldingFilterFactory"/> | ||
| </analyzer> | ||
| <analyzer type="query"> | ||
| <tokenizer class="solr.WhitespaceTokenizerFactory"/> | ||
| <filter class="solr.SynonymFilterFactory" synonyms="synonyms.txt" ignoreCase="true" expand="true"/> | ||
| <filter class="solr.WordDelimiterFilterFactory" generateWordParts="1" generateNumberParts="1" catenateWords="0" catenateNumbers="0" catenateAll="0" splitOnCaseChange="1"/> | ||
| <filter class="solr.LowerCaseFilterFactory"/> | ||
| <filter class="solr.SnowballPorterFilterFactory" language="English" protected="protwords.txt"/> | ||
| <filter class="solr.ASCIIFoldingFilterFactory"/> | ||
| </analyzer> | ||
| </fieldType> | ||
|
|
||
|
|
||
| <!-- A general unstemmed text field - good if one does not know the language of the field --> | ||
| <fieldType name="textgen" class="solr.TextField" positionIncrementGap="100"> | ||
| <analyzer type="index"> | ||
| <tokenizer class="solr.WhitespaceTokenizerFactory"/> | ||
| <filter class="solr.WordDelimiterFilterFactory" generateWordParts="1" generateNumberParts="1" catenateWords="1" catenateNumbers="1" catenateAll="0" splitOnCaseChange="0"/> | ||
| <filter class="solr.LowerCaseFilterFactory"/> | ||
| </analyzer> | ||
| <analyzer type="query"> | ||
| <tokenizer class="solr.WhitespaceTokenizerFactory"/> | ||
| <filter class="solr.SynonymFilterFactory" synonyms="synonyms.txt" ignoreCase="true" expand="true"/> | ||
| <filter class="solr.WordDelimiterFilterFactory" generateWordParts="1" generateNumberParts="1" catenateWords="0" catenateNumbers="0" catenateAll="0" splitOnCaseChange="0"/> | ||
| <filter class="solr.LowerCaseFilterFactory"/> | ||
| </analyzer> | ||
| </fieldType> | ||
| </types> | ||
|
|
||
|
|
||
| <fields> | ||
| <field name="index_id" type="string" indexed="true" stored="true" required="true" /> | ||
| <field name="id" type="string" indexed="true" stored="true" required="true" /> | ||
| <field name="site_id" type="string" indexed="true" stored="true" required="true" /> | ||
| <field name="title" type="text" indexed="true" stored="true" /> | ||
| <field name="entity_type" type="string" indexed="true" stored="true" omitNorms="true" /> | ||
| <field name="dataset_type" type="string" indexed="true" stored="true" /> | ||
| <field name="state" type="string" indexed="true" stored="true" omitNorms="true" /> | ||
| <field name="name" type="string" indexed="true" stored="true" omitNorms="true" /> | ||
| <field name="revision_id" type="string" indexed="true" stored="true" omitNorms="true" /> | ||
| <field name="version" type="string" indexed="true" stored="true" /> | ||
| <field name="url" type="string" indexed="true" stored="true" omitNorms="true" /> | ||
| <field name="ckan_url" type="string" indexed="true" stored="true" omitNorms="true" /> | ||
| <field name="download_url" type="string" indexed="true" stored="true" omitNorms="true" /> | ||
| <field name="notes" type="text" indexed="true" stored="true"/> | ||
| <field name="author" type="textgen" indexed="true" stored="true" /> | ||
| <field name="author_email" type="textgen" indexed="true" stored="true" /> | ||
| <field name="maintainer" type="textgen" indexed="true" stored="true" /> | ||
| <field name="maintainer_email" type="textgen" indexed="true" stored="true" /> | ||
| <field name="license" type="string" indexed="true" stored="true" /> | ||
| <field name="license_id" type="string" indexed="true" stored="true" /> | ||
| <field name="ratings_count" type="int" indexed="true" stored="false" /> | ||
| <field name="ratings_average" type="float" indexed="true" stored="false" /> | ||
| <field name="tags" type="string" indexed="true" stored="true" multiValued="true"/> | ||
| <field name="groups" type="string" indexed="true" stored="true" multiValued="true"/> | ||
|
|
||
| <field name="capacity" type="string" indexed="true" stored="true" multiValued="false"/> | ||
|
|
||
| <field name="res_description" type="textgen" indexed="true" stored="true" multiValued="true"/> | ||
| <field name="res_format" type="string" indexed="true" stored="true" multiValued="true"/> | ||
| <field name="res_url" type="string" indexed="true" stored="true" multiValued="true"/> | ||
|
|
||
| <!-- catchall field, containing all other searchable text fields (implemented | ||
| via copyField further on in this schema --> | ||
| <field name="text" type="text" indexed="true" stored="false" multiValued="true"/> | ||
| <field name="urls" type="text" indexed="true" stored="false" multiValued="true"/> | ||
|
|
||
| <field name="depends_on" type="text" indexed="true" stored="false" multiValued="true"/> | ||
| <field name="dependency_of" type="text" indexed="true" stored="false" multiValued="true"/> | ||
| <field name="derives_from" type="text" indexed="true" stored="false" multiValued="true"/> | ||
| <field name="has_derivation" type="text" indexed="true" stored="false" multiValued="true"/> | ||
| <field name="links_to" type="text" indexed="true" stored="false" multiValued="true"/> | ||
| <field name="linked_from" type="text" indexed="true" stored="false" multiValued="true"/> | ||
| <field name="child_of" type="text" indexed="true" stored="false" multiValued="true"/> | ||
| <field name="parent_of" type="text" indexed="true" stored="false" multiValued="true"/> | ||
| <field name="views_total" type="int" indexed="true" stored="false"/> | ||
| <field name="views_recent" type="int" indexed="true" stored="false"/> | ||
| <field name="resources_accessed_total" type="int" indexed="true" stored="false"/> | ||
| <field name="resources_accessed_recent" type="int" indexed="true" stored="false"/> | ||
|
|
||
| <field name="metadata_created" type="date" indexed="true" stored="true" multiValued="false"/> | ||
| <field name="metadata_modified" type="date" indexed="true" stored="true" multiValued="false"/> | ||
|
|
||
| <field name="indexed_ts" type="date" indexed="true" stored="true" default="NOW" multiValued="false"/> | ||
|
|
||
| <!-- Copy the title field into titleString, and treat as a string | ||
| (rather than text type). This allows us to sort on the titleString --> | ||
| <field name="title_string" type="string" indexed="true" stored="false" /> | ||
|
|
||
| <field name="data_dict" type="string" indexed="false" stored="true" /> | ||
| <field name="validated_data_dict" type="string" indexed="false" stored="true" /> | ||
|
|
||
| <field name="_version_" type="string" indexed="true" stored="true"/> | ||
|
|
||
| <dynamicField name="*_date" type="date" indexed="true" stored="true" multiValued="false"/> | ||
|
|
||
| <dynamicField name="extras_*" type="text" indexed="true" stored="true" multiValued="false"/> | ||
| <dynamicField name="vocab_*" type="string" indexed="true" stored="true" multiValued="true"/> | ||
| <dynamicField name="*" type="string" indexed="true" stored="false"/> | ||
| </fields> | ||
|
|
||
| <uniqueKey>index_id</uniqueKey> | ||
| <defaultSearchField>text</defaultSearchField> | ||
| <solrQueryParser defaultOperator="AND"/> | ||
|
|
||
| <copyField source="url" dest="urls"/> | ||
| <copyField source="ckan_url" dest="urls"/> | ||
| <copyField source="download_url" dest="urls"/> | ||
| <copyField source="res_url" dest="urls"/> | ||
| <copyField source="extras_*" dest="text"/> | ||
| <copyField source="vocab_*" dest="text"/> | ||
| <copyField source="urls" dest="text"/> | ||
| <copyField source="name" dest="text"/> | ||
| <copyField source="title" dest="text"/> | ||
| <copyField source="text" dest="text"/> | ||
| <copyField source="license" dest="text"/> | ||
| <copyField source="notes" dest="text"/> | ||
| <copyField source="tags" dest="text"/> | ||
| <copyField source="groups" dest="text"/> | ||
| <copyField source="res_description" dest="text"/> | ||
| <copyField source="maintainer" dest="text"/> | ||
| <copyField source="author" dest="text"/> | ||
|
|
||
| </schema> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.