[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebase/runtime/nepomuk/services/strigi
From:       Sebastian Trueg <sebastian () trueg ! de>
Date:       2010-09-02 11:47:03
Message-ID: 20100902114703.A513BAC884 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1170982 by trueg:

* Renamed removeIndexedData to clearIndexedData
* Added method clearIndexedData(QFileInfo) to match the indexing methods

 M  +1 -1      indexscheduler.cpp  
 M  +10 -4     nepomukindexer.cpp  
 M  +12 -3     nepomukindexer.h  
 M  +2 -2      nepomukindexfeeder.cpp  
 M  +2 -2      nepomukindexfeeder.h  
 M  +2 -2      nepomukindexwriter.cpp  


--- trunk/KDE/kdebase/runtime/nepomuk/services/strigi/indexscheduler.cpp #1170981:1170982
@@ -466,7 +466,7 @@
     // TODO: use a less mem intensive method
     for ( int i = 0; i < entries.count(); ++i ) {
         deleteEntries( getChildren( entries[i] ).keys() );
-        m_indexer->removeIndexedData( KUrl( entries[i] ) );
+        m_indexer->clearIndexedData( KUrl( entries[i] ) );
     }
 }
 
--- trunk/KDE/kdebase/runtime/nepomuk/services/strigi/nepomukindexer.cpp #1170981:1170982
@@ -191,18 +191,24 @@
 }
 
 
-void Nepomuk::Indexer::removeIndexedData( const KUrl& url )
+void Nepomuk::Indexer::clearIndexedData( const KUrl& url )
 {
-    Nepomuk::IndexFeeder::removeIndexedDataForUrl( url );
+    Nepomuk::IndexFeeder::clearIndexedDataForUrl( url );
 }
 
 
-void Nepomuk::Indexer::removeIndexedData( const Nepomuk::Resource& res )
+void Nepomuk::Indexer::clearIndexedData( const QFileInfo& info )
 {
-    Nepomuk::IndexFeeder::removeIndexedDataForResourceUri( res.resourceUri() );
+    Nepomuk::IndexFeeder::clearIndexedDataForUrl( KUrl(info.filePath()) );
 }
 
 
+void Nepomuk::Indexer::clearIndexedData( const Nepomuk::Resource& res )
+{
+    Nepomuk::IndexFeeder::clearIndexedDataForResourceUri( res.resourceUri() );
+}
+
+
 void Nepomuk::Indexer::stop()
 {
     d->m_analyzerConfig.setStop( true );
--- trunk/KDE/kdebase/runtime/nepomuk/services/strigi/nepomukindexer.h #1170981:1170982
@@ -87,14 +87,23 @@
         void indexResource( const KUrl& url, const QDateTime& modificationTime, QDataStream& data );
 
         /**
+         * Remove all indexed data for the file/resource identified by \p res.
+         */
+        void clearIndexedData( const Nepomuk::Resource& res );
+
+        /**
+         * \overload
+         *
          * Remove all indexed data for the file at local url \p url.
          */
-        void removeIndexedData( const KUrl& url );
+        void clearIndexedData( const KUrl& url );
 
         /**
-         * Remove all indexed data for the file/resource identified by \p res.
+         * \overload
+         *
+         * Remove all indexed data for the file identifies by \p info.
          */
-        void removeIndexedData( const Nepomuk::Resource& res );
+        void clearIndexedData( const QFileInfo& info );
 
         /**
          * This method stops the indexer, i.e. cancels potentially
--- trunk/KDE/kdebase/runtime/nepomuk/services/strigi/nepomukindexfeeder.cpp #1170981:1170982
@@ -281,7 +281,7 @@
 
 
 // static
-bool Nepomuk::IndexFeeder::removeIndexedDataForUrl( const KUrl& url )
+bool Nepomuk::IndexFeeder::clearIndexedDataForUrl( const KUrl& url )
 {
     if ( url.isEmpty() )
         return false;
@@ -309,7 +309,7 @@
 
 
 // static
-bool Nepomuk::IndexFeeder::removeIndexedDataForResourceUri( const KUrl& res )
+bool Nepomuk::IndexFeeder::clearIndexedDataForResourceUri( const KUrl& res )
 {
     if ( res.isEmpty() )
         return false;
--- trunk/KDE/kdebase/runtime/nepomuk/services/strigi/nepomukindexfeeder.h #1170981:1170982
@@ -92,8 +92,8 @@
          */
         void end( bool forceCommit = false );
 
-        static bool removeIndexedDataForUrl( const KUrl& url );
-        static bool removeIndexedDataForResourceUri( const KUrl& res );
+        static bool clearIndexedDataForUrl( const KUrl& url );
+        static bool clearIndexedDataForResourceUri( const KUrl& res );
 
     private:
 
--- trunk/KDE/kdebase/runtime/nepomuk/services/strigi/nepomukindexwriter.cpp #1170981:1170982
@@ -346,7 +346,7 @@
 {
     for ( unsigned int i = 0; i < entries.size(); ++i ) {
         QString path = QString::fromUtf8( entries[i].c_str() );
-        IndexFeeder::removeIndexedDataForUrl( KUrl( path ) );
+        IndexFeeder::clearIndexedDataForUrl( KUrl( path ) );
     }
 }
 
@@ -373,7 +373,7 @@
     FileMetaData* data = new FileMetaData( idx );
 
     // remove previously indexed data
-    IndexFeeder::removeIndexedDataForResourceUri( data->resourceUri );
+    IndexFeeder::clearIndexedDataForResourceUri( data->resourceUri );
 
     // It is important to keep the resource URI between updates (especially for sharing of files)
     // However, when updating data from pre-KDE 4.4 times we want to get rid of old file:/ resource
[prev in list] [next in list] [prev in thread] [next in thread]