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

List:       kde-commits
Subject:    playground/base/nepomuk-kde/backupsync/service
From:       Vishesh Handa <handa.vish () gmail ! com>
Date:       2010-07-31 15:56:05
Message-ID: 20100731155605.CF9D3AC783 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1157568 by vhanda:

Changes
* The Changelogs are now stored in nepomuk/backupsync/log/
* The changelog file names are now in UTC format
* Bug Fix: Only merge the mergeable properties. 


 M  +3 -0      diffgenerator.cpp  
 M  +9 -5      logstorage.cpp  
 M  +5 -5      syncrequest.cpp  


--- trunk/playground/base/nepomuk-kde/backupsync/service/diffgenerator.cpp \
#1157567:1157568 @@ -104,12 +104,14 @@
 {
     QMutexLocker locker( &m_queueMutex );
     m_recordQueue.enqueue( Sync::ChangeLogRecord( \
QDateTime::currentDateTime().toUTC(), true, st ) ); +    m_queueWaiter.wakeAll();
 }
 
 void Nepomuk::DiffGenerator::statementRemoved(const Soprano::Statement & st)
 {
     QMutexLocker locker( &m_queueMutex );
     m_recordQueue.enqueue( Sync::ChangeLogRecord( \
QDateTime::currentDateTime().toUTC(), false, st ) ); +    m_queueWaiter.wakeAll();
 }
 
 
@@ -143,6 +145,7 @@
             m_queueMutex.unlock();
             
             Sync::ChangeLogRecord record = m_recordQueue.dequeue();
+            //kDebug() << "Checking .. " << record.st();
             if( backupStatement( record.st() ) ) {
                 storage->addRecord( record );
             }
--- trunk/playground/base/nepomuk-kde/backupsync/service/logstorage.cpp \
#1157567:1157568 @@ -29,7 +29,7 @@
 
 Nepomuk::LogStorage::LogStorage()
 {
-    m_dirUrl = KStandardDirs::locateLocal( "data", "nepomuk/backupsync/diff/" );
+    m_dirUrl = KStandardDirs::locateLocal( "data", "nepomuk/backupsync/log/" );
 }
 
 
@@ -72,7 +72,7 @@
         return Sync::ChangeLog();
     
     foreach( const QString & fileName, entries ) {
-        QDateTime dt = QDateTime::fromString( fileName );
+        QDateTime dt = QDateTime::fromString( fileName, Qt::ISODate );
         if( dt < min )
             continue;
 
@@ -86,6 +86,7 @@
 
 void Nepomuk::LogStorage::addRecord(const Nepomuk::Sync::ChangeLogRecord& record)
 {
+    //kDebug() << record.st();
     m_records.append( record );
 }
 
@@ -136,6 +137,8 @@
     if( m_records.empty() )
         return false;
     
+    kDebug();
+    
     QDir dir( m_dirUrl );
     const QStringList& entries = dir.entryList( QDir::Files, QDir::Reversed );
     
@@ -143,7 +146,7 @@
     
     // First time
     if( entries.empty() ) {
-        QString path = m_dirUrl + max.toString();
+        QString path = m_dirUrl + max.toString( Qt::ISODate );
         Sync::ChangeLogRecord::saveRecords( m_records, path );;
         return true;
     }
@@ -164,7 +167,7 @@
         
         if( numToSave > 0 ) {
             Sync::ChangeLogRecord::saveRecords( m_records.mid( begin, numToSave ), \
                filePath );
-            QString newName = m_records[ begin + numToSave -1 \
].dateTime().toString(); +            QString newName = m_records[ begin + numToSave \
-1 ].dateTime().toString( Qt::ISODate );  QFile file( filePath );
             file.rename( m_dirUrl + newName );
             
@@ -174,9 +177,10 @@
                 break;
         }
         
-        fileName = m_records.last().dateTime().toString();
+        fileName = m_records.last().dateTime().toString( Qt::ISODate );
     }
    
+    kDebug() << "Saved!";
     return true;
 }
 
--- trunk/playground/base/nepomuk-kde/backupsync/service/syncrequest.cpp \
#1157567:1157568 @@ -188,7 +188,7 @@
             const QUrl& propUri = key;
             kDebug() << propUri;
 
-            if( isMergeable( propUri, d->m_model ) ) {
+            if( !isMergeable( propUri, d->m_model ) ) {
                 kDebug() << propUri << " is non Mergeable - IGNORING";
                 continue;
             }
@@ -299,9 +299,9 @@
     }
     //kDebug() << rs.propHash.values( propUri ).size();
 }
+/*
+namespace {
 
-namespace {
-    /*
      *   class MergeRecord : public Nepomuk::Sync::ChangeLogRecord {
      *   public :
      *       MergeRecord() {}
@@ -321,8 +321,8 @@
              mergeRecords << MergeRecord( rec, own );
          }
          return mergeRecords;
+     }
      }*/
-}
      
      
 void Nepomuk::SyncRequest::Private::resolveMultipleCardinality(Nepomuk::Sync::SimpleResource& \
rs, const QList< Nepomuk::Sync::ChangeLogRecord >& theirRecords, const QList< \
Nepomuk::Sync::ChangeLogRecord >& ownRecords) @@ -331,13 +331,13 @@
 
     const Soprano::Statement& ref = theirRecords.first().st();
     Soprano::Statement st( ref.subject(), ref.predicate(), Soprano::Node(), \
                Soprano::Node() );
-    const QList<Soprano::Statement>& statements =  m_model->listStatements( st \
).allStatements();  
     const QUrl & propUri = ref.predicate().uri();
 
     //
     // Add current changes
     //
+    const QList<Soprano::Statement>& statements =  m_model->listStatements( st \
).allStatements();  foreach( const Soprano::Statement st, statements ) {
         rs.propHash.insert( propUri, st.object() );
     }


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