start to review and clean up ResolvableData

diff --git a/zypp/data/ResolvableData.cc b/zypp/data/ResolvableData.cc
index fa78105..916e954 100644 (file)
--- a/zypp/data/ResolvableData.cc
+++ b/zypp/data/ResolvableData.cc
@@ -27,12 +27,12 @@ IMPL_PTR_TYPE(Pattern);
 IMPL_PTR_TYPE(Product);
 IMPL_PTR_TYPE(Packagebase);
 IMPL_PTR_TYPE(Package);
-IMPL_PTR_TYPE(Sourcepackage);
+IMPL_PTR_TYPE(SrcPackage);
 
 
 std::ostream & ResObject::dumpOn( std::ostream & str ) const
 {
-  str << "[ " << name << " " << edition << " ]";
+  str << "[ " << name << " " << edition << " " << arch << " ]";
   return str;
 //       << "  provides: " << provides << endl
 //       << "  conflicts: " << conflicts << endl

diff --git a/zypp/data/ResolvableData.h b/zypp/data/ResolvableData.h
index 7841763..ef8887b 100644 (file)
--- a/zypp/data/ResolvableData.h
+++ b/zypp/data/ResolvableData.h
@@ -20,6 +20,7 @@
 
 #include "zypp/capability/CapabilityImpl.h"
 #include "zypp/Pathname.h"
+#include "zypp/NVR.h"
 #include "zypp/Edition.h"
 #include "zypp/ByteCount.h"
 #include "zypp/Arch.h"
@@ -33,7 +34,7 @@ namespace zypp
 namespace data
 {
 
-  typedef std::list<capability::CapabilityImpl::Ptr> DependencyList;
+  typedef std::set<capability::CapabilityImpl::Ptr> DependencyList;
   typedef std::map<zypp::Dep, DependencyList> Dependencies;
 
   ///////////////////////////////////////////////////////////////////
@@ -43,14 +44,14 @@ namespace data
   class Resolvable : public base::ReferenceCounted, private base::NonCopyable
   {
     public:
-    Resolvable()
-    {};
+      Resolvable()
+      {};
 
-    std::string name;
-    Edition edition;
-    Arch arch;
+      std::string name;
+      Edition edition;
+      Arch arch;
 
-    Dependencies deps;
+      Dependencies deps;
   };
 
   ///////////////////////////////////////////////////////////////////
@@ -64,14 +65,13 @@ namespace data
         : source_media_nr(1), install_only(false)
       {}
 
-
       TranslatedText summary;
       TranslatedText description;
 
-      std::string insnotify;
-      std::string delnotify;
+      TranslatedText insnotify;
+      TranslatedText delnotify;
 
-      std::string license_to_confirm;
+      TranslatedText license_to_confirm;
       std::string vendor;
 
       /** Installed size. \see zypp::ResObject::size() */
@@ -193,14 +193,18 @@ namespace data
     public:
 
       Pattern()
-        : user_visible(true)
+        : is_default(false), user_visible(true)
       {};
 
-      std::string default_;
+      bool is_default;
       bool user_visible;
       TranslatedText category;
       std::string icon;
+      std::string order;
       std::string script;
+
+      DependencyList includes;
+      DependencyList extends;
   };
 
   ///////////////////////////////////////////////////////////////////
@@ -215,7 +219,6 @@ namespace data
   {
     public:
       Product() {};
-      ~Product() {};
 
       std::string type;
       std::string vendor;
@@ -240,9 +243,9 @@ namespace data
   class Packagebase : public ResObject
   {
     public:
-      Packagebase() {};
-      ~Packagebase() {};
-
+      enum PackageType { BIN, SRC };
+      virtual PackageType packageType() const = 0;
+    public:
       std::string type;
       CheckSum checksum;
       // changlelog?
@@ -276,14 +279,21 @@ namespace data
    * Data Object for Package resolvable
    */
   struct Package : public Packagebase
-  {};
+  {
+    virtual PackageType packageType() const { return BIN; }
+
+    /** NVR of the corresponding SrcPackage. */
+    shared_ptr<NVR> srcPackageIdent;
+  };
 
-  DEFINE_PTR_TYPE(Sourcepackage);
+  DEFINE_PTR_TYPE(SrcPackage);
   /**
-   * Data Object for Sourcepackage resolvable
+   * Data Object for SrcPackage resolvable
    */
-  struct Sourcepackage : public Packagebase
-  {};
+  struct SrcPackage : public Packagebase
+  {
+    virtual PackageType packageType() const { return SRC; }
+  };
   ///////////////////////////////////////////////////////////////////
 
  template<class _Res> class SpecificData;

diff --git a/zypp/parser/yum/PrimaryFileReader.cc b/zypp/parser/yum/PrimaryFileReader.cc
index e7886c3..2819c70 100644 (file)
--- a/zypp/parser/yum/PrimaryFileReader.cc
+++ b/zypp/parser/yum/PrimaryFileReader.cc
@@ -110,7 +110,7 @@ namespace zypp
       if (reader_r->name() == "packager")
       {
         _package->packager = reader_r.nodeText().asString();
-//        DBG << "packager: " << _package->packager << endl; 
+//        DBG << "packager: " << _package->packager << endl;
         return true;
       }
 
@@ -207,7 +207,7 @@ namespace zypp
             << reader_r->getAttribute("name").asString()
             << " " << edition << endl;
 */
-        _package->deps[_dtype].push_back(
+        _package->deps[_dtype].insert(
           zypp::capability::parse(
             ResTraits<Package>::kind,
             reader_r->getAttribute("name").asString(),
@@ -308,7 +308,7 @@ namespace zypp
         _expect_rpm_entry = true;
         return true;
       }
-      
+
       if (reader_r->name() == "file")
       {
         // TODO figure out how to read files