put changelog information to packages

diff --git a/zypp/Changelog.h b/zypp/Changelog.h
new file mode 100644 (file)
index 0000000..889e585
--- /dev/null
+++ b/zypp/Changelog.h
@@ -0,0 +1,67 @@
+/*---------------------------------------------------------------------\
+|                          ____ _   __ __ ___                          |
+|                         |__  / \ / / . \ . \                         |
+|                           / / \ V /|  _/  _/                         |
+|                          / /__ | | | | | |                           |
+|                         /_____||_| |_| |_|                           |
+|                                                                      |
+\---------------------------------------------------------------------*/
+/** \file zypp/Changelog.h
+ *
+*/
+#ifndef ZYPP_CHANGELOG_H
+#define ZYPP_CHANGELOG_H
+
+#include <string>
+#include <list>
+#include <iostream>
+
+using namespace std;
+
+///////////////////////////////////////////////////////////////////
+namespace zypp
+{ /////////////////////////////////////////////////////////////////
+
+  ///////////////////////////////////////////////////////////////////
+  //
+  //   CLASS NAME : ChangelogEntry
+  //
+  /** Single entry in a change log
+  */
+  class ChangelogEntry
+  {
+  public:
+    /** Default ctor */
+    ChangelogEntry( const Date & d, 
+                    const std::string & a, 
+                    const std::string & t )
+    : _date( d ), _author( a ), _text( t )
+    {};
+    /** Dtor */
+    ~ChangelogEntry()
+    {}
+    Date date() const { return _date; }
+    std::string author() const { return _author; }
+    std::string text() const { return _text; }
+
+  private:
+    Date _date;
+    std::string _author;
+    std::string _text;
+  };
+
+  typedef std::list<ChangelogEntry> Changelog;
+
+  inline std::ostream & operator<<( std::ostream & out,
+                                   const ChangelogEntry & obj )
+  { 
+    out << obj.date() << " " << obj.author() << endl << obj.text() << endl;
+    return out;
+  }
+
+ 
+  ///////////////////////////////////////////////////////////////////
+} // namespace zypp
+///////////////////////////////////////////////////////////////////
+
+#endif // ZYPP_CHANGELOG_H

diff --git a/zypp/Makefile.am b/zypp/Makefile.am
index 8923b61a54637f56e59a394e81ece3c62a2c2d95..a2fb2c798ae929e24bf51dab8c3972a1cd632279 100644 (file)
--- a/zypp/Makefile.am
+++ b/zypp/Makefile.am
@@ -21,7 +21,8 @@ include_HEADERS = NeedAType.h \
        Message.h       \
        Script.h        \
        Patch.h         \
-       Product.h
+       Product.h       \
+       Changelog.h
 
 ## ##################################################
 

diff --git a/zypp/Package.cc b/zypp/Package.cc
index 97959d0a5f6294bb2d148fd2487c95aedb756797..1e899f3a3c35c895ab64e4ca32eedc675f43c9bd 100644 (file)
--- a/zypp/Package.cc
+++ b/zypp/Package.cc
@@ -42,7 +42,8 @@ namespace zypp
   //
   ///////////////////////////////////////////////////////////////////
 
-
+  Changelog Package::changelog()
+  { return pimpl().changelog(); }
 
   /////////////////////////////////////////////////////////////////
 } // namespace zypp

diff --git a/zypp/Package.h b/zypp/Package.h
index abc689b7cc443e495ccbaadbabefe62bbc7b482f..44a005dfae4a4f4e0071d816641b47e237ed6d2c 100644 (file)
--- a/zypp/Package.h
+++ b/zypp/Package.h
@@ -45,6 +45,8 @@ namespace zypp
              const Arch & arch_r );
     /** Dtor */
     virtual ~Package();
+    /** Get the package change log */
+    Changelog changelog();
 
   private:
     /** Access implementation */

diff --git a/zypp/detail/PackageImplIf.cc b/zypp/detail/PackageImplIf.cc
index 4200c61ad7cf837eac145c0ac94f468a1b63b7be..2acbe55663fb27afe9dc62d222fcd4e43365ab9a 100644 (file)
--- a/zypp/detail/PackageImplIf.cc
+++ b/zypp/detail/PackageImplIf.cc
@@ -47,8 +47,8 @@ namespace zypp
       PackageGroup PackageImplIf::group() const
       { return PackageGroup(); }
 
