Hello community,

here is the log from the commit of package nepomuk-core for openSUSE:Factory 
checked in at 2013-12-11 14:34:39
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-12-02 12:33:25.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.nepomuk-core.new/nepomuk-core.changes   
2013-12-11 14:34:40.000000000 +0100
@@ -1,0 +2,14 @@
+Fri Nov 29 07:13:59 UTC 2013 - [email protected]
+
+- Update to 4.11.97
+   * KDE 4.12 RC 1 release
+   * See http://www.kde.org/announcements/announce-4.12-rc.php
+
+-------------------------------------------------------------------
+Sat Nov 23 22:28:05 UTC 2013 - [email protected]
+
+- Update to 4.11.95
+   * KDE 4.12 Beta 3 release
+   * See http://www.kde.org/announcements/announce-4.12-beta3.php
+
+-------------------------------------------------------------------

Old:
----
  nepomuk-core-4.11.90.tar.xz

New:
----
  nepomuk-core-4.11.97.tar.xz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ nepomuk-core.spec ++++++
--- /var/tmp/diff_new_pack.HPCkSo/_old  2013-12-11 14:34:41.000000000 +0100
+++ /var/tmp/diff_new_pack.HPCkSo/_new  2013-12-11 14:34:41.000000000 +0100
@@ -19,7 +19,7 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 
 Name:           nepomuk-core
-Version:        4.11.90
+Version:        4.11.97
 Release:        0
 Summary:        The KDE Nepomuk Core Library
 License:        GPL-2.0+

++++++ nepomuk-core-4.11.90.tar.xz -> nepomuk-core-4.11.97.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/nepomuk-core-4.11.90/services/fileindexer/indexer/indexer.cpp 
new/nepomuk-core-4.11.97/services/fileindexer/indexer/indexer.cpp
--- old/nepomuk-core-4.11.90/services/fileindexer/indexer/indexer.cpp   
2013-11-08 08:06:28.000000000 +0100
+++ new/nepomuk-core-4.11.97/services/fileindexer/indexer/indexer.cpp   
2013-11-25 07:48:39.000000000 +0100
@@ -227,26 +227,23 @@
         plainText.resize( maxSize );
     }
 
-    QString uriN3 = Soprano::Node::resourceToN3( uri );
-
-    // FIXME: Do not use the kext:indexingLevel graph.
+    // We can use the kext:indexingLevel graph because they are both added by 
the same application
     QString query = QString::fromLatin1("select ?g where { graph ?g { %1 
kext:indexingLevel ?l . } }")
-                    .arg ( uriN3 );
+                    .arg ( Soprano::Node::resourceToN3(uri) );
     Soprano::Model* model = ResourceManager::instance()->mainModel();
     Soprano::QueryResultIterator it = model->executeQuery( query, 
Soprano::Query::QueryLanguageSparqlNoInference );
 
