get rid of Packman and Section
authorKlaus Kaempf <kkaempf@suse.de>
Sat, 7 Jan 2006 16:10:06 +0000 (16:10 +0000)
committerKlaus Kaempf <kkaempf@suse.de>
Sat, 7 Jan 2006 16:10:06 +0000 (16:10 +0000)
zypp/solver/detail/Makefile.am
zypp/solver/detail/Package.cc
zypp/solver/detail/Package.h
zypp/solver/detail/Section.cc [deleted file]
zypp/solver/detail/Section.h [deleted file]
zypp/solver/detail/StoreWorld.cc
zypp/solver/detail/StoreWorld.h
zypp/solver/detail/World.h
zypp/solver/detail/XmlParser.cc
zypp/solver/detail/extract.h

index bd209c2..662a243 100644 (file)
@@ -15,7 +15,6 @@ include_HEADERS = \
        Hash.h                          \
        Spec.h                          \
        SpecPtr.h                       \
-       Section.h                       \
        Channel.h                       \
        ChannelPtr.h                    \
        Subscription.h                  \
@@ -95,13 +94,11 @@ lib@PACKAGE@_solver_detail_la_SOURCES =                     \
        ResItemAndDependency.cc                 \
        XmlNode.cc                                      \
        Importance.cc                                   \
-       Section.cc                                      \
        Package.cc                                      \
        PackageUpdate.cc                                \
        XmlParser.cc                                    \
        Match.cc                                        \
        Pending.cc                                      \
-       Packman.cc                                      \
        World.cc                                        \
        UndumpWorld.cc                                  \
        StoreWorld.cc                                   \
