- remove "suggests()" and "recommends()" from Selection, these UI helpers are not...

  adapt target/store/serialize.cc accordingly

- implement "install_packages()" for Selection and Pattern

diff --git a/zypp/Pattern.cc b/zypp/Pattern.cc
index 25f093e..646e03d 100644 (file)
--- a/zypp/Pattern.cc
+++ b/zypp/Pattern.cc
@@ -59,6 +59,10 @@ namespace zypp
   Pathname Pattern::script() const
   { return pimpl().script(); }
 
+  std::set<std::string> Pattern::install_packages( const Locale & lang ) const
+  {
+     return pimpl().install_packages();
+  }
 
   /////////////////////////////////////////////////////////////////
 } // namespace zypp

diff --git a/zypp/Pattern.h b/zypp/Pattern.h
index bd151a7..2a5fd0f 100644 (file)
--- a/zypp/Pattern.h
+++ b/zypp/Pattern.h
@@ -49,7 +49,8 @@ namespace zypp
     /** */
     Pathname script() const;
     /** */
-    // data here:
+
+    std::set<std::string> install_packages( const Locale & lang = Locale("") ) const;
 
   protected:
     /** Ctor */

diff --git a/zypp/Selection.cc b/zypp/Selection.cc
index ba284eb..9b5abd6 100644 (file)
--- a/zypp/Selection.cc
+++ b/zypp/Selection.cc
@@ -75,17 +75,7 @@ namespace zypp
        return pimpl().order();    
     }
 
-    std::set<std::string> Selection::suggests() const
-    {
-      return pimpl().suggests();
-    }
-
-    std::set<std::string> Selection::recommends() const
-    {
-      return pimpl().recommends();
-    }
-
-    std::set<std::string> Selection::install_packages( const Locale & lang) const
+    std::set<std::string> Selection::install_packages( const Locale & lang ) const
     {
       return pimpl().install_packages();
     }

diff --git a/zypp/Selection.h b/zypp/Selection.h
index c154d66..2842208 100644 (file)
--- a/zypp/Selection.h
+++ b/zypp/Selection.h
@@ -56,8 +56,6 @@ namespace zypp
     /** selection presentation order */
     Label order() const;
 
-    std::set<std::string> suggests() const;
-    std::set<std::string> recommends() const;
     std::set<std::string> install_packages( const Locale & lang = Locale("") ) const;
 
   protected:

diff --git a/zypp/detail/PatternImplIf.cc b/zypp/detail/PatternImplIf.cc
index 4469db7..996ff06 100644 (file)
--- a/zypp/detail/PatternImplIf.cc
+++ b/zypp/detail/PatternImplIf.cc
@@ -35,6 +35,27 @@ namespace zypp
     Pathname PatternImplIf::script() const
     { return Pathname(); }
 
+    static void copycaps( std::set<std::string> & out, const CapSet & in)
+    {
+       for (CapSet::const_iterator it = in.begin(); it != in.end(); ++it) {
+           if (isKind<capability::NamedCap>( *it )
+               && it->refers() == ResTraits<zypp::Package>::kind )
+           {
+               out.insert( it->index() );
+           }
+       }
+    }
+
+    std::set<std::string> PatternImplIf::install_packages( const Locale & lang) const
+    {
+       std::set<std::string> result;
+
+       copycaps( result, self()->dep( Dep::REQUIRES ) );
+       copycaps( result, self()->dep( Dep::RECOMMENDS) );
+
+       return result;
+    }
+
     /////////////////////////////////////////////////////////////////
   } // namespace detail
   ///////////////////////////////////////////////////////////////////

diff --git a/zypp/detail/PatternImplIf.h b/zypp/detail/PatternImplIf.h
index fddfe58..1e2f433 100644 (file)
--- a/zypp/detail/PatternImplIf.h
+++ b/zypp/detail/PatternImplIf.h
@@ -47,6 +47,9 @@ namespace zypp
       virtual Pathname icon() const PURE_VIRTUAL;
 
       virtual Pathname script() const PURE_VIRTUAL;
+
+      /** ui helper */
+      virtual std::set<std::string> install_packages( const Locale & lang = Locale("") ) const;
     };
     ///////////////////////////////////////////////////////////////////
 

