Merge pull request #1668 from xiaoyifang/opt/remove-xapian-enable-position-option

opt: remove unused option
This commit is contained in:
xiaoyifang 2024-07-10 18:02:08 +08:00 committed by GitHub
commit dfbdb7cb5f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 0 additions and 23 deletions

View file

@ -1098,10 +1098,6 @@ Class load()
if ( !fts.namedItem( "enabled" ).isNull() ) if ( !fts.namedItem( "enabled" ).isNull() )
c.preferences.fts.enabled = ( fts.namedItem( "enabled" ).toElement().text() == "1" ); c.preferences.fts.enabled = ( fts.namedItem( "enabled" ).toElement().text() == "1" );
if ( !fts.namedItem( "enablePosition" ).isNull() ) {
c.preferences.fts.enablePosition = ( fts.namedItem( "enablePosition" ).toElement().text() == "1" );
}
if ( !fts.namedItem( "maxDictionarySize" ).isNull() ) if ( !fts.namedItem( "maxDictionarySize" ).isNull() )
c.preferences.fts.maxDictionarySize = fts.namedItem( "maxDictionarySize" ).toElement().text().toUInt(); c.preferences.fts.maxDictionarySize = fts.namedItem( "maxDictionarySize" ).toElement().text().toUInt();
@ -2088,10 +2084,6 @@ void save( Class const & c )
opt.appendChild( dd.createTextNode( c.preferences.fts.enabled ? "1" : "0" ) ); opt.appendChild( dd.createTextNode( c.preferences.fts.enabled ? "1" : "0" ) );
hd.appendChild( opt ); hd.appendChild( opt );
opt = dd.createElement( "enablePosition" );
opt.appendChild( dd.createTextNode( c.preferences.fts.enablePosition ? "1" : "0" ) );
hd.appendChild( opt );
opt = dd.createElement( "maxDictionarySize" ); opt = dd.createElement( "maxDictionarySize" );
opt.appendChild( dd.createTextNode( QString::number( c.preferences.fts.maxDictionarySize ) ) ); opt.appendChild( dd.createTextNode( QString::number( c.preferences.fts.maxDictionarySize ) ) );
hd.appendChild( opt ); hd.appendChild( opt );

View file

@ -196,8 +196,6 @@ struct FullTextSearch
int searchMode; int searchMode;
bool enabled; bool enabled;
bool enablePosition = false;
quint32 maxDictionarySize; quint32 maxDictionarySize;
quint32 parallelThreads = QThread::idealThreadCount() / 3 + 1; quint32 parallelThreads = QThread::idealThreadCount() / 3 + 1;
QByteArray dialogGeometry; QByteArray dialogGeometry;

View file

@ -351,8 +351,6 @@ Preferences::Preferences( QWidget * parent, Config::Class & cfg_ ):
ui.allowEpwing->setChecked( !p.fts.disabledTypes.contains( "EPWING", Qt::CaseInsensitive ) ); ui.allowEpwing->setChecked( !p.fts.disabledTypes.contains( "EPWING", Qt::CaseInsensitive ) );
ui.allowGls->setChecked( !p.fts.disabledTypes.contains( "GLS", Qt::CaseInsensitive ) ); ui.allowGls->setChecked( !p.fts.disabledTypes.contains( "GLS", Qt::CaseInsensitive ) );
ui.enablePosition->setChecked( p.fts.enablePosition );
ui.enablePosition->hide();
#ifndef MAKE_ZIM_SUPPORT #ifndef MAKE_ZIM_SUPPORT
ui.allowZim->hide(); ui.allowZim->hide();
#endif #endif
@ -495,7 +493,6 @@ Config::Preferences Preferences::getPreferences()
p.fts.enabled = ui.ftsGroupBox->isChecked(); p.fts.enabled = ui.ftsGroupBox->isChecked();
p.fts.maxDictionarySize = ui.maxDictionarySize->value(); p.fts.maxDictionarySize = ui.maxDictionarySize->value();
p.fts.parallelThreads = ui.parallelThreads->value(); p.fts.parallelThreads = ui.parallelThreads->value();
p.fts.enablePosition = ui.enablePosition->isChecked();
buildDisabledTypes( p.fts.disabledTypes, ui.allowAard->isChecked(), "AARD" ); buildDisabledTypes( p.fts.disabledTypes, ui.allowAard->isChecked(), "AARD" );
buildDisabledTypes( p.fts.disabledTypes, ui.allowBGL->isChecked(), "BGL" ); buildDisabledTypes( p.fts.disabledTypes, ui.allowBGL->isChecked(), "BGL" );

View file

@ -1377,16 +1377,6 @@ download page.</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="7" column="0" colspan="2">
<widget class="QCheckBox" name="enablePosition">
<property name="toolTip">
<string>Positional information is required to use Xapian's phrase searching and NEAR operator, but the database size will be much bigger. Applies only to new incoming dictionaries.</string>
</property>
<property name="text">
<string>Enable index with positional information</string>
</property>
</widget>
</item>
<item row="1" column="0"> <item row="1" column="0">
<widget class="QCheckBox" name="allowBGL"> <widget class="QCheckBox" name="allowBGL">
<property name="text"> <property name="text">