-    QUrl graph;
+    Soprano::Node graph;
     if( it.next() ) {
-        graph = it[0].uri();
+        graph = it[0];
         it.close();
     }
 
     if( !graph.isEmpty() ) {
-        QString graphN3 = Soprano::Node::resourceToN3( graph );
-        QString insertCommand = QString::fromLatin1("sparql insert { graph %1 
{ %2 nie:plainTextContent %3 . } }")
-                                .arg( graphN3, uriN3, 
Soprano::Node::literalToN3(plainText) );
-
-        model->executeQuery( insertCommand, Soprano::Query::QueryLanguageUser, 
QLatin1String("sql") );
+        // We use addStatement so that the virtuoso backend internally uses 
paramertized
+        // queries to push the plain text. Parameterized queries seem to use 
less memory in
+        // virtuoso when inserting.
+        model->addStatement( uri, NIE::plainTextContent(), 
Soprano::LiteralValue(plainText), graph );
         if( model->lastError() ) {
             kError() << model->lastError().message();
         }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/nepomuk-core-4.11.90/services/fileindexer/indexer/mobipocket/nepomukmobiextractor.desktop
 
new/nepomuk-core-4.11.97/services/fileindexer/indexer/mobipocket/nepomukmobiextractor.desktop
--- 
old/nepomuk-core-4.11.90/services/fileindexer/indexer/mobipocket/nepomukmobiextractor.desktop
       2013-11-08 08:06:28.000000000 +0100
+++ 
new/nepomuk-core-4.11.97/services/fileindexer/indexer/mobipocket/nepomukmobiextractor.desktop
       2013-11-25 07:48:39.000000000 +0100
@@ -50,7 +50,7 @@
 Comment[gl]=Extractor de ficheiros MobiPocket de Nepomuk
 Comment[hu]=Nepomuk fájl kibontó MobiPocket fájlokhoz
 Comment[ia]=Extractor de file de Nepomuk pro files de MobiPocket
-Comment[it]=Estrattore di file di Nepomuk per file MobiPocket
+Comment[it]=Estrattore di Nepomuk per file MobiPocket
 Comment[kk]=MobiPocket файлдардан Nepomuk-қа дерек шығарғышы
 Comment[ko]=MobiPocket 파일을 위한 Nepomuk 추출기
 Comment[nb]=Nepomuk filuttrekker for MobiPocket-filer
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/nepomuk-core-4.11.90/services/fileindexer/indexer/nepomukepubextractor.desktop
 
new/nepomuk-core-4.11.97/services/fileindexer/indexer/nepomukepubextractor.desktop
--- 
old/nepomuk-core-4.11.90/services/fileindexer/indexer/nepomukepubextractor.desktop
  2013-11-08 08:06:28.000000000 +0100
+++ 
new/nepomuk-core-4.11.97/services/fileindexer/indexer/nepomukepubextractor.desktop
  2013-11-25 07:48:39.000000000 +0100
@@ -50,7 +50,7 @@
 Comment[gl]=Extractor de ficheiros EPub de Nepomuk
 Comment[hu]=Nepomuk fájl kibontó EPub fájlokhoz
 Comment[ia]=Extractor de file de Nepomuk pro files ePub
-Comment[it]=Estrattore di file di Nepomuk per file EPub
+Comment[it]=Estrattore di Nepomuk per file EPub
 Comment[kk]=EPub файлдардан Nepomuk-қа дерек шығарғышы
 Comment[ko]=EPub 파일을 위한 Nepomuk 추출기
 Comment[nb]=Nepomuk filuttrekker for EPub-filer
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/nepomuk-core-4.11.90/services/fileindexer/indexer/nepomukexiv2extractor.desktop
 
new/nepomuk-core-4.11.97/services/fileindexer/indexer/nepomukexiv2extractor.desktop
--- 
old/nepomuk-core-4.11.90/services/fileindexer/indexer/nepomukexiv2extractor.desktop
 2013-11-08 08:06:28.000000000 +0100
+++ 
new/nepomuk-core-4.11.97/services/fileindexer/indexer/nepomukexiv2extractor.desktop
 2013-11-25 07:48:39.000000000 +0100
@@ -59,7 +59,7 @@
 Comment[gl]=Extractor de ficheiros de imaxe de Nepomuk
 Comment[hu]=Nepomuk fájl kibontó képfájlokhoz
 Comment[ia]=Extractor de file de Nepomuk pro files de imagines
-Comment[it]=Estrattore di file di Nepomuk per immagini
+Comment[it]=Estrattore di Nepomuk per file immagine
 Comment[kk]=Кескін файлдардан Nepomuk-қа дерек шығарғышы
 Comment[km]=កម្មវិធី​ស្រង់​ឯកសារ Nepomuk សម្រាប់​ឯកសារ​រូបភាព
 Comment[ko]=그림 파일을 위한 Nepomuk 파일 추출기
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/nepomuk-core-4.11.90/services/fileindexer/indexer/nepomukffmpegextractor.desktop
 
new/nepomuk-core-4.11.97/services/fileindexer/indexer/nepomukffmpegextractor.desktop
--- 
old/nepomuk-core-4.11.90/services/fileindexer/indexer/nepomukffmpegextractor.desktop
        2013-11-08 08:06:28.000000000 +0100
+++ 
new/nepomuk-core-4.11.97/services/fileindexer/indexer/nepomukffmpegextractor.desktop
        2013-11-25 07:48:39.000000000 +0100
@@ -59,7 +59,7 @@
 Comment[gl]=Extractor de ficheiros de vídeo de Nepomuk
 Comment[hu]=Nepomuk fájl kibontó videofájlokhoz
 Comment[ia]=Extractor de file de Nepomuk pro files de video
-Comment[it]=Estrattore di file di Nepomuk per video
+Comment[it]=Estrattore di Nepomuk per video
 Comment[kk]=Видео файлдардан Nepomuk-қа дерек шығарғышы
 Comment[km]=កម្មវិធី​ស្រង់​ឯកសារ Nepomuk សម្រាប់​ឯកសារ​វីដេអូ
 Comment[ko]=동영상 파일을 위한 Nepomuk 파일 추출기
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/nepomuk-core-4.11.90/services/fileindexer/indexer/nepomukodfextractor.desktop
 
new/nepomuk-core-4.11.97/services/fileindexer/indexer/nepomukodfextractor.desktop
--- 
old/nepomuk-core-4.11.90/services/fileindexer/indexer/nepomukodfextractor.desktop
   2013-11-08 08:06:28.000000000 +0100
+++ 
new/nepomuk-core-4.11.97/services/fileindexer/indexer/nepomukodfextractor.desktop
   2013-11-25 07:48:39.000000000 +0100
@@ -51,7 +51,7 @@
 Comment[gl]=Extractor de ficheiros ODF de Nepomuk
 Comment[hu]=Nepomuk fájl kibontó ODF fájlokhoz
 Comment[ia]=Extractor de file de Nepomuk pro files ODF
-Comment[it]=Estrattore di file di Nepomuk per file ODF
+Comment[it]=Estrattore di Nepomuk per file ODF
 Comment[kk]=ODF файлдардан Nepomuk-қа дерек шығарғышы
 Comment[ko]=ODF 파일을 위한 Nepomuk 추출기
 Comment[nb]=Nepomuk filuttrekker for ODF-filer
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/nepomuk-core-4.11.90/services/fileindexer/indexer/nepomukoffice2007extractor.desktop
 
new/nepomuk-core-4.11.97/services/fileindexer/indexer/nepomukoffice2007extractor.desktop
--- 
old/nepomuk-core-4.11.90/services/fileindexer/indexer/nepomukoffice2007extractor.desktop
    2013-11-08 08:06:28.000000000 +0100
+++ 
new/nepomuk-core-4.11.97/services/fileindexer/indexer/nepomukoffice2007extractor.desktop
    2013-11-25 07:48:39.000000000 +0100
@@ -51,7 +51,7 @@
 Comment[gl]=Extractor de ficheiros de Office 2007 de Nepomuk
 Comment[hu]=Nepomuk fájl kibontó Office2007 fájlokhoz
 Comment[ia]=Extractor de file de Nepomuk pro files de Office2007
-Comment[it]=Estrattore di file di Nepomuk per file Office2007
+Comment[it]=Estrattore di Nepomuk per file Office2007
 Comment[kk]=Office2007 файлдардан Nepomuk-қа дерек шығарғышы
 Comment[ko]=Office 2007 파일을 위한 Nepomuk 파일 추출기
 Comment[nb]=Nepomuk filuttrekker for Office2007-filer
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/nepomuk-core-4.11.90/services/fileindexer/indexer/nepomukofficeextractor.desktop
 
new/nepomuk-core-4.11.97/services/fileindexer/indexer/nepomukofficeextractor.desktop
--- 
old/nepomuk-core-4.11.90/services/fileindexer/indexer/nepomukofficeextractor.desktop
        2013-11-08 08:06:28.000000000 +0100
+++ 
new/nepomuk-core-4.11.97/services/fileindexer/indexer/nepomukofficeextractor.desktop
        2013-11-25 07:48:39.000000000 +0100
@@ -3,6 +3,7 @@
 X-KDE-ServiceTypes=NepomukFileExtractor
 X-KDE-Library=nepomukofficeextractor
 Name=Nepomuk Office Extractor
+Name[bs]=Nepomukov ekstraktor datoteka Office
 Name[ca]=Extractor d'Office del Nepomuk
 Name[cs]=Extraktor Office pro Nepomuk
 Name[da]=Nepomuk Microsoft Office-udtrækker
@@ -12,7 +13,9 @@
 Name[gl]=Extractor de Office de Nepomuk
 Name[hu]=Nepomuk Office kibontó
 Name[ia]=Nepomuk Extractor  pro Office
+Name[it]=Estrattore Office di Nepomuk
 Name[kk]=Nepomuk Office дерек шығарғышы
+Name[nb]=Nepomuk Office-uttrekker
 Name[nl]=Nepomuk extraheerder uit Office
 Name[pt]=Extracção do Office para o Nepomuk
 Name[pt_BR]=Extrator de Office do Nepomuk
@@ -29,6 +32,7 @@
 Name[x-test]=xxNepomuk Office Extractorxx
 Name[zh_TW]=Nepomuk Office 展開器
 Comment=Nepomuk File extractor for DOC, XLS and PPT files
+Comment[bs]=Nepomukov ekstraktor datoteka za datoteke DOC, XLS i PPT
 Comment[ca]=Extractor de fitxers del Nepomuk per fitxers DOC, XLS i PPT
 Comment[cs]=Extraktor souborů Nepomuku pro soubory DOC, XLS a PPT
 Comment[da]=Nepomuk filudtrækker til DOC, XLS og PPT-filer
@@ -38,7 +42,9 @@
 Comment[gl]=Extractor de ficheiros DOC, XLS e PPT de Nepomuk
 Comment[hu]=Nepomuk fájl kibontó DOC, XLS és PPT fájlokhoz
 Comment[ia]=Extractor de file de Nepomuk pro files DOC, XLS e PPT.
+Comment[it]=Estrattore di Nepomuk per file DOC, XLS e PPT
 Comment[kk]=DOC, XLS, PPT файлдардан Nepomuk-қа дерек шығарғышы
+Comment[nb]=Nepomuk filuttrekker for DOC, XLS og PPT-filer
 Comment[nl]=Nepomuk extraheerder uit DOC-, XLS- en PPT-bestanden
 Comment[pt]=Extracção de ficheiros do Nepomuk para ficheiros DOC, XLS e PPT
 Comment[pt_BR]=Extrator do Nepomuk para arquivos DOC, XLS e PPT
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/nepomuk-core-4.11.90/services/fileindexer/indexer/nepomukplaintextextractor.desktop
 
new/nepomuk-core-4.11.97/services/fileindexer/indexer/nepomukplaintextextractor.desktop
--- 
old/nepomuk-core-4.11.90/services/fileindexer/indexer/nepomukplaintextextractor.desktop
     2013-11-08 08:06:28.000000000 +0100
+++ 
new/nepomuk-core-4.11.97/services/fileindexer/indexer/nepomukplaintextextractor.desktop
     2013-11-25 07:48:39.000000000 +0100
@@ -59,7 +59,7 @@
 Comment[gl]=Extractor de ficheiros de texto de Nepomuk
 Comment[hu]=Nepomuk fájl kibontó szöveges fájlokhoz
 Comment[ia]=Extractor de file de Nepomuk pro files de texto
-Comment[it]=Estrattore di file di Nepomuk per file di testo
+Comment[it]=Estrattore di Nepomuk per file di testo
 Comment[kk]=Мәтін файлдардан Nepomuk-қа дерек шығарғышы
 Comment[km]=កម្មវិធី​ស្រង់​ឯកសារ Nepomuk សម្រាប់​ឯកសារ​​អត្ថបទ
 Comment[ko]=텍스트 파일을 위한 Nepomuk 추출기
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/nepomuk-core-4.11.90/services/fileindexer/indexer/nepomukpopplerextractor.desktop
 
new/nepomuk-core-4.11.97/services/fileindexer/indexer/nepomukpopplerextractor.desktop
--- 
old/nepomuk-core-4.11.90/services/fileindexer/indexer/nepomukpopplerextractor.desktop
       2013-11-08 08:06:28.000000000 +0100
+++ 
new/nepomuk-core-4.11.97/services/fileindexer/indexer/nepomukpopplerextractor.desktop
       2013-11-25 07:48:39.000000000 +0100
@@ -59,7 +59,7 @@
 Comment[gl]=Extractor de ficheiros PDF de Nepomuk
 Comment[hu]=Nepomuk fájl kibontó PDF fájlokhoz
 Comment[ia]=Extractor de file de Nepomuk pro files PDF
-Comment[it]=Estrattore di file di Nepomuk per file PDF
+Comment[it]=Estrattore di Nepomuk per file PDF
 Comment[kk]=PDF файлдардан Nepomuk-қа дерек шығарғышы
 Comment[km]=កម្មវិធី​ស្រង់​ឯកសារ Nepomuk សម្រាប់​ឯកសារ PDF
 Comment[ko]=PDF 파일을 위한 Nepomuk 추출기
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/nepomuk-core-4.11.90/services/fileindexer/indexer/nepomuktaglibextractor.desktop
 
new/nepomuk-core-4.11.97/services/fileindexer/indexer/nepomuktaglibextractor.desktop
--- 
old/nepomuk-core-4.11.90/services/fileindexer/indexer/nepomuktaglibextractor.desktop
        2013-11-08 08:06:28.000000000 +0100
+++ 
new/nepomuk-core-4.11.97/services/fileindexer/indexer/nepomuktaglibextractor.desktop
        2013-11-25 07:48:39.000000000 +0100
@@ -59,7 +59,7 @@
 Comment[gl]=Extractor de ficheiros Music de Nepomuk
 Comment[hu]=Nepomuk fájl kibontó zenefájlokhoz
 Comment[ia]=Extractor de file de nepomuk pro files de music
-Comment[it]=Estrattore di file di Nepomuk per file musicali
+Comment[it]=Estrattore di Nepomuk per file musicali
 Comment[kk]=Музыка файлдардан Nepomuk-қа дерек шығарғышы
 Comment[km]=កម្មវិធី​ស្រង់​ឯកសារ Nepomuk សម្រាប់​ឯកសារ​តន្ត្រី
 Comment[ko]=음악 파일을 위한 Nepomuk 추출기
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/nepomuk-core-4.11.90/services/storage/resourceidentifier.cpp 
new/nepomuk-core-4.11.97/services/storage/resourceidentifier.cpp
--- old/nepomuk-core-4.11.90/services/storage/resourceidentifier.cpp    
2013-11-08 08:06:28.000000000 +0100
+++ new/nepomuk-core-4.11.97/services/storage/resourceidentifier.cpp    
2013-11-25 07:48:39.000000000 +0100
@@ -34,6 +34,7 @@
 #include <Soprano/Vocabulary/RDFS>
 #include <Soprano/Vocabulary/RDF>
 #include "nie.h"
+#include "nco.h"
 
 #include <KDebug>
 
@@ -105,6 +106,18 @@
     }
 }
 
