Author: matz Date: Sun Nov 25 11:00:54 2007 New Revision: 7915 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7915&view=rev Log: Use str2id by hand for some of the editions in our XML store. Modified: branches/use-solv/libzypp/zypp/target/store/XMLFilesBackend.cc Modified: branches/use-solv/libzypp/zypp/target/store/XMLFilesBackend.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/use-solv/libzypp/zypp/target/store/XMLFilesBackend.cc?rev=7915&r1=7914&r2=7915&view=diff ============================================================================== --- branches/use-solv/libzypp/zypp/target/store/XMLFilesBackend.cc (original) +++ branches/use-solv/libzypp/zypp/target/store/XMLFilesBackend.cc Sun Nov 25 11:00:54 2007 @@ -62,6 +62,7 @@ /////////////////////////////////////////////////////////////////// namespace zypp { ///////////////////////////////////////////////////////////////// +extern Pool *the_pool; namespace storage { ///////////////////////////////////////////////////////////////// @@ -796,7 +797,7 @@ NVRAD dataCollect( parsed.name, //Edition( parsed.ver, parsed.rel, parsed.epoch ), // XXX - Edition( ), + Edition( str2id (the_pool, parsed.ver.c_str(), 1)), arch, createDependencies(parsed, ResTraits<Patch>::kind) ); Patch::Ptr patch = detail::makeResolvableFromImpl( dataCollect, impl ); @@ -872,7 +873,7 @@ // Collect basic Resolvable data //NVRAD dataCollect( parsed.name, Edition( parsed.ver, parsed.rel, parsed.epoch ), arch, createDependencies(parsed, ResTraits<Atom>::kind) ); // XXX - NVRAD dataCollect( parsed.name, Edition( ), arch, createDependencies(parsed, ResTraits<Atom>::kind) ); + NVRAD dataCollect( parsed.name, Edition(str2id (the_pool, parsed.ver.c_str(), 1) ), arch, createDependencies(parsed, ResTraits<Atom>::kind) ); impl->_summary = parsed.summary; impl->_description = parsed.summary; @@ -928,7 +929,7 @@ // Collect basic Resolvable data //NVRAD dataCollect( parsed.name, Edition( parsed.ver, parsed.rel, parsed.epoch ), arch, createDependencies(parsed, ResTraits<Message>::kind) ); // XXX - NVRAD dataCollect( parsed.name, Edition( ), arch, createDependencies(parsed, ResTraits<Message>::kind) ); + NVRAD dataCollect( parsed.name, Edition(str2id (the_pool, parsed.ver.c_str(), 1) ), arch, createDependencies(parsed, ResTraits<Message>::kind) ); Message::Ptr message = detail::makeResolvableFromImpl( dataCollect, impl); return message; } @@ -972,7 +973,7 @@ // Collect basic Resolvable data //NVRAD dataCollect( parsed.name, Edition( parsed.ver, parsed.rel, parsed.epoch ), arch, createDependencies(parsed, ResTraits<Script>::kind)); // XXX - NVRAD dataCollect( parsed.name, Edition( ), arch, createDependencies(parsed, ResTraits<Script>::kind)); + NVRAD dataCollect( parsed.name, Edition(str2id (the_pool, parsed.ver.c_str(), 1) ), arch, createDependencies(parsed, ResTraits<Script>::kind)); Script::Ptr script = detail::makeResolvableFromImpl( dataCollect, impl ); return script; } @@ -1018,7 +1019,7 @@ //Edition parser_edition = ( parsed.parser_version.empty() ? Edition::noedition : Edition(parsed.parser_version) ); // XXX - Edition parser_edition = ( parsed.parser_version.empty() ? Edition::noedition : Edition() ); + Edition parser_edition = ( parsed.parser_version.empty() ? Edition::noedition : Edition(str2id (the_pool, parsed.parser_version.c_str(), 1)) ); impl->_summary = parsed.summary; impl->_description = parsed.summary; @@ -1038,7 +1039,7 @@ impl->_dist_name = parsed.dist_name; //impl->_dist_version = parsed.dist_version; // XXX _dist_version is Edition, parsed.dist_version is string - impl->_dist_version = Edition(); + impl->_dist_version = Edition(str2id (the_pool, parsed.dist_version.c_str(), 1)); if ( parsed.releasenotesurl.size() > 0 ) impl->_release_notes_url = parsed.releasenotesurl; @@ -1107,7 +1108,7 @@ //Edition prod_edition( parsed.ver, parsed.rel, parsed.epoch ); // XXX - Edition prod_edition; + Edition prod_edition(str2id (the_pool, parsed.ver.c_str(), 1)); string prod_name(parsed.name); // check for product name to see if it was written with distname // as name as part of https://bugzilla.novell.com/show_bug.cgi?id=205392 @@ -1131,13 +1132,13 @@ prod_name = string(all_products->product_name); //prod_edition = Edition(all_products->product_version); // XXX - prod_edition = Edition(); + prod_edition = Edition(str2id (the_pool, all_products->product_version, 1)); // those were already set, so reset them. impl->_dist_name = all_products->dist_name; //impl->_dist_version = Edition(all_products->dist_version); // XXX - impl->_dist_version = Edition(); + impl->_dist_version = Edition(str2id (the_pool, all_products->dist_version, 1)); // ok, now mark for save this product and delete the old one deleteFileObject( wrong_product ); @@ -1215,7 +1216,7 @@ // Collect basic Resolvable data //NVRAD dataCollect( parsed.name, Edition( parsed.ver, parsed.rel, parsed.epoch ), arch, createDependencies( parsed, ResTraits<Pattern>::kind)); // XXX - NVRAD dataCollect( parsed.name, Edition( ), arch, createDependencies( parsed, ResTraits<Pattern>::kind)); + NVRAD dataCollect( parsed.name, Edition(str2id (the_pool, parsed.ver.c_str(), 1) ), arch, createDependencies( parsed, ResTraits<Pattern>::kind)); Pattern::Ptr pattern = detail::makeResolvableFromImpl( dataCollect, impl ); return pattern; } @@ -1261,7 +1262,7 @@ // Collect basic Resolvable data //NVRAD dataCollect( parsed.name, Edition( parsed.ver, parsed.rel, parsed.epoch ), arch, createDependencies( parsed, ResTraits<Pattern>::kind)); // XXX - NVRAD dataCollect( parsed.name, Edition( ), arch, createDependencies( parsed, ResTraits<Pattern>::kind)); + NVRAD dataCollect( parsed.name, Edition(str2id (the_pool, parsed.ver.c_str(), 1) ), arch, createDependencies( parsed, ResTraits<Pattern>::kind)); Selection::Ptr selection = detail::makeResolvableFromImpl( dataCollect, impl ); return selection; } -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org