Author: dmacvicar Date: Wed Jul 11 13:22:11 2007 New Revision: 5965 URL: http://svn.opensuse.org/viewcvs/zypp?rev=5965&view=rev Log: inconsistent rel Modified: branches/REFACTORING-10_3/libzypp/zypp/repo/cached/RepoImpl.cc Modified: branches/REFACTORING-10_3/libzypp/zypp/repo/cached/RepoImpl.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/REFACTORING-10_3/libzypp/zypp/repo/cached/RepoImpl.cc?rev=5965&r1=5964&r2=5965&view=diff ============================================================================== --- branches/REFACTORING-10_3/libzypp/zypp/repo/cached/RepoImpl.cc (original) +++ branches/REFACTORING-10_3/libzypp/zypp/repo/cached/RepoImpl.cc Wed Jul 11 13:22:11 2007 @@ -416,8 +416,8 @@ Resolvable::Kind refer = _type_cache.kindFor(reader.getint(0)); - Rel rel = _type_cache.relationFor(reader.getint(2)); - capability::HalCap *hcap = new capability::HalCap( refer, reader.getstring(1), rel, reader.getstring(3) ); + Rel rel = _type_cache.relationFor(reader.getint(3)); + capability::HalCap *hcap = new capability::HalCap( refer, reader.getstring(1), rel, reader.getstring(2) ); zypp::Dep deptype = _type_cache.deptypeFor(reader.getint(4)); data::RecordId rid = reader.getint64(5); nvras[rid].second[deptype].insert( capfactory.fromImpl( capability::CapabilityImpl::Ptr(hcap) ) ); @@ -429,18 +429,39 @@ sqlite3_reader reader = select_modalias_cmd.executereader(); while ( reader.read() ) { - //select hc.refers_kind, hc.name, hc.value, hc.relation, hc.dependency_type, hc.resolvable_id from hal_capabilities hc - + + //select mc.refers_kind, mc.name, mc.value, mc.relation, mc.dependency_type, mc.resolvable_id from modalias_capabilities mc; Resolvable::Kind refer = _type_cache.kindFor(reader.getint(0)); - Rel rel = _type_cache.relationFor(reader.getint(2)); - capability::ModaliasCap *mcap = new capability::ModaliasCap( refer, reader.getstring(1), rel, reader.getstring(3) ); + Rel rel = _type_cache.relationFor(reader.getint(3)); + capability::ModaliasCap *mcap = new capability::ModaliasCap( refer, reader.getstring(1), rel, reader.getstring(2) ); zypp::Dep deptype = _type_cache.deptypeFor(reader.getint(4)); data::RecordId rid = reader.getint64(5); nvras[rid].second[deptype].insert( capfactory.fromImpl( capability::CapabilityImpl::Ptr(mcap) ) ); } } + { + debug::Measure mnf("read other capabilities"); + sqlite3_reader reader = select_other_cmd.executereader(); + while ( reader.read() ) + { + //select oc.refers_kind, oc.value, oc.dependency_type, oc.resolvable_id from other_capabilities oc; + + Resolvable::Kind refer = _type_cache.kindFor(reader.getint(0)); + capability::CapabilityImpl::Ptr cap = capability::parse( refer, reader.getstring(1)); + + if ( !cap ) + { + ERR << "Invalid capability " << reader.getstring(1) << endl; + } + + zypp::Dep deptype = _type_cache.deptypeFor(reader.getint(2)); + data::RecordId rid = reader.getint64(3); + nvras[rid].second[deptype].insert( capfactory.fromImpl(cap) ); + } + } + MIL << nvras.size() << " capabilities" << endl; } -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org