+namespace {
+    QUrl fetchResource(Soprano::Model* model, const QString& prop, const 
QString& value) {
+        QString query = QString::fromLatin1("select ?r where { ?r %1 %2 . } 
LIMIT 1")
+                        .arg( prop, value );
+        Soprano::QueryResultIterator it = model->executeQuery( query, 
Soprano::Query::QueryLanguageSparqlNoInference );
+        if( it.next() ) {
+            return it[0].uri();
+        }
+
+        return QUrl();
+    }
+}
 
 bool Nepomuk2::ResourceIdentifier::runIdentification(const KUrl& uri)
 {
@@ -125,11 +138,8 @@
     //
     QUrl nieUrl = res.nieUrl();
     if( !nieUrl.isEmpty() ) {
-        QString query = QString::fromLatin1("select ?r where { ?r nie:url %1 . 
} LIMIT 1")
-                        .arg( Soprano::Node::resourceToN3( nieUrl ) );
-        Soprano::QueryResultIterator it = m_model->executeQuery( query, 
Soprano::Query::QueryLanguageSparqlNoInference );
-        if( it.next() ) {
-            const QUrl newUri = it[0].uri();
+        QUrl newUri = fetchResource(m_model, QLatin1String("nie:url"), 
Soprano::Node::resourceToN3(nieUrl));
+        if (!newUri.isEmpty()) {
             kDebug() << uri << " --> " << newUri;
             manualIdentification( uri, newUri );
             return true;
@@ -142,6 +152,29 @@
     if( m_mode == IdentifyNone )
         return false;
 
+    //
+    // Check if it is a Contact has the same contactUID
+    //
+    QList<Soprano::Node> types = res.property( RDF::type() );
+    // HACK: We should ideally check for all nco:Contacts, but meh. No one 
really pushes
+    //       a contactUID with a nco:Contact. Both Telepathy and Akonadi push 
it with a PersonContact
+    if( types.contains(NCO::PersonContact()) ) {
+        QList<Soprano::Node> ids = res.property(NCO::contactUID());
+        if( ids.size() == 1 ) {
+            QString id = ids.first().literal().toString();
+            if( id.isEmpty() )
+                return false;
+
+            QUrl newUri = fetchResource(m_model, 
QLatin1String("nco:contactUID"), ids.first().toN3());
+            if( newUri.isEmpty() ) {
+                kDebug() << uri << " --> " << newUri;
+                manualIdentification( uri, newUri );
+                return true;
+            }
+            return false;
+        }
+    }
+
     // Never identify data objects
     foreach(const Soprano::Node& t, res.property(RDF::type())) {
         QSet<QUrl> allT = ClassAndPropertyTree::self()->allParents(t.uri());
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/nepomuk-core-4.11.90/services/storage/test/identificationtests.cpp 
new/nepomuk-core-4.11.97/services/storage/test/identificationtests.cpp
--- old/nepomuk-core-4.11.90/services/storage/test/identificationtests.cpp      
2013-11-08 08:06:28.000000000 +0100
+++ new/nepomuk-core-4.11.97/services/storage/test/identificationtests.cpp      
2013-11-25 07:48:39.000000000 +0100
@@ -211,5 +211,29 @@
     QCOMPARE( resUri, resUri2 );
 }
 
+void IdentificationTests::testContact_sameUID()
+{
+    SimpleResource res;
+    res.addType( NCO::PersonContact() );
+    res.addProperty( NCO::fullname(), QLatin1String("Peter Parker") );
+    res.addProperty( NCO::nickname(), QLatin1String("WebHead") );
+    res.addProperty( NCO::contactUID(), QLatin1String("contact-UID") );
+
+    QHash< QUrl, QUrl > mappings = 
m_dmModel->storeResources(SimpleResourceGraph() << res, "app");
+    QUrl resUri = mappings.value(res.uri());
+    QVERIFY(!m_model->lastError());
+
+    SimpleResource res2;
+    res2.addType( NCO::PersonContact() );
+    res2.addProperty( NCO::nickname(), QLatin1String("Spidey") );
+    res2.addProperty( NCO::contactUID(), QLatin1String("contact-UID") );
+
+    QHash< QUrl, QUrl > mappings2 = 
m_dmModel->storeResources(SimpleResourceGraph() << res, "app");
+    QUrl resUri2 = mappings2.value(res2.uri());
+    QVERIFY(!m_model->lastError());
+
+    // They should be the same even though the nicknames are different
+    QCOMPARE(resUri, resUri2);
+}
 
 QTEST_KDEMAIN_CORE(IdentificationTests)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/nepomuk-core-4.11.90/services/storage/test/identificationtests.h 
new/nepomuk-core-4.11.97/services/storage/test/identificationtests.h
--- old/nepomuk-core-4.11.90/services/storage/test/identificationtests.h        
2013-11-08 08:06:28.000000000 +0100
+++ new/nepomuk-core-4.11.97/services/storage/test/identificationtests.h        
2013-11-25 07:48:39.000000000 +0100
@@ -47,6 +47,7 @@
     void testContact();
     void testContact_extraProperty();
     void testContact_differentTypes();
+    void testContact_sameUID();
 private:
     void resetModel();
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/nepomuk-core-4.11.90/services/storage/test/qtest_dms.cpp 
new/nepomuk-core-4.11.97/services/storage/test/qtest_dms.cpp
--- old/nepomuk-core-4.11.90/services/storage/test/qtest_dms.cpp        
2013-11-08 08:06:28.000000000 +0100
+++ new/nepomuk-core-4.11.97/services/storage/test/qtest_dms.cpp        
2013-11-25 07:48:39.000000000 +0100
@@ -210,6 +210,7 @@
     addProperty( model, graph, NCO::fullname(), NCO::Contact(), 
XMLSchema::string() );
     addProperty( model, graph, NCO::nickname(), NCO::Contact(), 
XMLSchema::string() );
     addProperty( model, graph, NCO::birthDate(), NCO::Contact(), 
XMLSchema::date() );
+    addProperty( model, graph, NCO::contactUID(), NCO::Contact(), 
XMLSchema::string() );
 
     model->addStatement( NCO::gender(), RDF::type(), RDF::Property(), graph );
     model->addStatement( NCO::gender(), RDFS::range(), NCO::Gender(), graph );


-- 
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to