-      Text PackageImplIf::changelog() const
-      { return Text(); }
+      Changelog PackageImplIf::changelog() const
+      { return Changelog(); }
 
       std::string PackageImplIf::url() const
       { return std::string(); }

diff --git a/zypp/detail/PackageImplIf.h b/zypp/detail/PackageImplIf.h
index b1aefe1940d77cfe15664604f8a2a172907db117..57ffe9b2890ebbbca4caab7409f4cae64051814d 100644 (file)
--- a/zypp/detail/PackageImplIf.h
+++ b/zypp/detail/PackageImplIf.h
@@ -15,6 +15,7 @@
 #include "zypp/detail/ResObjectImplIf.h"
 #include "zypp/Edition.h"
 #include "zypp/Arch.h"
+#include "zypp/Changelog.h"
 
 ///////////////////////////////////////////////////////////////////
 namespace zypp
@@ -181,7 +182,7 @@ namespace zypp
       /** */
       virtual PackageGroup group() const PURE_VIRTUAL;
       /** */
-      virtual Text changelog() const PURE_VIRTUAL;
+      virtual Changelog changelog() const PURE_VIRTUAL;
       /** Don't ship it as class Url, because it might be
        * in fact anything but a legal Url. */
       virtual std::string url() const PURE_VIRTUAL;

diff --git a/zypp/source/yum/YUMPackageImpl.cc b/zypp/source/yum/YUMPackageImpl.cc
index d33abf6854d227939e6b6b244493889443e28f73..f77d7c3fe68258441630ddce0fd9322771a32b8b 100644 (file)
--- a/zypp/source/yum/YUMPackageImpl.cc
+++ b/zypp/source/yum/YUMPackageImpl.cc
@@ -77,7 +77,15 @@ namespace zypp
        {
          _filenames.push_back(it->name);
        }
-// TODO changelog
+       for (std::list<zypp::parser::yum::ChangelogEntry>::const_iterator
+               it = other.changelog.begin();
+            it != other.changelog.end();
+            it++)
+       {
+         _changelog.push_back(ChangelogEntry(strtol(it->date.c_str(), 0, 10),
+                                             it->author,
+                                             it->entry));
+       }
       }
 
       YUMPackageImpl::YUMPackageImpl(
@@ -169,7 +177,15 @@ namespace zypp
          );
          _delta_rpms.push_back(delta);
        }
-// TODO changelog
+       for (std::list<zypp::parser::yum::ChangelogEntry>::const_iterator
+               it = parsed.changelog.begin();
+            it != parsed.changelog.end();
+            it++)
+       {
+         _changelog.push_back(ChangelogEntry(strtol(it->date.c_str(), 0, 10),
+                                             it->author,
+                                             it->entry));
+       }
       }
 
 
@@ -234,7 +250,7 @@ namespace zypp
       { return _group; }
 
       /** */
-      Text YUMPackageImpl::changelog() const
+      Changelog YUMPackageImpl::changelog() const
       { return _changelog; }
 
       /** Don't ship it as class Url, because it might be

diff --git a/zypp/source/yum/YUMPackageImpl.h b/zypp/source/yum/YUMPackageImpl.h
index 905c4869e46dd4251e0e4e5bd5e5bcd971184a02..7beed0dbcff9441af69b0ecf10a810b56c5bd87e 100644 (file)
--- a/zypp/source/yum/YUMPackageImpl.h
+++ b/zypp/source/yum/YUMPackageImpl.h
@@ -14,6 +14,7 @@
 
 #include "zypp/detail/PackageImpl.h"
 #include "zypp/parser/yum/YUMParserData.h"
+#include "zypp/Changelog.h"
 
 ///////////////////////////////////////////////////////////////////
 namespace zypp
@@ -71,7 +72,7 @@ namespace zypp
        /** */
        virtual PackageGroup group() const;
        /** */
-       virtual Text changelog() const;
+       virtual Changelog changelog() const;
        /** Don't ship it as class Url, because it might be
         * in fact anything but a legal Url. */
        virtual std::string url() const;
@@ -198,7 +199,7 @@ namespace zypp
        Label _license;
        std::string _packager;
        PackageGroup _group;
-       Text _changelog;
+       Changelog _changelog;
        std::string _type;
        License _license_to_confirm;
        Text _authors;