From b6f41f4fdb1161bda159eccb01b1003f4fff6ad2 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Sat, 5 Jun 2021 21:35:00 +0300 Subject: [PATCH] kcontrol: use NFO fields in strigi font analyzer Signed-off-by: Ivailo Monev --- .../strigi-analyzer/FontThroughAnalyzer.cpp | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/kcontrol/kfontinst/strigi-analyzer/FontThroughAnalyzer.cpp b/kcontrol/kfontinst/strigi-analyzer/FontThroughAnalyzer.cpp index 4168bde4..0af27ae8 100644 --- a/kcontrol/kfontinst/strigi-analyzer/FontThroughAnalyzer.cpp +++ b/kcontrol/kfontinst/strigi-analyzer/FontThroughAnalyzer.cpp @@ -70,13 +70,17 @@ class FontThroughAnalyzerFactory : public StreamThroughAnalyzerFactory void FontThroughAnalyzerFactory::registerFields(FieldRegister ®) { - constFamilyNameField=reg.registerField("font.family", FieldRegister::stringType, 1, 0); +#if 0 constWeightField=reg.registerField("font.weight", FieldRegister::stringType, 1, 0); constSlantField=reg.registerField("font.slant", FieldRegister::stringType, 1, 0); constWidthField=reg.registerField("font.width", FieldRegister::stringType, 1, 0); constSpacingField=reg.registerField("font.spacing", FieldRegister::stringType, 1, 0); - constFoundryField=reg.registerField("font.foundry", FieldRegister::stringType, 1, 0); - constVersionField=reg.registerField("content.version", FieldRegister::stringType, 1, 0); +#else +#warning TODO: no NFO fields for font weight, slant, width and spacing +#endif + constFamilyNameField=reg.registerField("http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#fontFamily"); + constFoundryField=reg.registerField("http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#foundry"); + constVersionField=reg.registerField("http://www.semanticdesktop.org/ontologies/2007/01/19/nie#version"); } class Factory : public AnalyzerFactoryFactory @@ -261,11 +265,14 @@ void FontThroughAnalyzer::result(const QString &family, const QString &foundry, const QString &width, const QString &spacing, const QString &slant, const QString &version, const QString &mime) { - analysisResult->addValue(factory->constFamilyNameField, (const char *)family.toUtf8()); +#if 0 analysisResult->addValue(factory->constWeightField, (const char *)weight.toUtf8()); analysisResult->addValue(factory->constSlantField, (const char *)slant.toUtf8()); analysisResult->addValue(factory->constWidthField, (const char *)width.toUtf8()); analysisResult->addValue(factory->constSpacingField, (const char *)spacing.toUtf8()); +#endif + + analysisResult->addValue(factory->constFamilyNameField, (const char *)family.toUtf8()); analysisResult->addValue(factory->constFoundryField, foundry.isEmpty() ? (const char *)i18n(KFI_UNKNOWN_FOUNDRY).toUtf8() : (const char *)foundry.toUtf8());