SVN commit 996432 by trueg:

Support the latest changes in Strigi - this is really a fix as without it Nepomuk won't work properly with Strigi 0.7

 M  +1 -0      CMakeLists.txt  
 A             nfo.cpp   [License: GENERATED FILE]
 A             nfo.h   [License: GENERATED FILE]
 M  +15 -10    resource.cpp  
 M  +5 -3      resourcedata.cpp  


--- branches/KDE/4.3/kdelibs/nepomuk/core/CMakeLists.txt #996431:996432
@@ -49,6 +49,7 @@
   ontology/global.cpp
   ontology/entitymanager.cpp
   nie.cpp
+  nfo.cpp
   pimo.cpp
   nepomukservice.cpp
   graphwrapper.cpp
--- branches/KDE/4.3/kdelibs/nepomuk/core/resource.cpp #996431:996432
@@ -26,6 +26,7 @@
 #include "tag.h"
 #include "pimo.h"
 #include "thing.h"
+#include "nfo.h"
 
 #include <klocale.h>
 #include <kdebug.h>
@@ -354,20 +355,24 @@
                 label = property( Soprano::Vocabulary::Xesam::name() ).toString();
 
                 if ( label.isEmpty() ) {
-                    label = property( Soprano::Vocabulary::Xesam::url() ).toString().section( '/', -1 );
+                    label = property( Nepomuk::Vocabulary::NFO::fileName() ).toString();
 
                     if ( label.isEmpty() ) {
-                        QList<Resource> go = property( Vocabulary::PIMO::groundingOccurrence() ).toResourceList();
-                        if( !go.isEmpty() ) {
-                            label = go.first().genericLabel();
-                            if( label == go.first().resourceUri().toString() ) {
-                                label.clear();
+                        label = property( Soprano::Vocabulary::Xesam::url() ).toString().section( '/', -1 );
+
+                        if ( label.isEmpty() ) {
+                            QList<Resource> go = property( Vocabulary::PIMO::groundingOccurrence() ).toResourceList();
+                            if( !go.isEmpty() ) {
+                                label = go.first().genericLabel();
+                                if( label == go.first().resourceUri().toString() ) {
+                                    label.clear();
+                                }
                             }
-                        }
 
-                        if ( label.isEmpty() ) {
-                            // ugly fallback
-                            label = resourceUri().toString();
+                            if ( label.isEmpty() ) {
+                                // ugly fallback
+                                label = resourceUri().toString();
+                            }
                         }
                     }
                 }
--- branches/KDE/4.3/kdelibs/nepomuk/core/resourcedata.cpp #996431:996432
@@ -25,6 +25,7 @@
 #include "resource.h"
 #include "tools.h"
 #include "nie.h"
+#include "nfo.h"
 #include "pimo.h"
 #include "nepomukmainmodel.h"
 
@@ -287,9 +288,10 @@
         // HACK: make sure that files have proper fileUrl properties so long as we do not have a File class for
         // Dolphin and co.
         if ( ( m_uri.scheme() == "file" ||
-               constHasType( Soprano::Vocabulary::Xesam::File() ) ) &&
-             QFile::exists( m_uri.toLocalFile()) ) {
-            statements.append( Statement( m_uri, Soprano::Vocabulary::Xesam::url(), m_uri ) );
+               constHasType( Soprano::Vocabulary::Xesam::File() ) ||
+               constHasType( Nepomuk::Vocabulary::NFO::FileDataObject() ) ) &&
+               QFile::exists( m_uri.toLocalFile()) ) {
+            statements.append( Statement( m_uri, Nepomuk::Vocabulary::NFO::fileUrl(), m_uri ) );
         }
 
         // store our grounding occurrence in case we are a thing created by the pimoThing() method