133df5e912
Improvements: 1) Index settings moved from code to etc/searchengine/elasticsearch/index_config.yaml. An alternative can be specified in koha-conf.xml. 2) Field settings moved from code to etc/searchengine/elasticsearch/field_config.yaml. An alternative can be specified in koha-conf.xml. 3) mappings.yaml has been moved from admin/searchengine/elasticsearch to etc/searchengine/elasticsearch. An alternative can be specified in koha-conf.xml. 4) Default settings have been improved to remove punctuation from phrases used for sorting etc. 5) State variables are used for storing configuration to avoid parsing it multiple times. 6) A possibility to reset the fields too has been added to the reset operation of mappings administration. 7) mappings.yaml has been moved from admin/searchengine/elasticsearch to etc/searchengine/elasticsearch. 8) An stdno field type has been added for standard identifiers. To test: 1) Run tests in t/Koha/SearchEngine/Elasticsearch.t 2) Clear tables search_fields and search_marc_map 3) Go to admin/searchengine/elasticsearch/mappings.pl?op=reset&i_know_what_i_am_doing=1 4) Verify that admin/searchengine/elasticsearch/mappings.pl displays the mappings properly, including ISBN and other standard number fields. 5) Index some records using the -d parameter with misc/search_tools/rebuild_elastic_search.pl to recreate the index 6) Verify that you can find the records 7) Put <elasticsearch_index_mappings>non_existent</elasticsearch_index_mappings> to koha-conf.xml 8) Verify that admin/searchengine/elasticsearch/mappings.pl?op=reset&i_know_what_i_am_doing=1 fails because it can't find non_existent. 9) Copy etc/searchengine/elasticsearch/mappings.yaml to a new location and make elasticsearch_index_mappings setting in koha-conf.xml point to it. 10) Make a change in the new mappings.yaml. 11) Clear table search_fields (mappings reset doesn't do it yet, see bug 20248) 12) Go to admin/searchengine/elasticsearch/mappings.pl?op=reset&i_know_what_i_am_doing=1 13) Verify that the changes you made are now visible in the mappings UI Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Bug 20073: Move Elasticsearch yaml files back to admin directory Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
309 lines
14 KiB
Text
309 lines
14 KiB
Text
[% USE Asset %]
|
|
[% INCLUDE 'doc-head-open.inc' %]
|
|
<title>Koha › Administration › Search engine configuration</title>
|
|
[% INCLUDE 'doc-head-close.inc' %]
|
|
[% Asset.js("lib/jquery/plugins/jquery.tablednd.js") %]
|
|
<script type="text/javascript">
|
|
function clean_line( line ) {
|
|
$(line).find('input[type="text"]').val("");
|
|
$(line).find('select').find('option:first').attr("selected", "selected");
|
|
}
|
|
|
|
function clone_line( line ) {
|
|
var new_line = $(line).clone();
|
|
$(new_line).removeClass("nodrag nodrop");
|
|
$(new_line).find('td:last-child>a').removeClass("add").addClass("delete").html(_("Delete"));
|
|
$(new_line).find('[data-id]').each( function() {
|
|
$(this).attr({ name: $(this).attr('data-id') }).removeAttr('data-id');
|
|
} );
|
|
$(new_line).find("select").each( function() {
|
|
var attr = $(this).attr('name');
|
|
var val = $(line).find('[data-id="' + attr + '"]').val();
|
|
$(this).find('option[value="' + val + '"]').attr("selected", "selected");
|
|
} );
|
|
return new_line;
|
|
}
|
|
|
|
$(document).ready(function() {
|
|
$("#tabs").tabs();
|
|
$('.delete').click(function() {
|
|
$(this).parents('tr').remove();
|
|
});
|
|
|
|
$("table.mappings").tableDnD( {
|
|
onDragClass: "dragClass",
|
|
} );
|
|
$('.add').click(function() {
|
|
var table = $(this).closest('table');
|
|
var index_name = $(table).attr('data-index_name');
|
|
var line = $(this).closest("tr");
|
|
var marc_field = $(line).find('input[data-id="mapping_marc_field"]').val();
|
|
if ( marc_field.length > 0 ) {
|
|
var new_line = clone_line( line );
|
|
new_line.appendTo($('table[data-index_name="'+index_name+'"]>tbody'));
|
|
$('.delete').click(function() {
|
|
$(this).parents('tr').remove();
|
|
});
|
|
clean_line(line);
|
|
|
|
$(table).tableDnD( {
|
|
onDragClass: "dragClass",
|
|
} );
|
|
}
|
|
});
|
|
});
|
|
</script>
|
|
<style type="text/css">
|
|
a.add, a.delete {
|
|
cursor: pointer;
|
|
}
|
|
</style>
|
|
</head>
|
|
<body id="admin_searchengine_mappings" class="admin">
|
|
[% INCLUDE 'header.inc' %]
|
|
[% INCLUDE 'prefs-admin-search.inc' %]
|
|
|
|
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> › Search engine configuration</div>
|
|
|
|
<div id="doc3" class="yui-t1">
|
|
|
|
<div id="bd">
|
|
<div id="yui-main">
|
|
<div class="yui-b">
|
|
|
|
[% FOR m IN messages %]
|
|
<div class="dialog [% m.type %]">
|
|
[% SWITCH m.code %]
|
|
[% CASE 'error_on_update' %]
|
|
An error occurred when updating mappings ([% m.message %]).
|
|
[% CASE 'error_on_delete' %]
|
|
An error occurred when deleting the existing mappings. Nothing has been changed!
|
|
(search field [% m.values.field_name %] with mapping [% m.values.marc_field %].)
|
|
[% CASE 'success_on_update' %]
|
|
Mapping updated successfully.
|
|
[% CASE %]
|
|
[% m.code %]
|
|
[% END %]
|
|
</div>
|
|
[% END %]
|
|
|
|
<h1>Search engine configuration</h1>
|
|
<div class="warning">
|
|
Warning: Any changes to the configuration will only take effect after a full reindex. Until then searching may not work correctly.
|
|
</div>
|
|
[% IF errors %]
|
|
<div class="error">
|
|
Changes have not been applied. Please check the following values:
|
|
<ul>
|
|
[% FOREACH e IN errors %]
|
|
<li>
|
|
[% IF ( e.type == "malformed_mapping" ) %]
|
|
The value "[% e.value %]" is not supported for mappings
|
|
[% ELSIF ( e.type == "no_mapping" ) %]
|
|
There is no mapping for the index [% e.value %]
|
|
[% END %]
|
|
</li>
|
|
[% END %]
|
|
</ul>
|
|
</div>
|
|
[% END %]
|
|
|
|
<form method="post">
|
|
<input type="hidden" name="op" value="edit" />
|
|
<div id="tabs" class="toptabs" style="clear:both">
|
|
<ul>
|
|
<li><a href="#search_fields">Search fields</a></li>
|
|
[% FOREACH index IN indexes %]
|
|
[% SWITCH index.index_name %]
|
|
[% CASE 'biblios' %]<li><a href="#mapping_biblios">Biblios</a></li>
|
|
[% CASE 'authorities' %]<li><a href="#mapping_authorities">Authorities</a></li>
|
|
[% END %]
|
|
[% END %]
|
|
</ul>
|
|
<div id="search_fields">
|
|
<table class="search_fields">
|
|
<thead>
|
|
<tr>
|
|
<th>Name</th>
|
|
<th>Label</th>
|
|
<th>Type</th>
|
|
</tr>
|
|
</thead>
|
|
<tbody>
|
|
[% FOREACH search_field IN all_search_fields %]
|
|
<tr>
|
|
<td>
|
|
<input type="text" name="search_field_name" value="[% search_field.name %]" />
|
|
</td>
|
|
<td><input type="text" name="search_field_label" value="[% search_field.label %]" />
|
|
<td>
|
|
<select name="search_field_type">
|
|
<option value=""></option>
|
|
[% IF search_field.type == "string" %]
|
|
<option value="string" selected="selected">String</option>
|
|
[% ELSE %]
|
|
<option value="string">String</option>
|
|
[% END %]
|
|
[% IF search_field.type == "date" %]
|
|
<option value="date" selected="selected">Date</option>
|
|
[% ELSE %]
|
|
<option value="date">Date</option>
|
|
[% END %]
|
|
[% IF search_field.type == "number" %]
|
|
<option value="number" selected="selected">Number</option>
|
|
[% ELSE %]
|
|
<option value="number">Number</option>
|
|
[% END %]
|
|
[% IF search_field.type == "boolean" %]
|
|
<option value="boolean" selected="selected">Boolean</option>
|
|
[% ELSE %]
|
|
<option value="boolean">Boolean</option>
|
|
[% END %]
|
|
[% IF search_field.type == "sum" %]
|
|
<option value="sum" selected="selected">Sum</option>
|
|
[% ELSE %]
|
|
<option value="sum">Sum</option>
|
|
[% END %]
|
|
[% IF search_field.type == "isbn" %]
|
|
<option value="isbn" selected="selected">ISBN</option>
|
|
[% ELSE %]
|
|
<option value="isbn">ISBN</option>
|
|
[% END %]
|
|
[% IF search_field.type == "stdno" %]
|
|
<option value="stdno" selected="selected">Std. Number</option>
|
|
[% ELSE %]
|
|
<option value="stdno">Std. Number</option>
|
|
[% END %]
|
|
</select>
|
|
</td>
|
|
</tr>
|
|
[% END %]
|
|
</tbody>
|
|
</table>
|
|
</div>
|
|
[% FOREACH index IN indexes %]
|
|
<div id="mapping_[% index.index_name %]">
|
|
<table class="mappings" data-index_name="[% index.index_name%]">
|
|
<thead>
|
|
<tr class="nodrag nodrop">
|
|
<th>Search field</th>
|
|
<th>Sortable</th>
|
|
<th>Facetable</th>
|
|
<th>Suggestible</th>
|
|
<th>Mapping</th>
|
|
<th></th>
|
|
</tr>
|
|
</thead>
|
|
<tbody>
|
|
[% FOREACH mapping IN index.mappings %]
|
|
<tr>
|
|
<td>
|
|
<input type="hidden" name="mapping_index_name" value="[% index.index_name %]" />
|
|
<input type="hidden" name="mapping_search_field_name" value="[% mapping.search_field_name %]">
|
|
[% mapping.search_field_label %]
|
|
</td>
|
|
<td>
|
|
<select name="mapping_sort">
|
|
[% IF mapping.sort == 'undef' %]
|
|
<option value="undef" selected="selected">Undef</option>
|
|
[% ELSE %]
|
|
<option value="undef">Undef</option>
|
|
[% END %]
|
|
[% IF mapping.sort == 0 %]
|
|
<option value="0" selected="selected">0</option>
|
|
[% ELSE %]
|
|
<option value="0">0</option>
|
|
[% END %]
|
|
[% IF mapping.sort == 1 %]
|
|
<option value="1" selected="selected">1</option>
|
|
[% ELSE %]
|
|
<option value="1">1</option>
|
|
[% END %]
|
|
</select>
|
|
</td>
|
|
<td>
|
|
<select name="mapping_facet">
|
|
[% IF mapping.facet %]
|
|
<option value="0">No</option>
|
|
<option value="1" selected="selected">Yes</option>
|
|
[% ELSE %]
|
|
<option value="0" selected="selected">No</option>
|
|
<option value="1">Yes</option>
|
|
[% END %]
|
|
</select>
|
|
</td>
|
|
<td>
|
|
<select name="mapping_suggestible">
|
|
[% IF mapping.suggestible %]
|
|
<option value="0">No</option>
|
|
<option value="1" selected="selected">Yes</option>
|
|
[% ELSE %]
|
|
<option value="0" selected="selected">No</option>
|
|
<option value="1">Yes</option>
|
|
[% END %]
|
|
</select>
|
|
</td>
|
|
<td>
|
|
<input name="mapping_marc_field" type="text" value="[% mapping.marc_field %]" />
|
|
</td>
|
|
<td><a class="btn btn-default btn-xs delete" style="cursor: pointer;"><i class="fa fa-trash"></i> Delete</a></td>
|
|
</tr>
|
|
[% END %]
|
|
</tbody>
|
|
<tfoot>
|
|
<tr class="nodrag nodrop">
|
|
<td>
|
|
<input data-id="mapping_index_name" type="hidden" value="[% index.index_name %]" />
|
|
<select data-id="mapping_search_field_name">
|
|
[% FOREACH f IN all_search_fields %]
|
|
<option value="[% f.name %]">[% f.name %]</option>
|
|
[% END %]
|
|
</select>
|
|
</td>
|
|
<td>
|
|
<select data-id="mapping_sort">
|
|
<option value="undef">Undef</option>
|
|
<option value="0">0</option>
|
|
<option value="1">1</option>
|
|
</select>
|
|
</td>
|
|
<td>
|
|
<select data-id="mapping_facet">
|
|
[% IF mapping.facet %]
|
|
<option value="0">No</option>
|
|
<option value="1" selected="selected">Yes</option>
|
|
[% ELSE %]
|
|
<option value="0" selected="selected">No</option>
|
|
<option value="1">Yes</option>
|
|
[% END %]
|
|
</select>
|
|
</td>
|
|
<td>
|
|
<select data-id="mapping_suggestible">
|
|
[% IF mapping.suggestible %]
|
|
<option value="0">No</option>
|
|
<option value="1" selected="selected">Yes</option>
|
|
[% ELSE %]
|
|
<option value="0" selected="selected">No</option>
|
|
<option value="1">Yes</option>
|
|
[% END %]
|
|
</select>
|
|
</td>
|
|
<td><input data-id="mapping_marc_field" type="text" /></td>
|
|
<td><a class="btn btn-default btn-xs add"><i class="fa fa-plus"></i> Add</a></td>
|
|
</tr>
|
|
</tfoot>
|
|
</table>
|
|
</div>
|
|
[% END %]
|
|
</div>
|
|
<p><button class="btn btn-default" type="submit"><i class="fa fa-hdd-o" aria-hidden="true"></i> Save</button></p>
|
|
</form>
|
|
</div>
|
|
|
|
</div>
|
|
<div class="yui-b">
|
|
[% INCLUDE 'admin-menu.inc' %]
|
|
</div>
|
|
</div>
|
|
[% INCLUDE 'intranet-bottom.inc' %]
|