index a887f11..d4e8e94 100644 (file)
@@ -41,673 +41,537 @@ namespace zypp
     namespace detail
     { ///////////////////////////////////////////////////////////////////
 
-      using namespace std;
-
-      IMPL_PTR_TYPE(Package);
-
-      struct DepTable {
-          CapSet requires;
-          CapSet provides;
-          CapSet conflicts;
-          CapSet obsoletes;
-          CapSet children;
-          CapSet suggests;
-          CapSet recommends;
-      };
-
-      //---------------------------------------------------------------------------
-
-      static Capability
-      parseXmlDep (XmlNode_constPtr node) {
-          const char *tmp;
-          string epoch,version,release,name = "";
-          Arch arch = Arch_noarch;
-          Rel relation;
-          CapFactory  factory;
-
-          if (!node->equals("dep")) {
-              fprintf (stderr, "parseXmlDep bad node\n");
-              abort();
-          }
-
-          name = node->getProp ("name");
-          tmp = node->getProp ("op", NULL);
-          if (tmp) {
-              relation = Rel(tmp);
-              epoch = node->getIntValueDefault ("epoch", Edition::noepoch);
-              version = node->getProp ("version");
-              release = node->getProp ("release");
-          }
-
-          tmp = node->getProp ("arch", NULL);
-          if (tmp) {
-              arch = Arch(node->getProp ("arch"));
-          } else {
-              arch =  Arch();
-          }
-
-          return  factory.parse ( ResTraits<zypp::Package>::kind,
-                                  name,
-                                  relation,
-                                  Edition (version, release, epoch));
-      }
-
-      static void
-      extract_dep_info (XmlNode_constPtr iter, struct DepTable & dep_table)
-      {
-          if (iter->equals("requires")) {
-       XmlNode_constPtr iter2;
-
-       iter2 = iter->children();
-
-       while (iter2) {
-           if (!iter2->isElement()) {
-               iter2 = iter2->next();
-               continue;
-           }
-
-           dep_table.requires.insert(parseXmlDep (iter2));
-           iter2 = iter2->next();
-       }
-
-          } else if (iter->equals("recommends")) {
-       XmlNode_constPtr iter2;
-
-       iter2 = iter->children();
-
-       while (iter2) {
-           if (!iter2->isElement()) {
-               iter2 = iter2->next();
-               continue;
-           }
-
-           dep_table.recommends.insert (parseXmlDep (iter2));
-           iter2 = iter2->next();
-       }
-
-          } else if (iter->equals("suggests")) {
-       XmlNode_constPtr iter2;
-
-       iter2 = iter->children();
-
-       while (iter2) {
-           if (!iter2->isElement()) {
-               iter2 = iter2->next();
-               continue;
-           }
-
-           dep_table.suggests.insert (parseXmlDep (iter2));
-           iter2 = iter2->next();
-       }
-
-          } else if (iter->equals("conflicts")) {
-       XmlNode_Ptr iter2;
-       bool all_are_obs = false, this_is_obs = false;
-       const char *obs;
-
-       iter2 = iter->children();
-
-       obs = iter->getProp ("obsoletes", NULL);
-       if (obs) {
-           all_are_obs = true;
-           free ((void *)obs);
-       }
-
-       while (iter2) {
-
-           if (!iter2->isElement()) {
-               iter2 = iter2->next();
-               continue;
-           }
-
-           Capability dep = parseXmlDep(iter2);
-
-           if (! all_are_obs) {
-               this_is_obs = false;
-               obs = iter2->getProp ("obsoletes", NULL);
-               if (obs) {
-                   this_is_obs = true;
-                   free ((void *)obs);
-               }
-           }
-
-           if (all_are_obs || this_is_obs) {
-               dep_table.obsoletes.insert (dep);
-           } else {
-               dep_table.conflicts.insert (dep);
-           }
-
-           iter2 = iter2->next();
-       }
-
-          } else if (iter->equals("obsoletes")) {
-       XmlNode_constPtr iter2;
-
-       iter2 = iter->children();
-
-       while (iter2) {
-           if (!iter2->isElement()) {
-               iter2 = iter2->next();
-               continue;
-           }
-
-           dep_table.obsoletes.insert (parseXmlDep (iter2));
-           iter2 = iter2->next();
-       }
-
-          } else if (iter->equals("provides")) {
-       XmlNode_constPtr iter2;
-
-       iter2 = iter->children();
-
-       while (iter2) {
-           if (!iter2->isElement()) {
-               iter2 = iter2->next();
-               continue;
-           }
-
-           dep_table.provides.insert (parseXmlDep (iter2));
-           iter2 = iter2->next();
-       }
-
-          } else if (iter->equals("children")) {
-       XmlNode_constPtr iter2;
-
-       iter2 = iter->children();
-
-       while (iter2) {
-           if (!iter2->isElement()) {
-               iter2 = iter2->next();
-               continue;
-           }
-
-           dep_table.children.insert (parseXmlDep (iter2));
-           iter2 = iter2->next();
-       }
-          }
-      }
-
-      //---------------------------------------------------------------------------
-
-
-      string
-      Package::asString ( bool full ) const
-      {
-          return toString (*this, full);
-      }
-
-
-      string
-      Package::toString ( const PackageUpdateList & l, bool full )
-      {
-          string ret ("[");
-          for (PackageUpdateList::const_iterator i = l.begin(); i != l.end(); i++) {
-       if (i != l.begin()) ret += ", ";
-       ret += (*i)->asString(full);
-          }
-          return ret + "]";
-      }
-
-      string
-      Package::toString ( const Package & package, bool full )
-      {
-          string ret;
-          ret += ResItem::toString(package, full);
-          if (full) {
-      //       if (package._section != NULL) ret += (string ("<section '") + package._section->asString() + "'/>");
-      //       if (!package._pretty_name.empty()) ret += (string ("<pretty_name '") + package._pretty_name + "'/>");
-      //       if (!package._summary.empty()) ret += (string ("<summary '") + package._summary + "'/>");
-      //       if (!package._description.empty()) ret += (string ("<description '") + package._description + "'/>");
-       ret += (string ("<history '") + toString(package._history) + "'/>");
-          }
-          return ret;
-      }
-
-
-      ostream &
-      Package::dumpOn( ostream & str ) const
-      {
-          str << asString();
-          return str;
-      }
-
-
-      ostream&
-      operator<<( ostream& os, const Package& package)
-      {
-          return os << package.asString();
-      }
-
-      //---------------------------------------------------------------------------
-
-      Package::Package (Channel_constPtr channel)
-          : ResItem (ResTraits<zypp::Package>::kind, "")
-          , _section (NULL)
-          , _pretty_name ("")
-          , _summary ("")
-          , _description ("")
-          , _package_filename ("")
-          , _signature_filename ("")
-          , _install_only (false)
-          , _package_set (false)
-          , _id ("")
-      {
-          setChannel (channel);
-      }
-
-
-      Package::Package (Channel_constPtr channel,
-                        const string & name,
-                        const Edition & edition,
-                        const Arch arch)
-
-          : ResItem (ResTraits<zypp::Package>::kind, "")
-          , _section (NULL)
-          , _pretty_name ("")
-          , _summary ("")
-          , _description ("")
-          , _package_filename ("")
-          , _signature_filename ("")
-          , _install_only (false)
-          , _package_set (false)
-          , _id ("")
-      {
-
-          setChannel (channel);
-
-          shared_ptr<zypp::detail::PackageImpl> pkgImpl;
-          zypp::Package::Ptr pkg( zypp::detail::makeResolvableAndImpl( name, edition, arch,
-                                                                       pkgImpl ) );
-          _resObject = pkg;
-      }
-
-
-      Package::Package (XmlNode_constPtr node, Channel_constPtr channel)
-          : ResItem (ResTraits<zypp::Package>::kind, "")
-          , _section (NULL)
-          , _pretty_name ("")
-          , _summary ("")
-          , _description ("")
-          , _package_filename ("")
-          , _signature_filename ("")
-          , _install_only (false)
-          , _package_set (false)
-          , _id ("")
-      {
-          string name = "";
-          int epoch = Edition::noepoch;
-          string version = "";
-          string release = "";
-          Arch arch = Arch_noarch;
-
-          if (!node->equals("package")) {
-              fprintf (stderr, "Package::Package() not a package node\n");
-              exit (1);
-          }
-
-          struct DepTable dep_table;
-
-          setChannel (channel);
-
-          XmlNode_constPtr iter = node->children();
-
-          while (iter) {
-              bool extracted_deps = false;
-
-              if (iter->equals("name")) {                      name = iter->getContent();
-              } else if (iter->equals("epoch")) {              epoch = atoi (iter->getContent());
-              } else if (iter->equals("version")) {            version = iter->getContent();
-              } else if (iter->equals("release")) {            release = iter->getContent();
-              } else if (iter->equals("summary")) {            _summary = strdup (iter->getContent());
-              } else if (iter->equals("description")) {        _description = strdup (iter->getContent());
-              } else if (iter->equals("section")) {            _section = new Section (iter->getContent());
-              } else if (iter->equals("arch")) {               arch = Arch(iter->getContent());
-              } else if (iter->equals("filesize")) {
-                  const char *tmp = iter->getContent();
-                  setFileSize (tmp && *tmp ? atoi (tmp) : 0);
-                  free ((void *)tmp);
-              } else if (iter->equals("installedsize")) {
-                  const char *tmp = iter->getContent();
-                  setInstalledSize (tmp && *tmp ? atoi (tmp) : 0);
-                  free ((void *)tmp);
-              } else if (iter->equals("install_only")) {       _install_only = true;
-              } else if (iter->equals("package_set")) {        _package_set = true;
-              } else if (iter->equals("history")) {
-                  XmlNode_constPtr iter2;
-
-                  iter2 = iter->children();
-
-                  while (iter2) {
-                      if (!iter2->isElement()) {
-                          iter2 = iter2->next();
-                          continue;
-                      }
-
-                      PackageUpdate_Ptr update = new PackageUpdate (iter2, this);
-                      addUpdate (update);
-
-                      iter2 = iter2->next();
-                  }
-              } else if (iter->equals("deps")) {
-                  XmlNode_constPtr iter2;
-
-                  for (iter2 = iter->children(); iter2; iter2 = iter2->next()) {
-                      if (!iter2->isElement())
-                          continue;
-
-                      extract_dep_info (iter2, dep_table);
-                  }
-
-                  extracted_deps = true;
-              }
-              else {
-                  if (!extracted_deps)
-                      extract_dep_info (iter, dep_table);
-                  else {
-                      /* FIXME: Bitch to the user here? */
-                  }
-              }
-
-              iter = iter->next();
-          }
-
-          if (!dep_table.children.empty()) {
-              // children are used in package sets
-              // treat them as normal requires
-              //
+using namespace std;
+
+IMPL_PTR_TYPE(Package);
+
+struct DepTable {
+    CapSet requires;
+    CapSet provides;
+    CapSet conflicts;
+    CapSet obsoletes;
+    CapSet children;
+    CapSet suggests;
+    CapSet recommends;
+};
+
+//---------------------------------------------------------------------------
+
+static Capability
+parseXmlDep (XmlNode_constPtr node) {
+    const char *tmp;
+    string epoch,version,release,name = "";
+    Arch arch = Arch_noarch;
+    Rel relation;
+    CapFactory  factory;
+
+    if (!node->equals("dep")) {
+        fprintf (stderr, "parseXmlDep bad node\n");
+        abort();
+    }
+
+    name = node->getProp ("name");
+    tmp = node->getProp ("op", NULL);
+    if (tmp) {
+        relation = Rel(tmp);
+        epoch = node->getIntValueDefault ("epoch", Edition::noepoch);
+        version = node->getProp ("version");
+        release = node->getProp ("release");
+    }
+
+    tmp = node->getProp ("arch", NULL);
+    if (tmp) {
+        arch = Arch(node->getProp ("arch"));
+    } else {
+        arch =  Arch();
+    }
+
+    return  factory.parse ( ResTraits<zypp::Package>::kind,
+                            name,
+                            relation,
+                            Edition (version, release, epoch));
+}
+
+static void
+extract_dep_info (XmlNode_constPtr iter, struct DepTable & dep_table)
+{
+    if (iter->equals("requires")) {
+       XmlNode_constPtr iter2;
+
+       iter2 = iter->children();
+
+       while (iter2) {
+           if (!iter2->isElement()) {
+               iter2 = iter2->next();
+               continue;
+           }
+
+           dep_table.requires.insert(parseXmlDep (iter2));
+           iter2 = iter2->next();
+       }
+
+    } else if (iter->equals("recommends")) {
+       XmlNode_constPtr iter2;
+
+       iter2 = iter->children();
+
+       while (iter2) {
+           if (!iter2->isElement()) {
+               iter2 = iter2->next();
+               continue;
+           }
+
+           dep_table.recommends.insert (parseXmlDep (iter2));
+           iter2 = iter2->next();
+       }
+
+    } else if (iter->equals("suggests")) {
+       XmlNode_constPtr iter2;
+
+       iter2 = iter->children();
+
+       while (iter2) {
+           if (!iter2->isElement()) {
+               iter2 = iter2->next();
+               continue;
+           }
+
+           dep_table.suggests.insert (parseXmlDep (iter2));
+           iter2 = iter2->next();
+       }
+
+    } else if (iter->equals("conflicts")) {
+       XmlNode_Ptr iter2;
+       bool all_are_obs = false, this_is_obs = false;
+       const char *obs;
+
+       iter2 = iter->children();
+
+       obs = iter->getProp ("obsoletes", NULL);
+       if (obs) {
+           all_are_obs = true;
+           free ((void *)obs);
+       }
+
+       while (iter2) {
+
+           if (!iter2->isElement()) {
+               iter2 = iter2->next();
+               continue;
+           }
+
+           Capability dep = parseXmlDep(iter2);
+
+           if (! all_are_obs) {
+               this_is_obs = false;
+               obs = iter2->getProp ("obsoletes", NULL);
+               if (obs) {
+                   this_is_obs = true;
+                   free ((void *)obs);
+               }
+           }
+
+           if (all_are_obs || this_is_obs) {
+               dep_table.obsoletes.insert (dep);
+           } else {
+               dep_table.conflicts.insert (dep);
+           }
+
+           iter2 = iter2->next();
+       }
+
+    } else if (iter->equals("obsoletes")) {
+       XmlNode_constPtr iter2;
+
+       iter2 = iter->children();
+
+       while (iter2) {
+           if (!iter2->isElement()) {
+               iter2 = iter2->next();
+               continue;
+           }
+
+           dep_table.obsoletes.insert (parseXmlDep (iter2));
+           iter2 = iter2->next();
+       }
+
+    } else if (iter->equals("provides")) {
+       XmlNode_constPtr iter2;
+
+       iter2 = iter->children();
+
+       while (iter2) {
+           if (!iter2->isElement()) {
+               iter2 = iter2->next();
+               continue;
+           }
+
+           dep_table.provides.insert (parseXmlDep (iter2));
+           iter2 = iter2->next();
+       }
+
+    } else if (iter->equals("children")) {
+       XmlNode_constPtr iter2;
+
+       iter2 = iter->children();
+
+       while (iter2) {
+           if (!iter2->isElement()) {
+               iter2 = iter2->next();
+               continue;
+           }
+
+           dep_table.children.insert (parseXmlDep (iter2));
+           iter2 = iter2->next();
+       }
+    }
+}
+
+//---------------------------------------------------------------------------
+
+
+string
+Package::asString ( bool full ) const
+{
+    return toString (*this, full);
+}
+
+
+string
+Package::toString ( const PackageUpdateList & l, bool full )
+{
+    string ret ("[");
+    for (PackageUpdateList::const_iterator i = l.begin(); i != l.end(); i++) {
+       if (i != l.begin()) ret += ", ";
+       ret += (*i)->asString(full);
+    }
+    return ret + "]";
+}
+
+string
+Package::toString ( const Package & package, bool full )
+{
+    string ret;
+    ret += ResItem::toString(package, full);
+    if (full) {
+//     if (package._section != NULL) ret += (string ("<section '") + package._section->asString() + "'/>");
+//     if (!package._pretty_name.empty()) ret += (string ("<pretty_name '") + package._pretty_name + "'/>");
+//     if (!package._summary.empty()) ret += (string ("<summary '") + package._summary + "'/>");
+//     if (!package._description.empty()) ret += (string ("<description '") + package._description + "'/>");
+       ret += (string ("<history '") + toString(package._history) + "'/>");
+    }
+    return ret;
+}
+
+
+ostream &
+Package::dumpOn( ostream & str ) const
+{
+    str << asString();
+    return str;
+}
+
+
+ostream&
+operator<<( ostream& os, const Package& package)
+{
+    return os << package.asString();
+}
+
+//---------------------------------------------------------------------------
+
+Package::Package (Channel_constPtr channel)
+    : ResItem (ResTraits<zypp::Package>::kind, "")
+    , _pretty_name ("")
+    , _summary ("")
+    , _description ("")
+    , _package_filename ("")
+    , _signature_filename ("")
+    , _install_only (false)
+    , _package_set (false)
+    , _id ("")
+{
+    setChannel (channel);
+}
+
+
+Package::Package (Channel_constPtr channel,
+                  const string & name,
+                  const Edition & edition,
+                  const Arch arch)
+
+    : ResItem (ResTraits<zypp::Package>::kind, "")
+    , _pretty_name ("")
+    , _summary ("")
+    , _description ("")
+    , _package_filename ("")
+    , _signature_filename ("")
+    , _install_only (false)
+    , _package_set (false)
+    , _id ("")
+{
+
+    setChannel (channel);
+
+    shared_ptr<zypp::detail::PackageImpl> pkgImpl;
+    zypp::Package::Ptr pkg( zypp::detail::makeResolvableAndImpl( name, edition, arch,
+                                                                 pkgImpl ) );
+    _resObject = pkg;
+}
+
+
+Package::Package (XmlNode_constPtr node, Channel_constPtr channel)
+    : ResItem (ResTraits<zypp::Package>::kind, "")
+    , _pretty_name ("")
+    , _summary ("")
+    , _description ("")
+    , _package_filename ("")
+    , _signature_filename ("")
+    , _install_only (false)
+    , _package_set (false)
+    , _id ("")
+{
+    string name = "";
+    int epoch = Edition::noepoch;
+    string version = "";
+    string release = "";
+    Arch arch = Arch_noarch;
+
+    if (!node->equals("package")) {
+        fprintf (stderr, "Package::Package() not a package node\n");
+        exit (1);
+    }
+
+    struct DepTable dep_table;
+
+    setChannel (channel);
+
+    XmlNode_constPtr iter = node->children();
+
+    while (iter) {
+        bool extracted_deps = false;
+
+        if (iter->equals("name")) {                    name = iter->getContent();
+        } else if (iter->equals("epoch")) {            epoch = atoi (iter->getContent());
+        } else if (iter->equals("version")) {          version = iter->getContent();
+        } else if (iter->equals("release")) {          release = iter->getContent();
+        } else if (iter->equals("summary")) {          _summary = strdup (iter->getContent());
+        } else if (iter->equals("description")) {      _description = strdup (iter->getContent());
+        } else if (iter->equals("arch")) {             arch = Arch(iter->getContent());
+        } else if (iter->equals("filesize")) {
+            const char *tmp = iter->getContent();
+            setFileSize (tmp && *tmp ? atoi (tmp) : 0);
+            free ((void *)tmp);
+        } else if (iter->equals("installedsize")) {
+            const char *tmp = iter->getContent();
+            setInstalledSize (tmp && *tmp ? atoi (tmp) : 0);
+            free ((void *)tmp);
+        } else if (iter->equals("install_only")) {     _install_only = true;
+        } else if (iter->equals("package_set")) {      _package_set = true;
+        } else if (iter->equals("history")) {
+            XmlNode_constPtr iter2;
+
+            iter2 = iter->children();
+
+            while (iter2) {
+                if (!iter2->isElement()) {
+                    iter2 = iter2->next();
+                    continue;
+                }
+
+                PackageUpdate_Ptr update = new PackageUpdate (iter2, this);
+                addUpdate (update);
+
+                iter2 = iter2->next();
+            }
+        } else if (iter->equals("deps")) {
+            XmlNode_constPtr iter2;
+
+            for (iter2 = iter->children(); iter2; iter2 = iter2->next()) {
+                if (!iter2->isElement())
+                    continue;
+
+                extract_dep_info (iter2, dep_table);
+            }
+
+            extracted_deps = true;
+        }
+        else {
+            if (!extracted_deps)
+                extract_dep_info (iter, dep_table);
+            else {
+                /* FIXME: Bitch to the user here? */
+            }
+        }
+
+        iter = iter->next();
+    }
+
+    if (!dep_table.children.empty()) {
+        // children are used in package sets
+        // treat them as normal requires
+        //
 #warning Children are handled as requires
-              CapSet::const_iterator iter;
-              for (iter = dep_table.children.begin(); iter != dep_table.children.end(); iter++)
-              {
-                  dep_table.requires.insert (*iter);
-              }
-          }
-
-
-          // check if we're already listed in the provides
-          // if not, provide ourself
-          CapFactory  factory;
-          Capability selfdep = factory.parse ( ResTraits<zypp::Package>::kind,
-                                             name,
-                                             Rel::EQ,
+        CapSet::const_iterator iter;
+        for (iter = dep_table.children.begin(); iter != dep_table.children.end(); iter++)
+        {
+            dep_table.requires.insert (*iter);
+        }
+    }
+
+
+    // check if we're already listed in the provides
+    // if not, provide ourself
+    CapFactory  factory;
+    Capability selfdep = factory.parse ( ResTraits<zypp::Package>::kind,
+                                       name,
+                                       Rel::EQ,
                                               Edition( version, release, zypp::str::numstring(epoch)));
 
 
-          CapSet::const_iterator piter;
-          for (piter = dep_table.provides.begin(); piter != dep_table.provides.end(); piter++) {
-              if ((*piter) == selfdep)
-              {
-                  break;
-              }
-          }
-          if (piter == dep_table.provides.end()) {                     // no self provide found, construct one
-              _DBG("RC_SPEW") << "Adding self-provide [" << selfdep.asString() << "]" << endl;
-              dep_table.provides.insert (selfdep);
-          }
+    CapSet::const_iterator piter;
+    for (piter = dep_table.provides.begin(); piter != dep_table.provides.end(); piter++) {
+        if ((*piter) == selfdep)
+        {
+            break;
+        }
+    }
+    if (piter == dep_table.provides.end()) {                   // no self provide found, construct one
+        _DBG("RC_SPEW") << "Adding self-provide [" << selfdep.asString() << "]" << endl;
+        dep_table.provides.insert (selfdep);
+    }
 
-          Dependencies deps;
-          deps.setRequires          (dep_table.requires);
-          deps.setProvides          (dep_table.provides);
-          deps.setConflicts         (dep_table.conflicts);
-          deps.setObsoletes         (dep_table.obsoletes);
-          deps.setSuggests          (dep_table.suggests);
-          deps.setRecommends        (dep_table.recommends);
-          setDependencies (deps);
+    Dependencies deps;
+    deps.setRequires          (dep_table.requires);
+    deps.setProvides          (dep_table.provides);
+    deps.setConflicts         (dep_table.conflicts);
+    deps.setObsoletes         (dep_table.obsoletes);
+    deps.setSuggests          (dep_table.suggests);
+    deps.setRecommends        (dep_table.recommends);
+    setDependencies (deps);
 
-          if (!_history.empty()) {
+    if (!_history.empty()) {
 
-              /* If possible, we grab the version info from the most
-                 recent update. */
+        /* If possible, we grab the version info from the most
+           recent update. */
 
-              PackageUpdate_Ptr update = _history.front();
+        PackageUpdate_Ptr update = _history.front();
 
-              epoch = update->package()->epoch();
-              version = update->package()->version();
-              release = update->package()->release();
+        epoch = update->package()->epoch();
+        version = update->package()->version();
+        release = update->package()->release();
 
-          }
+    }
 #if 0 //Is this really needed ?
-          else {
-
-              /* Otherwise, try to find where the package provides itself,
-                 and use that version info. */
-
-              if (!provides().empty())
-                  for (CapSet::const_iterator iter = provides().begin(); iter != provides().end(); iter++) {
-                      if ((*iter)->relation() == Rel::EQ &&
-                          ((*iter)->name() == name))
-                      {
-                          epoch = (*iter)->epoch();
-                          version = (*iter)->version();
-                          release = (*iter)->release();
-                          break;
-                      }
-                  }
-          }
+    else {
+
+        /* Otherwise, try to find where the package provides itself,
+           and use that version info. */
+
+        if (!provides().empty())
+            for (CapSet::const_iterator iter = provides().begin(); iter != provides().end(); iter++) {
+                if ((*iter)->relation() == Rel::EQ &&
+                    ((*iter)->name() == name))
+                {
+                    epoch = (*iter)->epoch();
+                    version = (*iter)->version();
+                    release = (*iter)->release();
+                    break;
+                }
+            }
+    }
 #endif
 
-          Edition     _edition( version, release, zypp::str::numstring(epoch) );
-          shared_ptr<zypp::detail::PackageImpl> pkgImpl;
-          zypp::Package::Ptr pkg( zypp::detail::makeResolvableAndImpl( name, _edition, arch,
-                                                                       pkgImpl ) );
-          _resObject = pkg;
-      }
-
-      Package::~Package()
-      {
-      }
-
-      //---------------------------------------------------------------------------
-
-
-      void
-      Package::addUpdate (PackageUpdate_Ptr update)
-      {
-          if (update == NULL) return;
-
-          assert (update->package() == NULL
-                   || update->package() == const_cast<const Package *>(this));
-
-          update->setPackage(this);
-
-          if (_history.empty()) {
-       _history.push_back (update);
-          } else {
-      #warning addUpdate incomplete
-      #if 1
-       for (PackageUpdateList::iterator iter = _history.begin(); iter != _history.end(); iter++) {
-           int result = Spec::compare ((Spec_Ptr)update, (Spec_Ptr)(*iter));
-
-           if (result > 0 || (result == 0 && update->parent() != NULL)) {
-               _history.insert (iter, update);                                 // = g_slist_insert_before (package->history, l, update);
-               break;
-           } else if (iter == _history.end() ||                                        // FIXME list.last() ?
-                      (result == 0 && update->parent() == NULL)) {
-               _history.insert (++iter, update);                                       // = g_slist_insert_before (package->history, l->next, update);
-               break;
-           }
-       }
-      #endif
-          }
-      }
-
-
-      PackageUpdate_Ptr
-      Package::getLatestUpdate (void) const
-      {
-          World_Ptr world;
-
-          if (_history.empty()) {
-       return NULL;
-          }
-
-          PackageUpdate_Ptr latest = _history.back();
-          /* if the absolute latest is not a patch, just return that */
-          if (latest->parent() == NULL) {
-       return latest;
-          }
-
-          world = World::globalWorld();
-
-          for (PackageUpdateList::const_iterator l = _history.begin(); l != _history.end(); l++) {
-       PackageUpdate_Ptr update = *l;
-       ResItem_constPtr installed;
-
-       if (!update->equals (latest)) {
-           return NULL;
-       }
-
-       /* found a non-patch package equal to the latest, so use that */
-       if (update->parent() == NULL) {
-           return update;
-       }
-
-       /* see if the required parent for this patch is installed */
-
-       installed = world->findInstalledResItem (update->parent());
-
-       if (installed != NULL &&
-           installed->equals(update->parent()))
-           return update;
-          }
-
-          /* no suitable update found */
-          return NULL;
-      }
-
-
-      #if 0
-      xmlNode *
-      rc_package_to_xml_node (RCPackage *package)
-      {
-          xmlNode *package_node;
-          xmlNode *tmp_node;
-          xmlNode *deps_node;
-          RCResItem *r;
-          RCResItemSpec *spec;
-          RCPackageUpdateSList *history_iter;
-          int i;
-          char buffer[128];
-          char *tmp_str;
-
-          r = RC_RESOLVABLE (package);
-          spec = rc_resItem_get_spec (r);
-
-          package_node = xmlNewNode (NULL, "package");
-
-          xmlNewTextChild (package_node, NULL, "name", rc_resItem_get_name (r));
-
-          if (spec->has_epoch) {
-       g_snprintf (buffer, 128, "%d", spec->epoch);
-       xmlNewTextChild (package_node, NULL, "epoch", buffer);
-          }
-
-          xmlNewTextChild (package_node, NULL, "version", spec->version);
-
-          if (spec->release) {
-       xmlNewTextChild (package_node, NULL, "release", spec->release);
-          }
-
-          tmp_str = sanitize_string (package->summary);
-          xmlNewTextChild (package_node, NULL, "summary", tmp_str);
-          g_free (tmp_str);
-
-          tmp_str = sanitize_string (package->description);
-          xmlNewTextChild (package_node, NULL, "description", tmp_str);
-          g_free (tmp_str);
-
-          xmlNewTextChild (package_node, NULL, "arch",
-                    rc_arch_to_string (spec->arch));
-
-          xmlNewTextChild (package_node, NULL, "section",
-                    rc_package_section_to_string (package->section));
-
-          g_snprintf (buffer, 128, "%u", rc_resItem_get_file_size (r));
-          xmlNewTextChild (package_node, NULL, "filesize", buffer);
-
-          g_snprintf (buffer, 128, "%u", rc_resItem_get_installed_size (r));
-          xmlNewTextChild (package_node, NULL, "installedsize", buffer);
-
-          if (package->install_only) {
-       xmlNewTextChild (package_node, NULL, "install_only", "1");
-          }
-
-          if (package->package_set) {
-       xmlNewTextChild (package_node, NULL, "package_set", "1");
-          }
-
-          if (package->history) {
-       tmp_node = xmlNewChild (package_node, NULL, "history", NULL);
-       for (history_iter = package->history; history_iter;
-            history_iter = history_iter->next)
-       {
-           RCPackageUpdate *update = (RCPackageUpdate *)(history_iter->data);
-           xmlAddChild (tmp_node, rc_package_update_to_xml_node (update));
-       }
-          }
-
-          deps_node = xmlNewChild (package_node, NULL, "deps", NULL);
+    Edition     _edition( version, release, zypp::str::numstring(epoch) );
+    shared_ptr<zypp::detail::PackageImpl> pkgImpl;
+    zypp::Package::Ptr pkg( zypp::detail::makeResolvableAndImpl( name, _edition, arch,
+                                                                 pkgImpl ) );
+    _resObject = pkg;
+}
+
+Package::~Package()
+{
+}
+
+//---------------------------------------------------------------------------
+
+
+void
+Package::addUpdate (PackageUpdate_Ptr update)
+{
+    if (update == NULL) return;
+
+    assert (update->package() == NULL
+             || update->package() == const_cast<const Package *>(this));
+
+    update->setPackage(this);
+
+    if (_history.empty()) {
+       _history.push_back (update);
+    } else {
+#warning addUpdate incomplete
+#if 1
+       for (PackageUpdateList::iterator iter = _history.begin(); iter != _history.end(); iter++) {
+           int result = Spec::compare ((Spec_Ptr)update, (Spec_Ptr)(*iter));
+
+           if (result > 0 || (result == 0 && update->parent() != NULL)) {
+               _history.insert (iter, update);                                 // = g_slist_insert_before (package->history, l, update);
+               break;
+           } else if (iter == _history.end() ||                                        // FIXME list.last() ?
+                      (result == 0 && update->parent() == NULL)) {
+               _history.insert (++iter, update);                                       // = g_slist_insert_before (package->history, l->next, update);
+               break;
+           }
+       }
+#endif
+    }
+}
 
-          if (r->requires_a) {
-       tmp_node = xmlNewChild (deps_node, NULL, "requires", NULL);
-       for (i = 0; i < r->requires_a->len; i++) {
-           RCResItemDep *dep = r->requires_a->data[i];
 
-           xmlAddChild (tmp_node, rc_resItem_dep_to_xml_node (dep));
-       }
-          }
+PackageUpdate_Ptr
+Package::getLatestUpdate (void) const
+{
+    World_Ptr world;
 
-          if (r->recommends_a) {
-       tmp_node = xmlNewChild (deps_node, NULL, "recommends", NULL);
-       for (i = 0; i < r->recommends_a->len; i++) {
-           RCResItemDep *dep = r->recommends_a->data[i];
+    if (_history.empty()) {
+       return NULL;
+    }
 
-           xmlAddChild (tmp_node, rc_resItem_dep_to_xml_node (dep));
-       }
-          }
+    PackageUpdate_Ptr latest = _history.back();
+    /* if the absolute latest is not a patch, just return that */
+    if (latest->parent() == NULL) {
+       return latest;
+    }
 
-          if (r->suggests_a) {
-       tmp_node = xmlNewChild (deps_node, NULL, "suggests", NULL);
-       for (i = 0; i < r->suggests_a->len; i++) {
-           RCResItemDep *dep = r->suggests_a->data[i];
+    world = World::globalWorld();
 
-           xmlAddChild (tmp_node, rc_resItem_dep_to_xml_node (dep));
-       }
-          }
+    for (PackageUpdateList::const_iterator l = _history.begin(); l != _history.end(); l++) {
+       PackageUpdate_Ptr update = *l;
+       ResItem_constPtr installed;
 
-          if (r->conflicts_a) {
-       tmp_node = xmlNewChild (deps_node, NULL, "conflicts", NULL);
-       for (i = 0; i < r->conflicts_a->len; i++) {
-           RCResItemDep *dep = r->conflicts_a->data[i];
-
-           xmlAddChild (tmp_node, rc_resItem_dep_to_xml_node (dep));
-       }
-          }
+       if (!update->equals (latest)) {
+           return NULL;
+       }
 
-          if (r->obsoletes_a) {
-       tmp_node = xmlNewChild (deps_node, NULL, "obsoletes", NULL);
-       for (i = 0; i < r->obsoletes_a->len; i++) {
-           RCResItemDep *dep = r->obsoletes_a->data[i];
+       /* found a non-patch package equal to the latest, so use that */
+       if (update->parent() == NULL) {
+           return update;
+       }
 
-           xmlAddChild (tmp_node, rc_resItem_dep_to_xml_node (dep));
-       }
-          }
+       /* see if the required parent for this patch is installed */
 
-          if (r->provides_a) {
-       tmp_node = xmlNewChild (deps_node, NULL, "provides", NULL);
-       for (i = 0; i < r->provides_a->len; i++) {
-           RCResItemDep *dep = r->provides_a->data[i];
+       installed = world->findInstalledResItem (update->parent());
 
-           xmlAddChild (tmp_node, rc_resItem_dep_to_xml_node (dep));
-       }
-          }
+       if (installed != NULL &&
+           installed->equals(update->parent()))
+           return update;
+    }
 
-          return (package_node);
-      } /* rc_package_to_xml_node */
-
-      #endif
+    /* no suitable update found */
+    return NULL;
+}
 
-      ///////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////
     };// namespace detail
     /////////////////////////////////////////////////////////////////////
     /////////////////////////////////////////////////////////////////////
index 1ddca90..0462948 100644 (file)
@@ -29,7 +29,6 @@
 
 #include "zypp/solver/detail/PackagePtr.h"
 #include "zypp/solver/detail/PackageUpdatePtr.h"
-#include "zypp/solver/detail/Section.h"
 #include "zypp/solver/detail/ResItem.h"
 #include "zypp/solver/detail/XmlNode.h"
 
@@ -61,8 +60,7 @@ class Package : public ResItem {
     
       
         private:
-          Section_Ptr _section;
-          
+         
           // Filled in by package info XML
           std::string _pretty_name;
           std::string _summary;
@@ -106,10 +104,6 @@ class Package : public ResItem {
       
           // ---------------------------------- accessors
       
-          // accessor for _section
-          const Section_Ptr section() const { return _section; }
-          void setSection (const Section_Ptr section) { _section = section; }
-      
           // accessor for _pretty_name
           const std::string prettyName() const { return _pretty_name; }
           void setPrettyName(const std::string & pretty_name) { _pretty_name = pretty_name; }
diff --git a/zypp/solver/detail/Section.cc b/zypp/solver/detail/Section.cc
deleted file mode 100644 (file)
index f398142..0000000
+++ /dev/null
@@ -1,207 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-/* Section.cc
- *
- * Copyright (C) 2000-2002 Ximian, Inc.
- * Copyright (C) 2005 SUSE Linux Products GmbH
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307, USA.
- */
-
-#include <iostream>
-#include "zypp/solver/detail/Section.h"
-#include "zypp/base/Logger.h"
-
-/////////////////////////////////////////////////////////////////////////
-namespace zypp
-{ ///////////////////////////////////////////////////////////////////////
-  ///////////////////////////////////////////////////////////////////////
-  namespace solver
-  { /////////////////////////////////////////////////////////////////////
-    /////////////////////////////////////////////////////////////////////
-    namespace detail
-    { ///////////////////////////////////////////////////////////////////
-
-      using namespace std;
-
-      string
-      Section::asString ( void ) const
-      {
-          return toString (*this);
-      }
-
-
-      string
-      Section::asUserString ( void ) const
-      {
-          return toUserString (*this);
-      }
-
-
-      string
-      Section::toString ( const Section & section )
-      {
-          switch (section.section()) {
-          case SECTION_OFFICE: return ("office");
-          case SECTION_IMAGING:        return ("imaging");
-          case SECTION_PIM:            return ("pim");
-          case SECTION_GAME:           return ("game");
-          case SECTION_MISC:           return ("misc");
-          case SECTION_MULTIMEDIA:     return ("multimedia");
-          case SECTION_INTERNET:       return ("internet");
-          case SECTION_UTIL:           return ("util");
-          case SECTION_SYSTEM: return ("system");
-          case SECTION_DOC:            return ("doc");
-          case SECTION_DEVEL:          return ("devel");
-          case SECTION_DEVELUTIL:      return ("develutil");
-          case SECTION_LIBRARY:        return ("library");
-          case SECTION_XAPP:           return ("xapp");
-          default:
-             WAR << "invalid section number " << section.section() << endl;
-          }
-          return ("misc");
-      }
-
-      string
-      Section::toUserString ( const Section & section )
-      {
-          switch (section.section()) {
-          case SECTION_OFFICE: return ("Productivity Applications");
-          case SECTION_IMAGING:        return ("Imaging");
-          case SECTION_PIM:            return ("Personal Information Management");
-          case SECTION_GAME:           return ("Games");
-          case SECTION_MISC:           return ("Miscellaneous");
-          case SECTION_MULTIMEDIA:     return ("Multimedia");
-          case SECTION_INTERNET:       return ("Internet Applications");
-          case SECTION_UTIL:           return ("Utilities");
-          case SECTION_SYSTEM: return ("System Packages");
-          case SECTION_DOC:            return ("Documentation");
-          case SECTION_DEVEL:          return ("Development Packages");
-          case SECTION_DEVELUTIL:      return ("Development Utilities");
-          case SECTION_LIBRARY:        return ("Libraries");
-          case SECTION_XAPP:           return ("X Applications");
-          default:
-             WAR << "invalid section number " << section.section() << endl;
-          }
-
-          return ("Miscellaneous");
-      }
-
-      ostream &
-      Section::dumpOn( ostream & str ) const
-      {
-          str << asString();
-          return str;
-      }
-
-
-      ostream&
-      operator<<( ostream& os, const Section& section)
-      {
-          return os << section.asString();
-      }
-
-      //---------------------------------------------------------------------------
-
-      Section::Section(const char *section_str)
-      {
-          _section = SECTION_MISC;
-
-          if (section_str != NULL) {
-          switch (*section_str) {
-          case 'd':
-       if (!strcmp (section_str, "develutil")) {
-           _section = SECTION_DEVELUTIL;
-       }
-       else if (!strcmp (section_str, "devel")) {
-           _section = SECTION_DEVEL;
-       }
-       else if (!strcmp (section_str, "doc")) {
-           _section = SECTION_DOC;
-       }
-       break;
-          case 'g':
-       if (!strcmp (section_str, "game")) {
-           _section = SECTION_GAME;
-       }
-       break;
-          case 'i':
-       if (!strcmp (section_str, "imaging")) {
-           _section = SECTION_IMAGING;
-       }
-       else if (!strcmp (section_str, "internet")) {
-           _section = SECTION_INTERNET;
-       }
-       break;
-          case 'l':
-       if (!strcmp (section_str, "library")) {
-           _section = SECTION_LIBRARY;
-       }
-       break;
-          case 'm':
-       if (!strcmp (section_str, "misc")) {
-           _section = SECTION_MISC;
-       }
-       else if (!strcmp (section_str, "multimedia")) {
-           _section = SECTION_MULTIMEDIA;
-       }
-       break;
-          case 'o':
-       if (!strcmp (section_str, "office")) {
-           _section = SECTION_OFFICE;
-       }
-       break;
-          case 'p':
-       if (!strcmp (section_str, "pim")) {
-           _section = SECTION_PIM;
-       }
-       break;
-          case 's':
-       if (!strcmp (section_str, "system")) {
-           _section = SECTION_SYSTEM;
-       }
-       break;
-          case 'u':
-       if (!strcmp (section_str, "util")) {
-           _section = SECTION_UTIL;
-       }
-       break;
-          case 'x':
-       if (!strcmp (section_str, "xapp")) {
-           _section = SECTION_XAPP;
-       }
-       break;
-          default:
-             WAR << "invalid section name " << section_str << endl;
-       break;
-          }
-          } // if != NULL
-
-      }
-
-
-      Section::~Section()
-      {
-      }
-
-      ///////////////////////////////////////////////////////////////////
-    };// namespace detail
-    /////////////////////////////////////////////////////////////////////
-    /////////////////////////////////////////////////////////////////////
-  };// namespace solver
-  ///////////////////////////////////////////////////////////////////////
-  ///////////////////////////////////////////////////////////////////////
-};// namespace zypp
-/////////////////////////////////////////////////////////////////////////
-
diff --git a/zypp/solver/detail/Section.h b/zypp/solver/detail/Section.h
deleted file mode 100644 (file)
index 7eb454c..0000000
+++ /dev/null
@@ -1,113 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-/* Section.h
- *
- * Copyright (C) 2000-2002 Ximian, Inc.
- * Copyright (C) 2005 SUSE Linux Products GmbH
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307, USA.
- */
-
-#ifndef ZYPP_SOLVER_DETAIL_SECTION_H
-#define ZYPP_SOLVER_DETAIL_SECTION_H
-
-#include <iosfwd>
-#include <string>
-
-/////////////////////////////////////////////////////////////////////////
-namespace zypp
-{ ///////////////////////////////////////////////////////////////////////
-  ///////////////////////////////////////////////////////////////////////
-  namespace solver
-  { /////////////////////////////////////////////////////////////////////
-    /////////////////////////////////////////////////////////////////////
-    namespace detail
-    { ///////////////////////////////////////////////////////////////////
-
-      ///////////////////////////////////////////////////////////////////
-      //
-      //       CLASS NAME : Section
-      /**
-       *
-       **/
-      class Section {
-
-        private:
-
-          typedef enum {
-       SECTION_OFFICE = 0,
-       SECTION_IMAGING,
-       SECTION_PIM,
-       SECTION_XAPP,
-       SECTION_GAME,
-       SECTION_MULTIMEDIA,
-       SECTION_INTERNET,
-       SECTION_UTIL,
-       SECTION_SYSTEM,
-       SECTION_DOC,
-       SECTION_LIBRARY,
-       SECTION_DEVEL,
-       SECTION_DEVELUTIL,
-       SECTION_MISC,
-       SECTION_LAST
-          } section_t;
-
-          section_t _section;
-
-        private:
-          section_t section () const { return _section; }
-
-        public:
-
-          Section(const char *section_str);
-          virtual ~Section();
-
-          // ---------------------------------- I/O
-
-          static std::string toString ( const Section & section);
-          static std::string toUserString ( const Section & section);
-
-          virtual std::ostream & dumpOn( std::ostream & str ) const;
-
-          friend std::ostream& operator<<( std::ostream&, const Section & section);
-
-          std::string asString ( void ) const;
-          std::string asUserString ( void ) const;
-
-          // ---------------------------------- accessors
-
-          // equality
-          bool operator==( const Section & section) const {
-       return _section == section.section();
-          }
-
-          // inequality
-          bool operator!=( const Section & section) const {
-       return !(*this == section);
-          }
-
-      };
-
-      typedef Section * Section_Ptr;
-
-      ///////////////////////////////////////////////////////////////////
-    };// namespace detail
-    /////////////////////////////////////////////////////////////////////
-    /////////////////////////////////////////////////////////////////////
-  };// namespace solver
-  ///////////////////////////////////////////////////////////////////////
-  ///////////////////////////////////////////////////////////////////////
-};// namespace zypp
-/////////////////////////////////////////////////////////////////////////
-#endif // ZYPP_SOLVER_DETAIL_SECTION_H
index 8244545..6442bce 100644 (file)
@@ -22,7 +22,6 @@
 #include "config.h"
 #endif
 
-#include "zypp/solver/detail/Packman.h"
 #include "zypp/solver/detail/StoreWorld.h"
 #include "zypp/solver/detail/ResItemAndDependency.h"
 #include "zypp/base/Logger.h"
index f76aaf0..383e118 100644 (file)
@@ -29,7 +29,6 @@
 
 #include "zypp/solver/detail/StoreWorldPtr.h"
 #include "zypp/solver/detail/ResItemAndDependency.h"
-#include "zypp/solver/detail/PackmanPtr.h"
 #include "zypp/solver/detail/World.h"
 #include "zypp/solver/detail/ResItem.h"
 #include "zypp/solver/detail/Match.h"
@@ -61,8 +60,6 @@ class StoreWorld : public World {
     ResItemAndDependencyTable _requires_by_name;
     ResItemAndDependencyTable _conflicts_by_name;
 
-    Packman_Ptr _packman;
-
     ChannelList _channels;
 
   public:
index d7ca339..a072e78 100644 (file)
@@ -36,7 +36,6 @@
 #include "zypp/solver/detail/Channel.h"
 #include "zypp/solver/detail/Match.h"
 #include "zypp/solver/detail/Pending.h"
-#include "zypp/solver/detail/Packman.h"
 #include "zypp/solver/detail/Package.h"
 #include "zypp/solver/detail/PackageUpdate.h"
 #include "zypp/Capability.h"
@@ -72,7 +71,6 @@ namespace zypp
 
       #if 0
       typedef bool             (*WorldSyncFn)    (World_constPtr world, Channel_constPtr channel);
-      typedef Packman_Ptr      (*WorldPackmanFn) (World_constPtr world, const Resolvable::Kind & kind);
       typedef void             (*WorldSpewFn)    (World_constPtr world, FILE *out);
       typedef World_constPtr   (*WorldDupFn)     (World_constPtr world);
 
@@ -176,8 +174,6 @@ namespace zypp
           static void setGlobalWorld (MultiWorld_Ptr world);
           static MultiWorld_Ptr globalWorld (void);
 
-       //RCPackman *get_packman      (GType);
-
           bool sync (void) const;
           virtual bool syncConditional (Channel_constPtr channel) const;
           Pending_Ptr refresh (void);
index 5f2772e..54c6e7c 100644 (file)
@@ -623,7 +623,6 @@ XmlParser::packageEnd(const char *name)
         package->setPrettyName    (_current_package_prettyName);
         package->setSummary       (_current_package_summary);
         package->setDescription   (_current_package_description);
-        package->setSection       (new Section(_current_package_section.c_str()));
         package->setFileSize      (_current_package_fileSize);
         package->setInstalledSize (_current_package_installedSize);
         package->setInstallOnly   (_current_package_installOnly);
index a6bf54a..d0265da 100644 (file)
@@ -35,7 +35,6 @@
 #include "zypp/solver/detail/Package.h"
 #include "zypp/solver/detail/Match.h"
 #include "zypp/solver/detail/StoreWorldPtr.h"
-#include "zypp/solver/detail/PackmanPtr.h"
 
 /////////////////////////////////////////////////////////////////////////
 namespace zypp 
@@ -46,26 +45,28 @@ namespace zypp
     /////////////////////////////////////////////////////////////////////
     namespace detail
     { ///////////////////////////////////////////////////////////////////
-      
-      int extract_packages_from_helix_buffer (const char data[], size_t len, Channel_Ptr channel, CResItemFn callback, void *data);
-      int extract_packages_from_helix_file (const std::string & filename, Channel_Ptr channel, CResItemFn callback, void *data);
-      
-      int extract_packages_from_xml_node (XmlNode_constPtr node, Channel_Ptr channel, ResItemFn callback, void *data);
-      
-      int extract_packages_from_debian_buffer (const char *data, size_t len, Channel_Ptr channel, CResItemFn callback, void *data);
-      int extract_packages_from_debian_file (const std::string & filename, Channel_Ptr channel, CResItemFn callback, void *data);
-      
-      Package_Ptr extract_yum_package (const char *data, size_t len, Packman_Ptr packman, const std::string & url);
-      
-      int extract_packages_from_aptrpm_buffer (const char *data, size_t len, Packman_Ptr packman, Channel_Ptr channel, ResItemFn callback, void *data);
-      int extract_packages_from_aptrpm_file (const std::string & filename, Packman_Ptr packman, Channel_Ptr channel, ResItemFn callback, void *data);
-      
-      int extract_packages_from_undump_buffer (const char *data, size_t len, ChannelAndSubscribedFn channel_callback, CResItemFn package_callback, MatchFn lock_callback, void *data);
-      int extract_packages_from_undump_file (const std::string & filename, ChannelAndSubscribedFn channel_callback, CResItemFn package_callback, MatchFn lock_callback, void *data);
-      
-      int extract_packages_from_directory (const std::string & path, Channel_Ptr channel, Packman_Ptr packman, bool recursive, ResItemFn callback, void *data);
 
-      ///////////////////////////////////////////////////////////////////
+int extract_packages_from_helix_buffer (const char data[], size_t len, Channel_Ptr channel, CResItemFn callback, void *data);
+int extract_packages_from_helix_file (const std::string & filename, Channel_Ptr channel, CResItemFn callback, void *data);
+
+int extract_packages_from_undump_buffer (const char *data, size_t len, ChannelAndSubscribedFn channel_callback, CResItemFn package_callback, MatchFn lock_callback, void *data);
+int extract_packages_from_undump_file (const std::string & filename, ChannelAndSubscribedFn channel_callback, CResItemFn package_callback, MatchFn lock_callback, void *data);
+
+int extract_packages_from_xml_node (XmlNode_constPtr node, Channel_Ptr channel, ResItemFn callback, void *data);
+
+#if 0
+int extract_packages_from_debian_buffer (const char *data, size_t len, Channel_Ptr channel, CResItemFn callback, void *data);
+int extract_packages_from_debian_file (const std::string & filename, Channel_Ptr channel, CResItemFn callback, void *data);
+
+Package_Ptr extract_yum_package (const char *data, size_t len, Packman_Ptr packman, const std::string & url);
+
+int extract_packages_from_aptrpm_buffer (const char *data, size_t len, Packman_Ptr packman, Channel_Ptr channel, ResItemFn callback, void *data);
+int extract_packages_from_aptrpm_file (const std::string & filename, Packman_Ptr packman, Channel_Ptr channel, ResItemFn callback, void *data);
+
+int extract_packages_from_directory (const std::string & path, Channel_Ptr channel, Packman_Ptr packman, bool recursive, ResItemFn callback, void *data);
+#endif
+
+///////////////////////////////////////////////////////////////////
     };// namespace detail
     /////////////////////////////////////////////////////////////////////
     /////////////////////////////////////////////////////////////////////