Hello community, here is the log from the commit of package nepomuk-core for openSUSE:Factory checked in at 2013-08-16 13:47:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nepomuk-core (Old) and /work/SRC/openSUSE:Factory/.nepomuk-core.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nepomuk-core" Changes: -------- --- /work/SRC/openSUSE:Factory/nepomuk-core/nepomuk-core.changes 2013-07-30 16:07:19.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.nepomuk-core.new/nepomuk-core.changes 2013-08-16 13:48:53.000000000 +0200 @@ -1,0 +2,7 @@ +Thu Aug 8 15:12:45 UTC 2013 - tittiatc...@gmail.com + +- Update to 4.11.0 + * KDE 4.11 Final release + * See http://www.kde.org/announcements/4.11/ + +------------------------------------------------------------------- Old: ---- nepomuk-core-4.10.97.tar.xz New: ---- nepomuk-core-4.11.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nepomuk-core.spec ++++++ --- /var/tmp/diff_new_pack.Qjme6m/_old 2013-08-16 13:48:54.000000000 +0200 +++ /var/tmp/diff_new_pack.Qjme6m/_new 2013-08-16 13:48:54.000000000 +0200 @@ -19,13 +19,13 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ Name: nepomuk-core -Version: 4.10.97 +Version: 4.11.0 Release: 0 Summary: The KDE Nepomuk Core Library License: GPL-2.0+ Group: System/GUI/KDE Url: http://nepomuk.kde.org/ -Source0: http://download.kde.org/unstable/%{version}/src/%{name}-%{version}.tar.xz +Source0: %{name}-%{version}.tar.xz Source99: nepomuk.png # PATCH-FIX-OPENSUSE kauth.patch disable installing of kauth actions until bnc#825262 is resolved Patch0: kauth.patch ++++++ nepomuk-core-4.10.97.tar.xz -> nepomuk-core-4.11.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nepomuk-core-4.10.97/autotests/lib/NepomukTestLibMacros.cmake.in new/nepomuk-core-4.11.0/autotests/lib/NepomukTestLibMacros.cmake.in --- old/nepomuk-core-4.10.97/autotests/lib/NepomukTestLibMacros.cmake.in 2013-07-10 00:38:26.000000000 +0200 +++ new/nepomuk-core-4.11.0/autotests/lib/NepomukTestLibMacros.cmake.in 2013-08-12 19:36:09.000000000 +0200 @@ -2,7 +2,7 @@ # The executable should be created using kde4_add_executable and the appropriate libraries # should be linked using target_link_libraries function(add_nepomuk_test fancyName executable) - find_program(SH sh) + find_program(SH bash) add_test(${fancyName} ${SH} @NEPOMUK_TESTLIB_TOOLS_DIR@/runNepomukTest.sh ${executable}) endfunction(add_nepomuk_test fancyName executable) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nepomuk-core-4.10.97/autotests/test/backuptests.cpp new/nepomuk-core-4.11.0/autotests/test/backuptests.cpp --- old/nepomuk-core-4.10.97/autotests/test/backuptests.cpp 2013-07-10 00:38:26.000000000 +0200 +++ new/nepomuk-core-4.11.0/autotests/test/backuptests.cpp 2013-08-12 19:36:09.000000000 +0200 @@ -270,10 +270,20 @@ QVERIFY( tempFile.open() ); QUrl fileUrl1 = QUrl::fromLocalFile( tempFile.fileName() ); + KTemporaryFile tempFile2; + QVERIFY( tempFile2.open() ); + QUrl fileUrl2 = QUrl::fromLocalFile( tempFile2.fileName() ); + SimpleResource fileRes1; fileRes1.addType( NFO::FileDataObject() ); fileRes1.setProperty( NIE::url(), fileUrl1 ); fileRes1.setProperty( NAO::numericRating(), 5 ); + fileRes1.setProperty( NAO::description(), QLatin1String("Booga") ); + + SimpleResource fileRes2; + fileRes2.addType( NFO::FileDataObject() ); + fileRes2.setProperty( NIE::url(), fileUrl2 ); + fileRes2.setProperty( NAO::numericRating(), 7 ); SimpleResource tagRes; tagRes.addType( NAO::Tag() ); @@ -281,7 +291,7 @@ fileRes1.setProperty( NAO::hasTag(), tagRes ); SimpleResourceGraph graph; - graph << fileRes1 << tagRes; + graph << fileRes1 << fileRes2 << tagRes; KJob* job = graph.save(); job->exec(); @@ -331,6 +341,33 @@ .arg( Soprano::Node::resourceToN3(resUri) ); QVERIFY( model->executeQuery( query, Soprano::Query::QueryLanguageSparql ).boolValue() ); + + // Make sure the fileRes has its description + query = QString::fromLatin1("select ?d where { %1 nao:description ?d . }") + .arg( Soprano::Node::resourceToN3( resUri ) ); + it = model->executeQuery( query, Soprano::Query::QueryLanguageSparql ); + QVERIFY( it.next() ); + QCOMPARE( it[0].literal().toString(), QLatin1String("Booga") ); + + // + // FileRes2 + // + // Make sure a resource with nie:url fileUrl1 exists + query = QString::fromLatin1("select ?r where { ?r nie:url %1. }") + .arg( Soprano::Node::resourceToN3(fileUrl2) ); + it = model->executeQuery( query, Soprano::Query::QueryLanguageSparql ); + + QUrl resUri2; + QVERIFY( it.next() ); + resUri2 = it[0].uri(); + QCOMPARE( resUri2.scheme(), QLatin1String("nepomuk") ); + + // Make sure it has the correct rating + query = QString::fromLatin1("ask where { %1 nao:numericRating %2 . }") + .arg( Soprano::Node::resourceToN3( resUri2 ), + Soprano::Node::literalToN3( Soprano::LiteralValue(7) ) ); + + QVERIFY( model->executeQuery( query, Soprano::Query::QueryLanguageSparql ).boolValue() ); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nepomuk-core-4.10.97/cleaner/nepomukcleaningjob.desktop new/nepomuk-core-4.11.0/cleaner/nepomukcleaningjob.desktop --- old/nepomuk-core-4.10.97/cleaner/nepomukcleaningjob.desktop 2013-07-23 10:58:35.000000000 +0200 +++ new/nepomuk-core-4.11.0/cleaner/nepomukcleaningjob.desktop 2013-08-06 14:43:38.000000000 +0200 @@ -16,6 +16,7 @@ Comment[ia]=Carga de Nettar de Nepomuk Comment[it]=Processo di pulizia di Nepomuk Comment[kk]=Nepomuk тазалау тапсырмасы +Comment[ko]=Nepomuk 청소 작업 Comment[mr]=नेपोमुक सफाई कार्य Comment[nb]=Nepomuk-rensejobb Comment[nl]=Taak voor opschonen van Nepomuk diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nepomuk-core-4.10.97/libnepomukcore/resource/nepomukmainmodel.cpp new/nepomuk-core-4.11.0/libnepomukcore/resource/nepomukmainmodel.cpp --- old/nepomuk-core-4.10.97/libnepomukcore/resource/nepomukmainmodel.cpp 2013-07-10 00:38:26.000000000 +0200 +++ new/nepomuk-core-4.11.0/libnepomukcore/resource/nepomukmainmodel.cpp 2013-08-06 14:43:38.000000000 +0200 @@ -78,7 +78,8 @@ Soprano::BackendSettings settings; - KConfigGroup repoConfig = KSharedConfig::openConfig( "nepomukserverrc" )->group( "main Settings" ); + KConfig config("nepomukserverrc"); + KConfigGroup repoConfig = config.group( "main Settings" ); int portNumber = repoConfig.readEntry("Port", 0); if(!portNumber) { kError() << "Could not find virtuoso to connect to. Aborting"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nepomuk-core-4.10.97/libnepomukcore/service/nepomukservice2.desktop new/nepomuk-core-4.11.0/libnepomukcore/service/nepomukservice2.desktop --- old/nepomuk-core-4.10.97/libnepomukcore/service/nepomukservice2.desktop 2013-07-23 10:58:35.000000000 +0200 +++ new/nepomuk-core-4.11.0/libnepomukcore/service/nepomukservice2.desktop 2013-08-06 14:43:38.000000000 +0200 @@ -16,6 +16,7 @@ Comment[ia]=Servicio de Nepomuk Version 2 Comment[it]=Servizio Nepomuk versione 2 Comment[kk]=Nepomuk қызметінің 2-нұсқасы +Comment[ko]=Nepomuk 서비스 버전 2 Comment[mr]=नेपोमुक सेवा आवृत्ती २ Comment[nb]=Nepomuk-tjeneste versjon 2 Comment[nl]=Nepomuk-service versie 2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nepomuk-core-4.10.97/services/fileindexer/indexer/exiv2extractor.cpp new/nepomuk-core-4.11.0/services/fileindexer/indexer/exiv2extractor.cpp --- old/nepomuk-core-4.10.97/services/fileindexer/indexer/exiv2extractor.cpp 2013-07-10 00:38:26.000000000 +0200 +++ new/nepomuk-core-4.11.0/services/fileindexer/indexer/exiv2extractor.cpp 2013-08-06 23:49:44.000000000 +0200 @@ -222,6 +222,13 @@ fileRes.setProperty( NEXIF::orientation(), value ); } + it = data.findKey( Exiv2::ExifKey("Exif.Photo.DateTimeOriginal") ); + if( it != data.end() ) { + QVariant value = toVariantDateTime( it->value() ); + if( !value.isNull() ) + fileRes.setProperty( NEXIF::dateTimeOriginal(), value ); + } + it = data.findKey( Exiv2::ExifKey("Exif.Photo.FocalLength") ); if( it != data.end() ) { QVariant value = toVariantFloat( it->value() ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nepomuk-core-4.10.97/services/fileindexer/indexer/mobipocket/nepomukmobiextractor.desktop new/nepomuk-core-4.11.0/services/fileindexer/indexer/mobipocket/nepomukmobiextractor.desktop --- old/nepomuk-core-4.10.97/services/fileindexer/indexer/mobipocket/nepomukmobiextractor.desktop 2013-07-23 10:58:35.000000000 +0200 +++ new/nepomuk-core-4.11.0/services/fileindexer/indexer/mobipocket/nepomukmobiextractor.desktop 2013-08-06 14:43:38.000000000 +0200 @@ -15,7 +15,9 @@ Name[ia]=Nepomuk Extractor de Mobi Name[it]=Estrattore Mobi di Nepomuk Name[kk]=Nepomuk Mobi дерек шығарғышы +Name[ko]=Nepomuk Mobi 추출기 Name[nl]=Nepomuk Mobi extraheerder +Name[pl]=Wydobywanie Nepomuk Mobi Name[pt]=Extracção de Mobi do Nepomuk Name[pt_BR]=Extrator de Mobi do Nepomuk Name[ru]=Адаптер Mobi для Nepomuk @@ -44,7 +46,9 @@ Comment[ia]=Extractor de file de Nepomuk pro files de MobiPocket Comment[it]=Estrattore di file di Nepomuk per file MobiPocket Comment[kk]=MobiPocket файлдардан Nepomuk-қа дерек шығарғышы +Comment[ko]=MobiPocket 파일을 위한 Nepomuk 추출기 Comment[nl]=Nepomuk bestandenextraheerder voor MobiPocket-bestanden +Comment[pl]=Wydobywanie dla Nepomuk z plików MobiPocket Comment[pt]=Extracção de ficheiros do Nepomuk para ficheiros do MobiPocket Comment[pt_BR]=Extrator do Nepomuk para arquivos MobiPocket Comment[ru]=Обработчик файлов MobiPocket для Nepomuk diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nepomuk-core-4.10.97/services/fileindexer/indexer/nepomukepubextractor.desktop new/nepomuk-core-4.11.0/services/fileindexer/indexer/nepomukepubextractor.desktop --- old/nepomuk-core-4.10.97/services/fileindexer/indexer/nepomukepubextractor.desktop 2013-07-23 10:58:35.000000000 +0200 +++ new/nepomuk-core-4.11.0/services/fileindexer/indexer/nepomukepubextractor.desktop 2013-08-06 14:43:38.000000000 +0200 @@ -15,7 +15,9 @@ Name[ia]=Nepomuk Extractor de EPub Name[it]=Estrattore EPub di Nepomuk Name[kk]=Nepomuk EPub дерек шығарғышы +Name[ko]=Nepomuk EPub 추출기 Name[nl]=Nepomuk Epub extraheerder +Name[pl]=Wydobywanie EPub dla Nepomuk Name[pt]=Extracção de EPub do Nepomuk Name[pt_BR]=Extrator de EPub do Nepomuk Name[ru]=Адаптер EPub для Nepomuk @@ -44,7 +46,9 @@ Comment[ia]=Extractor de file de Nepomuk pro files ePub Comment[it]=Estrattore di file di Nepomuk per file EPub Comment[kk]=EPub файлдардан Nepomuk-қа дерек шығарғышы +Comment[ko]=EPub 파일을 위한 Nepomuk 추출기 Comment[nl]=Nepomuk bestandenextraheerder voor EPub-bestanden +Comment[pl]=Wydobywanie dla Nepomuk z plików EPub Comment[pt]=Extracção de ficheiros do Nepomuk para ficheiros EPub Comment[pt_BR]=Extrator do Nepomuk para arquivos EPub Comment[ru]=Обработчик файлов Epub для Nepomuk diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nepomuk-core-4.10.97/services/fileindexer/indexer/nepomukodfextractor.desktop new/nepomuk-core-4.11.0/services/fileindexer/indexer/nepomukodfextractor.desktop --- old/nepomuk-core-4.10.97/services/fileindexer/indexer/nepomukodfextractor.desktop 2013-07-23 10:58:35.000000000 +0200 +++ new/nepomuk-core-4.11.0/services/fileindexer/indexer/nepomukodfextractor.desktop 2013-08-06 14:43:38.000000000 +0200 @@ -16,6 +16,7 @@ Name[ia]=Nepomuk Extractor de Odf Name[it]=Estrattore ODF di Nepomuk Name[kk]=Nepomuk Odf дерек шығарғышы +Name[ko]=Nepomuk Odf 추출기 Name[nl]=Nepomuk extraheerder uit odf Name[pl]=Wydobywanie z Odf dla Nepomuk Name[pt]=Extracção de ODF do Nepomuk @@ -47,6 +48,7 @@ Comment[ia]=Extractor de file de Nepomuk pro files ODF Comment[it]=Estrattore di file di Nepomuk per file ODF Comment[kk]=ODF файлдардан Nepomuk-қа дерек шығарғышы +Comment[ko]=ODF 파일을 위한 Nepomuk 추출기 Comment[nl]=Nepomuk extraheerder uit ODF-bestanden Comment[pl]=Wydobywanie dla Nepomuk z plików ODF Comment[pt]=Extracção de ficheiros do Nepomuk para ficheiros ODF diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nepomuk-core-4.10.97/services/fileindexer/indexer/nepomukoffice2007extractor.desktop new/nepomuk-core-4.11.0/services/fileindexer/indexer/nepomukoffice2007extractor.desktop --- old/nepomuk-core-4.10.97/services/fileindexer/indexer/nepomukoffice2007extractor.desktop 2013-07-23 10:58:35.000000000 +0200 +++ new/nepomuk-core-4.11.0/services/fileindexer/indexer/nepomukoffice2007extractor.desktop 2013-08-06 14:43:38.000000000 +0200 @@ -16,6 +16,7 @@ Name[ia]=Nepomuk Extractor pro Office2007 Name[it]=Estrattore Office2007 di Nepomuk Name[kk]=Nepomuk Office2007 дерек шығарғышы +Name[ko]=Nepomuk Office 2007 추출기 Name[nl]=Nepomuk extraheerder uit Office2007 Name[pl]=Wydobywanie z Office2007 dla Nepomuka Name[pt]=Extracção de Ficheiros do Office2007 @@ -47,6 +48,7 @@ Comment[ia]=Extractor de file de Nepomuk pro files de Office2007 Comment[it]=Estrattore di file di Nepomuk per file Office2007 Comment[kk]=Office2007 файлдардан Nepomuk-қа дерек шығарғышы +Comment[ko]=Office 2007 파일을 위한 Nepomuk 파일 추출기 Comment[nl]=Nepomuk extraheerder uit bestanden voor Office2007 Comment[pl]=Wydobywanie dla Nepomuka z plików Office2007 Comment[pt]=Extracção de ficheiros do Nepomuk para ficheiros do Office 2007 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nepomuk-core-4.10.97/services/fileindexer/nepomukfileindexer.notifyrc new/nepomuk-core-4.11.0/services/fileindexer/nepomukfileindexer.notifyrc --- old/nepomuk-core-4.10.97/services/fileindexer/nepomukfileindexer.notifyrc 2013-07-10 00:38:26.000000000 +0200 +++ new/nepomuk-core-4.11.0/services/fileindexer/nepomukfileindexer.notifyrc 2013-08-06 14:43:38.000000000 +0200 @@ -86,7 +86,7 @@ Name[ru]=Индексирование приостановлено Name[se]=Bissehii indekserema Name[sk]=Indexovanie pozastavené -Name[sl]=Izgrajevanje kazala je zaustavljeno +Name[sl]=Izgrajevanje kazala je v pripravljenosti Name[sr]=Индексирање суспендовано Name[sr@ijekavian]=Индексирање суспендовано Name[sr@ijekavianlatin]=Indeksiranje suspendovano @@ -134,7 +134,7 @@ Comment[ru]=Индексирование файлов приостановлено службой поиска. Comment[se]=Ohcanbálvalus bissehii fiilaindekserema. Comment[sk]=Indexovanie súborov bolo pozastavené vyhľadávacou službou. -Comment[sl]=Storitev za iskanje je zaustavila izgrajevanje kazala datotek. +Comment[sl]=Storitev za iskanje je prestavila izgrajevanje kazala datotek v pripravljenost. Comment[sr]=Сервис претраге је суспендовао индексирање фајлова. Comment[sr@ijekavian]=Сервис претраге је суспендовао индексирање фајлова. Comment[sr@ijekavianlatin]=Servis pretrage je suspendovao indeksiranje fajlova. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nepomuk-core-4.10.97/services/filewatch/nepomukfilewatch.cpp new/nepomuk-core-4.11.0/services/filewatch/nepomukfilewatch.cpp --- old/nepomuk-core-4.10.97/services/filewatch/nepomukfilewatch.cpp 2013-07-10 00:38:26.000000000 +0200 +++ new/nepomuk-core-4.11.0/services/filewatch/nepomukfilewatch.cpp 2013-08-12 19:36:09.000000000 +0200 @@ -191,7 +191,7 @@ } } #else - connectToKDirWatch(); + connectToKDirNotify(); #endif // we automatically watch newly mounted media - it is very unlikely that anything non-interesting is mounted diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nepomuk-core-4.10.97/services/filewatch/org.kde.nepomuk.filewatch.actions new/nepomuk-core-4.11.0/services/filewatch/org.kde.nepomuk.filewatch.actions --- old/nepomuk-core-4.10.97/services/filewatch/org.kde.nepomuk.filewatch.actions 2013-07-23 10:58:35.000000000 +0200 +++ new/nepomuk-core-4.11.0/services/filewatch/org.kde.nepomuk.filewatch.actions 2013-08-06 14:43:38.000000000 +0200 @@ -13,6 +13,7 @@ Name[ia]=Limite de guardia de dossier Name[it]=Limite di osservazione delle cartelle Name[kk]=Бақылайтын қапшықтар шегі +Name[ko]=폴더 감시 제한 Name[nb]=Grense for mappeovervåking Name[nl]=Limiet op bewaakte mappen Name[pl]=Ograniczenie obserwowania katalogu @@ -45,6 +46,7 @@ Description[ia]=Pro evitar modifiationes per file mancante, eleva le limite de guardia del dossier Description[it]=Per non perderti delle modifiche ai file, aumenta il limite di osservazione delle cartelle. Description[kk]=Файл өзгерістерін жоғалтпау үшін бақылайтын қапшықтар шегін көтеру +Description[ko]=파일 변경 사항을 놓치지 않으려면 폴더 감시 제한을 높이십시오 Description[nb]=For å få med alle filendringer kan grensa for mappeovervåking økes Description[nl]=Om wijzigingen in bestanden niet te missen vergroot u de limiet op bewaakte mappen Description[pl]=Aby uniknąć brakujących zmian plików, zwiększ ograniczenie obserwowania katalogu diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nepomuk-core-4.10.97/services/storage/backup/backupmanager.cpp new/nepomuk-core-4.11.0/services/storage/backup/backupmanager.cpp --- old/nepomuk-core-4.10.97/services/storage/backup/backupmanager.cpp 2013-07-10 00:38:26.000000000 +0200 +++ new/nepomuk-core-4.11.0/services/storage/backup/backupmanager.cpp 2013-08-07 16:59:42.000000000 +0200 @@ -89,6 +89,7 @@ QThread* backupThread = new QThread( this ); job->moveToThread( backupThread ); + job->setAutoDelete(false); backupThread->start(); connect( job, SIGNAL(finished(KJob*)), backupThread, SLOT(quit()), Qt::QueuedConnection ); @@ -115,6 +116,7 @@ QThread* backupThread = new QThread( this ); job->moveToThread( backupThread ); + job->setAutoDelete(false); backupThread->start(); connect( job, SIGNAL(finished(KJob*)), backupThread, SLOT(quit()), Qt::QueuedConnection ); @@ -238,6 +240,9 @@ else { emit backupError(job->errorString()); } + +// FIXME: This causes a reliable crash! Why! +// delete job; } void Nepomuk2::BackupManager::slotBackupPercent(KJob*, ulong percent) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nepomuk-core-4.10.97/services/storage/backup/gui/backupwizardpages.cpp new/nepomuk-core-4.11.0/services/storage/backup/gui/backupwizardpages.cpp --- old/nepomuk-core-4.10.97/services/storage/backup/gui/backupwizardpages.cpp 2013-07-10 00:38:26.000000000 +0200 +++ new/nepomuk-core-4.11.0/services/storage/backup/gui/backupwizardpages.cpp 2013-08-06 14:43:38.000000000 +0200 @@ -92,7 +92,7 @@ kDebug() << backupUrl; m_status->setText( i18nc("@info", "Writing Nepomuk database backup to <filename>%1</filename>...", field(QLatin1String("backupUrl")).value<KUrl>().pathOrUrl())); - m_backupManager->backup( backupUrl.toLocalFile() ); + m_backupManager->backupTagsAndRatings( backupUrl.toLocalFile() ); } bool Nepomuk2::BackupPage::isComplete() const diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nepomuk-core-4.10.97/services/storage/backup/resourcelistgenerator.cpp new/nepomuk-core-4.11.0/services/storage/backup/resourcelistgenerator.cpp --- old/nepomuk-core-4.10.97/services/storage/backup/resourcelistgenerator.cpp 2013-07-10 00:38:26.000000000 +0200 +++ new/nepomuk-core-4.11.0/services/storage/backup/resourcelistgenerator.cpp 2013-08-12 19:36:09.000000000 +0200 @@ -107,14 +107,16 @@ // file count QString countQuery = QString::fromLatin1("select count(distinct ?r) where { ?r a nfo:FileDataObject ;" - " nie:url ?url ; nao:hasTag ?t. }"); + " nie:url ?url ; ?p ?t. " + "FILTER(?p in (nao:hasTag, nao:numericRating, nao:description)). }"); Soprano::QueryResultIterator iter = m_model->executeQuery( countQuery, Soprano::Query::QueryLanguageSparqlNoInference ); int approxCount = 0; if( iter.next() ) approxCount = iter[0].literal().toInt() + m_resourceCount; query = QString::fromLatin1("select distinct ?r where { ?r a nfo:FileDataObject ;" - " nie:url ?url ; nao:hasTag ?t. " + " nie:url ?url ; ?p ?t ." + " FILTER(?p in (nao:hasTag, nao:numericRating, nao:description)) ." " FILTER(REGEX(STR(?url), '^file:')) . }"); it = m_model->executeQuery( query, Soprano::Query::QueryLanguageSparqlNoInference ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nepomuk-core-4.10.97/services/storage/backup/statementgenerator.cpp new/nepomuk-core-4.11.0/services/storage/backup/statementgenerator.cpp --- old/nepomuk-core-4.10.97/services/storage/backup/statementgenerator.cpp 2013-07-10 00:38:26.000000000 +0200 +++ new/nepomuk-core-4.11.0/services/storage/backup/statementgenerator.cpp 2013-08-12 19:36:09.000000000 +0200 @@ -172,8 +172,12 @@ if( object.isLiteral() ) { Soprano::LiteralValue lv = object.literal(); - if( lv.dataTypeUri().isEmpty() ) + if( lv.dataTypeUri().isEmpty() ) { + // Plain nodes in Nepomuk don't have a language tag + if( lv.isPlain() && !lv.toString().isEmpty() ) + return true; return false; + } if( lv.isString() && lv.toString().isEmpty() ) return false; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nepomuk-core-4.10.97/services/storage/datamanagementmodel.cpp new/nepomuk-core-4.11.0/services/storage/datamanagementmodel.cpp --- old/nepomuk-core-4.10.97/services/storage/datamanagementmodel.cpp 2013-07-10 00:38:26.000000000 +0200 +++ new/nepomuk-core-4.11.0/services/storage/datamanagementmodel.cpp 2013-08-06 14:43:38.000000000 +0200 @@ -1302,6 +1302,9 @@ StoreIdentificationMode identificationMode, StoreResourcesFlags flags) { + QTime timer; + timer.start(); + if(app.isEmpty()) { setError(QLatin1String("storeResources: Empty application specified. This is not supported."), Soprano::Error::ErrorInvalidArgument); return QHash<QUrl, QUrl>(); @@ -1528,8 +1531,15 @@ // // Perform the actual identification // + QTime identificationTimer; + identificationTimer.start(); + resIdent.identifyAll(); + int identificationTime = identificationTimer.elapsed(); + QTime mergingTimer; + mergingTimer.start(); + ResourceMerger merger( this, app, flags, discardable ); merger.setMappings( resIdent.mappings() ); @@ -1540,6 +1550,8 @@ return QHash<QUrl, QUrl>(); } + kDebug() << "Identification:" << identificationTime << "Merging:" << mergingTimer.elapsed(); + kDebug() << "TIME TAKEN -------- " << timer.elapsed(); return merger.mappings(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nepomuk-core-4.10.97/services/storage/nepomukstorage.desktop new/nepomuk-core-4.11.0/services/storage/nepomukstorage.desktop --- old/nepomuk-core-4.10.97/services/storage/nepomukstorage.desktop 2013-07-10 00:38:26.000000000 +0200 +++ new/nepomuk-core-4.11.0/services/storage/nepomukstorage.desktop 2013-08-06 14:43:38.000000000 +0200 @@ -25,7 +25,7 @@ Name[it]=Memorizzazione di dati di Nepomuk Name[kk]=Nepomuk деректерді сақтау Name[km]=ផ្ទុកទិន្នន័យ Nepomuk -Name[ko]=Nepomuk 데이터 저장ㅅ +Name[ko]=Nepomuk 데이터 저장소 Name[lt]=Nepomuk duomenų kaupiklis Name[lv]=Nepomuk datu glabātuve Name[mr]=नेपोमुक डेटा स्टोरेज diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nepomuk-core-4.10.97/services/storage/repository.cpp new/nepomuk-core-4.11.0/services/storage/repository.cpp --- old/nepomuk-core-4.10.97/services/storage/repository.cpp 2013-07-10 00:38:26.000000000 +0200 +++ new/nepomuk-core-4.11.0/services/storage/repository.cpp 2013-08-06 14:43:38.000000000 +0200 @@ -193,8 +193,10 @@ return; } - if( !m_virtuosoVersion.startsWith("6.1.6") ) { - kError() << "NepomukStorage only works with virtuoso 6.1.6"; + // We accept virtuoso version 6.1.6+ Nepomuk hasn't really been tested with 7 + QRegExp regex("(6\.1\.[6789])"); + if( !m_virtuosoVersion.contains(regex) ) { + kError() << "NepomukStorage only works with virtuoso 6.1.6 and beyond"; return; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nepomuk-core-4.10.97/services/storage/resourcewatchermanager.cpp new/nepomuk-core-4.11.0/services/storage/resourcewatchermanager.cpp --- old/nepomuk-core-4.10.97/services/storage/resourcewatchermanager.cpp 2013-07-10 00:38:26.000000000 +0200 +++ new/nepomuk-core-4.11.0/services/storage/resourcewatchermanager.cpp 2013-08-06 14:43:38.000000000 +0200 @@ -129,9 +129,9 @@ // // We only need the resource types if any connections are watching types. // - QSet<QUrl> types; + QList<QUrl> types; if(!m_typeHash.isEmpty()) { - types = m_model->typeCache()->types( res ).toSet(); + types = m_model->typeCache()->types( res ); } @@ -148,7 +148,7 @@ it != removedValues.constEnd(); ++it) { removedTypes << it->uri(); } - changeTypes(res, types, addedTypes, removedTypes); + changeTypes(res, types.toSet(), addedTypes, removedTypes); } -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
