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

List:       kde-commits
Subject:    branches/work/sharedkraft/src
From:       Klaas Freitag <freitag () suse ! de>
Date:       2011-01-31 17:10:28
Message-ID: 20110131171028.91C25AC8BC () svn ! kde ! org
[Download RAW message or body]

SVN commit 1218142 by freitag:

Receiving updated DocID

 M  +8 -0      documentindexer.cpp  
 M  +10 -7     kraftdoc.cpp  


--- branches/work/sharedkraft/src/documentindexer.cpp #1218141:1218142
@@ -42,9 +42,17 @@
 
   mModel.insertRecord( -1, record );
   mModel.submitAll();
+
   kDebug() << "Last Database Model error was: " << mModel.lastError().text();
 
   kDebug() << "New document indexed, this is the id: " << record.value("id").toString();
 
+  mModel.setFilter( "ident=" + doc->ident() );
+  mModel.select();
 
+  bool ok;
+  int re = mModel.record(0).value("id").toInt( &ok );
+  if( ! ok ) re = -1;
+  return re;
+
 }
--- branches/work/sharedkraft/src/kraftdoc.cpp #1218141:1218142
@@ -254,8 +254,9 @@
   kDebug() << "received next ID to use: " << nextId;
 
   DocType dt( docType() );
-  QString ident = dt.generateDocumentIdent( this, nextId );
-  setIdent( ident );
+  QString id = dt.generateDocumentIdent( this, nextId );
+  QString oldIdent = ident();
+  setIdent( id );
 
   // save again.
   DocumentSaverBase *saver = getSaver();
@@ -379,12 +380,16 @@
   return mPositions.count();
 }
 
-DocumentSaverBase* KraftDoc::getSaver( const QString& )
+DocumentSaverBase* KraftDoc::getSaver( const QString& id )
 {
+  DocumentSaverFile *saver = static_cast<DocumentSaverFile*>( mSaver );
   if( ! mSaver ) {
     kDebug() << "Create new Document DB-Saver" << endl;
-    DocumentSaverFile *saver = new DocumentSaverFile();
+    saver = new DocumentSaverFile();
+    mSaver = saver;
+  }
 
+  // Calculate the filename always because the ident() could have changed.
     QString outputDir = KraftSettings::self()->xmlDocPath();
     KStandardDirs stdDirs;
 
@@ -404,13 +409,11 @@
     }
 
     // Use the value in ident() to form the filename to save to!
-
     const QString xmlFile = QString( "%1%2.xml" ).arg( outputDir ).arg( ident() );
     kDebug() << "Saving XML-Document to " << xmlFile;
 
     saver->setFilename( xmlFile );
-    mSaver = saver;
-  }
+
   return mSaver;
 }
 
[prev in list] [next in list] [prev in thread] [next in thread]