From 96fd1c35bf3e4296dc0ce012a47f049e6e87ec5d Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Tue, 24 Sep 2013 17:17:01 +0200
Subject: [PATCH] preserve author/descriptin meta data

---
 apps/opencs/model/doc/document.cpp     |  6 ++++++
 apps/opencs/model/doc/savingstages.cpp |  5 ++---
 apps/opencs/model/world/data.cpp       | 23 +++++++++++++++++++++++
 apps/opencs/model/world/data.hpp       | 10 ++++++++++
 4 files changed, 41 insertions(+), 3 deletions(-)

diff --git a/apps/opencs/model/doc/document.cpp b/apps/opencs/model/doc/document.cpp
index 37294bcd16..f496d32ec3 100644
--- a/apps/opencs/model/doc/document.cpp
+++ b/apps/opencs/model/doc/document.cpp
@@ -2158,6 +2158,12 @@ CSMDoc::Document::Document (const std::vector<boost::filesystem::path>& files,
         load (files.begin(), end, !new_);
     }
 
+    if (new_)
+    {
+        mData.setDescription ("");
+        mData.setAuthor ("");
+    }
+
     addOptionalGmsts();
     addOptionalGlobals();
 
diff --git a/apps/opencs/model/doc/savingstages.cpp b/apps/opencs/model/doc/savingstages.cpp
index ee2943ef45..23a88bc17a 100644
--- a/apps/opencs/model/doc/savingstages.cpp
+++ b/apps/opencs/model/doc/savingstages.cpp
@@ -45,9 +45,8 @@ void CSMDoc::WriteHeaderStage::perform (int stage, std::vector<std::string>& mes
 
     mState.getWriter().setFormat (0);
 
-    /// \todo fill in missing header information
-    mState.getWriter().setAuthor ("");
-    mState.getWriter().setDescription ("");
+    mState.getWriter().setAuthor (mDocument.getData().getAuthor());
+    mState.getWriter().setDescription (mDocument.getData().getDescription());
     mState.getWriter().setRecordCount (
         mDocument.getData().count (CSMWorld::RecordBase::State_Modified) +
         mDocument.getData().count (CSMWorld::RecordBase::State_ModifiedOnly) +
diff --git a/apps/opencs/model/world/data.cpp b/apps/opencs/model/world/data.cpp
index 1bd818db4c..c6423b76a6 100644
--- a/apps/opencs/model/world/data.cpp
+++ b/apps/opencs/model/world/data.cpp
@@ -395,6 +395,9 @@ void CSMWorld::Data::loadFile (const boost::filesystem::path& path, bool base)
 
     reader.open (path.string());
 
+    mAuthor = reader.getAuthor();
+    mDescription = reader.getDesc();
+
     // Note: We do not need to send update signals here, because at this point the model is not connected
     // to any view.
     while (reader.hasMoreRecs())
@@ -489,6 +492,26 @@ int CSMWorld::Data::count (RecordBase::State state) const
         count (state, mReferenceables);
 }
 
+void CSMWorld::Data::setDescription (const std::string& description)
+{
+    mDescription = description;
+}
+
+std::string CSMWorld::Data::getDescription() const
+{
+    return mDescription;
+}
+
+void CSMWorld::Data::setAuthor (const std::string& author)
+{
+    mAuthor = author;
+}
+
+std::string CSMWorld::Data::getAuthor() const
+{
+    return mAuthor;
+}
+
 std::vector<std::string> CSMWorld::Data::getIds (bool listDeleted) const
 {
     std::vector<std::string> ids;
diff --git a/apps/opencs/model/world/data.hpp b/apps/opencs/model/world/data.hpp
index ebbafe7118..eb6325a257 100644
--- a/apps/opencs/model/world/data.hpp
+++ b/apps/opencs/model/world/data.hpp
@@ -54,6 +54,8 @@ namespace CSMWorld
             IdCollection<CSMFilter::Filter> mFilters;
             std::vector<QAbstractItemModel *> mModels;
             std::map<UniversalId::Type, QAbstractItemModel *> mModelIndex;
+            std::string mAuthor;
+            std::string mDescription;
 
             // not implemented
             Data (const Data&);
@@ -156,6 +158,14 @@ namespace CSMWorld
             int count (RecordBase::State state) const;
             ///< Return number of top-level records with the given \a state.
 
+            void setDescription (const std::string& description);
+
+            std::string getDescription() const;
+
+            void setAuthor (const std::string& author);
+
+            std::string getAuthor() const;
+
         signals:
 
             void idListChanged();