opencultureconsulting
/
kitodo-presentation
mirror of https://github.com/kitodo/kitodo-presentation.git
2
0
Fork 0
Code Issues Releases Activity

Replace indexed by index_indexed

This commit is contained in:
Frank Ulrich Weber 2017-12-19 12:18:59 +01:00
parent 70c439ee79
commit ba9d1c40f3
9 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dlf/Configuration/TCA/tx_dlf_metadata.php
View File

@ -165,10 +165,10 @@ return array (
'default' => 0,
),
),
'indexed' => array (
'index_indexed' => array (
'exclude' => 1,
'l10n_mode' => 'exclude',
'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_metadata.indexed',
'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_metadata.index_indexed',
'config' => array (
'type' => 'check',
'default' => 1,
@ -243,6 +243,6 @@ return array (
'0' => array ('showitem' => '--div--;LLL:EXT:dlf/locallang.xml:tx_dlf_metadata.tab1, label,--palette--;;1;;1-1-1, format;;;;2-2-2, default_value;;;;3-3-3, wrap, --div--;LLL:EXT:dlf/locallang.xml:tx_dlf_metadata.tab2, sys_language_uid;;;;1-1-1, l18n_parent, l18n_diffsource, --div--;LLL:EXT:dlf/locallang.xml:tx_dlf_metadata.tab3, hidden;;;;1-1-1, status;;;;2-2-2'),
),
'palettes' => array (
'1' => array ('showitem' => 'index_name, --linebreak--, index_tokenized, index_stored, indexed, boost, --linebreak--, is_sortable, is_facet, is_listed, autocomplete', 'canNotCollapse' => 1),
'1' => array ('showitem' => 'index_name, --linebreak--, index_tokenized, index_stored, index_indexed, boost, --linebreak--, is_sortable, is_facet, is_listed, autocomplete', 'canNotCollapse' => 1),
),
);

10
dlf/common/class.tx_dlf_indexing.php
View File

@ -38,7 +38,7 @@ class tx_dlf_indexing {
'autocompleted' => array (),
'facets' => array (),
'sortables' => array (),
'indexed' => array (),
'index_indexed' => array (),
'stored' => array (),
'tokenized' => array (),
'fieldboost' => array ()
@ -422,7 +422,7 @@ class tx_dlf_indexing {
$suffix .= (in_array($index_name, self::$fields['stored']) ? 's' : 'u');
$suffix .= (in_array($index_name, self::$fields['indexed']) ? 'i' : 'u');
$suffix .= (in_array($index_name, self::$fields['index_indexed']) ? 'i' : 'u');
$index_name .= '_'.$suffix;
@ -461,7 +461,7 @@ class tx_dlf_indexing {
// Get the metadata indexing options.
$result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
'tx_dlf_metadata.index_name AS index_name,tx_dlf_metadata.index_tokenized AS index_tokenized,tx_dlf_metadata.index_stored AS index_stored,tx_dlf_metadata.indexed AS indexed,tx_dlf_metadata.is_sortable AS is_sortable,tx_dlf_metadata.is_facet AS is_facet,tx_dlf_metadata.is_listed AS is_listed,tx_dlf_metadata.autocomplete AS autocomplete,tx_dlf_metadata.boost AS boost',
'tx_dlf_metadata.index_name AS index_name,tx_dlf_metadata.index_tokenized AS index_tokenized,tx_dlf_metadata.index_stored AS index_stored,tx_dlf_metadata.index_indexed AS index_indexed,tx_dlf_metadata.is_sortable AS is_sortable,tx_dlf_metadata.is_facet AS is_facet,tx_dlf_metadata.is_listed AS is_listed,tx_dlf_metadata.autocomplete AS autocomplete,tx_dlf_metadata.boost AS boost',
'tx_dlf_metadata',
'tx_dlf_metadata.pid='.intval($pid).tx_dlf_helper::whereClause('tx_dlf_metadata'),
'',
@ -483,9 +483,9 @@ class tx_dlf_indexing {
}
if ($indexing['indexed'] || $indexing['autocomplete']) {
if ($indexing['index_indexed'] || $indexing['autocomplete']) {
self::$fields['indexed'][] = $indexing['index_name'];
self::$fields['index_indexed'][] = $indexing['index_name'];
}

4
dlf/common/class.tx_dlf_list.php
View File

@ -607,7 +607,7 @@ class tx_dlf_list implements ArrayAccess, Countable, Iterator, \TYPO3\CMS\Core\S
// Load index configuration.
$result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
'tx_dlf_metadata.index_name AS index_name,tx_dlf_metadata.index_tokenized AS index_tokenized,tx_dlf_metadata.indexed AS indexed',
'tx_dlf_metadata.index_name AS index_name,tx_dlf_metadata.index_tokenized AS index_tokenized,tx_dlf_metadata.index_indexed AS index_indexed',
'tx_dlf_metadata',
'tx_dlf_metadata.is_listed=1 AND tx_dlf_metadata.pid='.intval($this->metadata['options']['pid']).tx_dlf_helper::whereClause('tx_dlf_metadata'),
'',
@ -617,7 +617,7 @@ class tx_dlf_list implements ArrayAccess, Countable, Iterator, \TYPO3\CMS\Core\S
while ($resArray = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result)) {
$this->solrConfig[$resArray['index_name']] = $resArray['index_name'].'_'.($resArray['index_tokenized'] ? 't' : 'u').'s'.($resArray['indexed'] ? 'i' : 'u');
$this->solrConfig[$resArray['index_name']] = $resArray['index_name'].'_'.($resArray['index_tokenized'] ? 't' : 'u').'s'.($resArray['index_indexed'] ? 'i' : 'u');
}

2
dlf/common/class.tx_dlf_solr.php
View File

@ -144,7 +144,7 @@ class tx_dlf_solr {
$result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
'tx_dlf_metadata.index_name,tx_dlf_metadata.index_tokenized,tx_dlf_metadata.index_stored',
'tx_dlf_metadata',
'tx_dlf_metadata.indexed=1 AND tx_dlf_metadata.pid=' . intval($pid) . ' AND (tx_dlf_metadata.sys_language_uid IN (-1,0) OR tx_dlf_metadata.l18n_parent=0)' . tx_dlf_helper::whereClause('tx_dlf_metadata'),
'tx_dlf_metadata.index_indexed=1 AND tx_dlf_metadata.pid=' . intval($pid) . ' AND (tx_dlf_metadata.sys_language_uid IN (-1,0) OR tx_dlf_metadata.l18n_parent=0)' . tx_dlf_helper::whereClause('tx_dlf_metadata'),
'',
'',
''

2
dlf/hooks/class.tx_dlf_tceforms.php
View File

@ -162,7 +162,7 @@ class tx_dlf_tceforms {
$result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
'label,index_name',
'tx_dlf_metadata',
'indexed=1 AND pid='.intval($pages).' AND (sys_language_uid IN (-1,0) OR l18n_parent=0)'.tx_dlf_helper::whereClause('tx_dlf_metadata'),
'index_indexed=1 AND pid='.intval($pages).' AND (sys_language_uid IN (-1,0) OR l18n_parent=0)'.tx_dlf_helper::whereClause('tx_dlf_metadata'),
'',
'sorting',
''

8
dlf/hooks/class.tx_dlf_tcemain.php
View File

@ -63,7 +63,7 @@ class tx_dlf_tcemain {
// Index field in index if it should be used for auto-completion.
if (!empty($fieldArray['autocomplete'])) {
$fieldArray['indexed'] = 1;
$fieldArray['index_indexed'] = 1;
}
@ -210,11 +210,11 @@ class tx_dlf_tcemain {
// Index field in index if it should be used for auto-completion.
if (!empty($fieldArray['autocomplete'])) {
$fieldArray['indexed'] = 1;
$fieldArray['index_indexed'] = 1;
}
if (isset($fieldArray['indexed']) && $fieldArray['indexed'] == 0 && !isset($fieldArray['autocomplete'])) {
if (isset($fieldArray['index_indexed']) && $fieldArray['index_indexed'] == 0 && !isset($fieldArray['autocomplete'])) {
// Get current configuration.
$result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
@ -229,7 +229,7 @@ class tx_dlf_tcemain {
if ($GLOBALS['TYPO3_DB']->sql_num_rows($result)) {
// Reset indexing to current.
list ($fieldArray['indexed']) = $GLOBALS['TYPO3_DB']->sql_fetch_row($result);
list ($fieldArray['index_indexed']) = $GLOBALS['TYPO3_DB']->sql_fetch_row($result);
}

4
dlf/locallang.xml
View File

@ -72,7 +72,7 @@
<label index="tx_dlf_metadata.wrap">TypoScript-Wrap</label>
<label index="tx_dlf_metadata.index_tokenized">Tokenize in Search Index?</label>
<label index="tx_dlf_metadata.stored">Store in Search Index?</label>
<label index="tx_dlf_metadata.indexed">Index in Search Index?</label>
<label index="tx_dlf_metadata.index_indexed">Index in Search Index?</label>
<label index="tx_dlf_metadata.boost">Field boost</label>
<label index="tx_dlf_metadata.is_sortable">Prepare for sorting?</label>
<label index="tx_dlf_metadata.is_facet">Prepare for faceting?</label>
@ -279,7 +279,7 @@
<label index="tx_dlf_metadata.wrap">TypoScript-Wrap</label>
<label index="tx_dlf_metadata.index_tokenized">Im Suchindex in Tokens zerlegen?</label>
<label index="tx_dlf_metadata.stored">Im Suchindex speichern?</label>
<label index="tx_dlf_metadata.indexed">Im Suchindex indizieren?</label>
<label index="tx_dlf_metadata.index_indexed">Im Suchindex indizieren?</label>
<label index="tx_dlf_metadata.boost">Feldwertigkeit</label>
<label index="tx_dlf_metadata.is_sortable">Sortierbar machen?</label>
<label index="tx_dlf_metadata.is_facet">Facettierbar machen?</label>

2
dlf/modules/newclient/index.php
View File

@ -115,7 +115,7 @@ class tx_dlf_modNewclient extends tx_dlf_module {
'wrap' => (!empty($values['wrap']) ? $values['wrap'] : $GLOBALS['TCA']['tx_dlf_metadata']['columns']['wrap']['config']['default']),
'index_tokenized' => $values['tokenized'],
'index_stored' => $values['index_stored'],
'indexed' => $values['indexed'],
'index_indexed' => $values['index_indexed'],
'boost' => $values['boost'],
'is_sortable' => $values['is_sortable'],
'is_facet' => $values['is_facet'],

30
dlf/modules/newclient/metadata.inc.php
View File

@ -18,7 +18,7 @@ $metadata = array (
'wrap' => '',
'index_tokenized' => 0,
'index_stored' => 1,
'indexed' => 0,
'index_indexed' => 0,
'boost' => 1.00,
'is_sortable' => 1,
'is_facet' => 1,
@ -42,7 +42,7 @@ $metadata = array (
'wrap' => "key.wrap = <dt class=\"tx-dlf-metadata-title\">|</dt>\nvalue.required = 1\nvalue.wrap = <dd class=\"tx-dlf-metadata-title\">|</dd>",
'index_tokenized' => 1,
'index_stored' => 1,
'indexed' => 1,
'index_indexed' => 1,
'boost' => 2.00,
'is_sortable' => 1,
'is_facet' => 0,
@ -61,7 +61,7 @@ $metadata = array (
'wrap' => '',
'index_tokenized' => 0,
'index_stored' => 1,
'indexed' => 0,
'index_indexed' => 0,
'boost' => 1.00,
'is_sortable' => 1,
'is_facet' => 0,
@ -80,7 +80,7 @@ $metadata = array (
'wrap' => '',
'index_tokenized' => 1,
'index_stored' => 1,
'indexed' => 1,
'index_indexed' => 1,
'boost' => 2.00,
'is_sortable' => 1,
'is_facet' => 1,
@ -99,7 +99,7 @@ $metadata = array (
'wrap' => '',
'index_tokenized' => 1,
'index_stored' => 1,
'indexed' => 1,
'index_indexed' => 1,
'boost' => 1.00,
'is_sortable' => 1,
'is_facet' => 1,
@ -118,7 +118,7 @@ $metadata = array (
'wrap' => '',
'index_tokenized' => 0,
'index_stored' => 1,
'indexed' => 1,
'index_indexed' => 1,
'boost' => 1.00,
'is_sortable' => 1,
'is_facet' => 1,
@ -137,7 +137,7 @@ $metadata = array (
'wrap' => '',
'index_tokenized' => 0,
'index_stored' => 0,
'indexed' => 1,
'index_indexed' => 1,
'boost' => 1.00,
'is_sortable' => 0,
'is_facet' => 1,
@ -161,7 +161,7 @@ $metadata = array (
'wrap' => '',
'index_tokenized' => 1,
'index_stored' => 0,
'indexed' => 1,
'index_indexed' => 1,
'boost' => 1.00,
'is_sortable' => 0,
'is_facet' => 1,
@ -185,7 +185,7 @@ $metadata = array (
'wrap' => '',
'index_tokenized' => 0,
'index_stored' => 0,
'indexed' => 1,
'index_indexed' => 1,
'boost' => 1.00,
'is_sortable' => 0,
'is_facet' => 1,
@ -209,7 +209,7 @@ $metadata = array (
'wrap' => "key.wrap = <dt>|</dt>\nvalue.required = 1\nvalue.setContentToCurrent = 1\nvalue.typolink.parameter.current = 1\nvalue.wrap = <dd>|</dd>",
'index_tokenized' => 0,
'index_stored' => 0,
'indexed' => 0,
'index_indexed' => 0,
'boost' => 1.00,
'is_sortable' => 0,
'is_facet' => 0,
@ -233,7 +233,7 @@ $metadata = array (
'wrap' => "key.wrap = <dt>|</dt>\nvalue.required = 1\nvalue.setContentToCurrent = 1\nvalue.typolink.parameter.current = 1\nvalue.typolink.parameter.prepend = TEXT\nvalue.typolink.parameter.prepend.value = http://nbn-resolving.de/\nvalue.wrap = <dd>|</dd>",
'index_tokenized' => 0,
'index_stored' => 0,
'indexed' => 1,
'index_indexed' => 1,
'boost' => 1.00,
'is_sortable' => 0,
'is_facet' => 0,
@ -257,7 +257,7 @@ $metadata = array (
'wrap' => '',
'index_tokenized' => 0,
'index_stored' => 0,
'indexed' => 1,
'index_indexed' => 1,
'boost' => 1.00,
'is_sortable' => 0,
'is_facet' => 0,
@ -281,7 +281,7 @@ $metadata = array (
'wrap' => '',
'index_tokenized' => 0,
'index_stored' => 0,
'indexed' => 1,
'index_indexed' => 1,
'boost' => 1.00,
'is_sortable' => 0,
'is_facet' => 0,
@ -305,7 +305,7 @@ $metadata = array (
'wrap' => '',
'index_tokenized' => 0,
'index_stored' => 0,
'indexed' => 1,
'index_indexed' => 1,
'boost' => 1.00,
'is_sortable' => 0,
'is_facet' => 0,
@ -329,7 +329,7 @@ $metadata = array (
'wrap' => '',
'index_tokenized' => 0,
'index_stored' => 0,
'indexed' => 0,
'index_indexed' => 0,
'boost' => 0.00,
'is_sortable' => 0,
'is_facet' => 0,