diff --git a/zypp/detail/SelectionImplIf.cc b/zypp/detail/SelectionImplIf.cc
index d806e7f..a7de885 100644 (file)
--- a/zypp/detail/SelectionImplIf.cc
+++ b/zypp/detail/SelectionImplIf.cc
@@ -10,6 +10,7 @@
  *
 */
 #include "zypp/detail/SelectionImplIf.h"
+#include "zypp/ResTraits.h"
 #include <iostream>
 
 using namespace std;
@@ -41,14 +42,26 @@ namespace zypp
     Label SelectionImplIf::order() const
     { return Label(); }
 
-    std::set<std::string> SelectionImplIf::suggests() const
-    { return std::set<std::string>(); }
-
-    std::set<std::string> SelectionImplIf::recommends() const
-    { return std::set<std::string>(); }
+    static void copycaps( std::set<std::string> & out, const CapSet & in)
+    {
+       for (CapSet::const_iterator it = in.begin(); it != in.end(); ++it) {
+           if (isKind<capability::NamedCap>( *it )
+               && it->refers() == ResTraits<zypp::Package>::kind )
+           {
+               out.insert( it->index() );
+           }
+       }
+    }
 
     std::set<std::string> SelectionImplIf::install_packages( const Locale & lang) const
-    { return std::set<std::string>(); }
+    {
+       std::set<std::string> result;
+#warning does not honor language packs
+       copycaps( result, self()->dep( Dep::REQUIRES ) );
+       copycaps( result, self()->dep( Dep::RECOMMENDS) );
+
+       return result;
+    }
 
     /////////////////////////////////////////////////////////////////
   } // namespace detail

diff --git a/zypp/detail/SelectionImplIf.h b/zypp/detail/SelectionImplIf.h
index ffa3adb..253f2fa 100644 (file)
--- a/zypp/detail/SelectionImplIf.h
+++ b/zypp/detail/SelectionImplIf.h
@@ -53,9 +53,8 @@ namespace zypp
         /** */
        virtual Label order() const PURE_VIRTUAL;
 
-  virtual std::set<std::string> suggests() const PURE_VIRTUAL;
-  virtual std::set<std::string> recommends() const PURE_VIRTUAL;
-  virtual std::set<std::string> install_packages( const Locale & lang = Locale("") ) const;
+        /** ui helper */
+        virtual std::set<std::string> install_packages( const Locale & lang = Locale("") ) const;
       
 #if 0
         // NOTE LangCode id zypp:Locale

diff --git a/zypp/target/store/serialize.cc b/zypp/target/store/serialize.cc
index f2ca23f..d941ff9 100644 (file)
--- a/zypp/target/store/serialize.cc
+++ b/zypp/target/store/serialize.cc
@@ -212,29 +212,6 @@ std::string toXML( const Selection::constPtr &obj )
   
   out << "    <description>"<< (obj->description()) << "</description>" << std::endl;
   
-  out << "    <grouplist>" << std::endl;
-  //recommended selections
-  std::set<std::string> rec_sel = obj->recommends();
-  std::set<std::string>::const_iterator it;
-  for (it = rec_sel.begin(); it != rec_sel.end(); ++it)
-    out << "       <metapkg type=\"optional\">" << *it << "</metapkg>" << std::endl;
-
-  std::set<std::string> sug_sel = obj->suggests();
-  it = sug_sel.begin();
-  for (; it != sug_sel.end(); ++it)
-    out << "       <metapkg type=\"optional\">" << *it << "</metapkg>" << std::endl;
-
-  out << "    </grouplist>" << std::endl;
-
-  out << "    <packagelist>" << std::endl;
-
-  std::set<std::string> ins_pkg = obj->install_packages();
-  it = ins_pkg.begin();
-  for (; it != ins_pkg.end(); ++it)
-  {
-    out << "       <packagereq type=\"optional\">" << *it << "</packagereq>" << std::endl;
-  }
-  out << "    </packagelist>" << std::endl;
   out << "  </group>" << std::endl;
   out << "</groups>" << std::endl;
   return out.str();