Author: dmacvicar Date: Fri Sep 12 15:12:33 2008 New Revision: 11039 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11039&view=rev Log: start to parse missing urls (blocker :-( ) Modified: trunk/sat-solver/src/knownid.h trunk/sat-solver/tools/repo_products.c Modified: trunk/sat-solver/src/knownid.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/knownid.h?rev=11039&r1=11038&r2=11039&view=diff ============================================================================== --- trunk/sat-solver/src/knownid.h (original) +++ trunk/sat-solver/src/knownid.h Fri Sep 12 15:12:33 2008 @@ -150,10 +150,12 @@ KNOWNID(PRODUCT_DISTPRODUCT, "product:distproduct"), KNOWNID(PRODUCT_DISTVERSION, "product:distversion"), KNOWNID(PRODUCT_TYPE, "product:type"), -KNOWNID(PRODUCT_RELNOTESURL, "product:relnotesurl"), -KNOWNID(PRODUCT_UPDATEURLS, "product:updateurls"), -KNOWNID(PRODUCT_EXTRAURLS, "product:extraurls"), -KNOWNID(PRODUCT_OPTIONALURLS, "product:optionalurls"), +KNOWNID(PRODUCT_URL, "product:url"), +KNOWNID(PRODUCT_URL_TYPE, "product:url:type"), +KNOWNID(PRODUCT_URL_TYPE_SMOLT, "product:url:type:smolt"), +KNOWNID(PRODUCT_URL_TYPE_RELNOTES, "product:url:type:relnotes"), +KNOWNID(PRODUCT_URL_TYPE_EXTRA, "product:url:type:extra"), +KNOWNID(PRODUCT_URL_TYPE_OPTIONAL, "product:url:type:optional"), KNOWNID(PRODUCT_FLAGS, "product:flags"), KNOWNID(PRODUCT_FLAVOR, "product:flavor"), KNOWNID(PRODUCT_REFERENCES, "product:references"), Modified: trunk/sat-solver/tools/repo_products.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/repo_products.c?rev=11039&r1=11038&r2=11039&view=diff ============================================================================== --- trunk/sat-solver/tools/repo_products.c (original) +++ trunk/sat-solver/tools/repo_products.c Fri Sep 12 15:12:33 2008 @@ -115,12 +115,12 @@ struct stateswitch *swtab[NUMSTATES]; enum state sbtab[NUMSTATES]; - const char *attribute; /* only print this attribute, if currentproduct == baseproduct */ const char *tmplang; const char *tmpvers; const char *tmprel; + const char *tmpurltype; Solvable *s; Id handle; @@ -237,6 +237,9 @@ case STATE_DESCRIPTION: pd->tmplang = find_attr("lang", atts, 1); break; + case STATE_URL: + pd->tmpurltype = find_attr("name", atts, 1); + break; default: break; } @@ -300,6 +303,13 @@ pd->tmplang = 0; } break; + case STATE_URL: + if (pd->tmpurltype) + { + repodata_add_poolstr_array(pd->data, pd->handle, PRODUCT_URL, pd->content); + repodata_add_poolstr_array(pd->data, pd->handle, PRODUCT_URL_TYPE, pd->content); + } + break; case STATE_TARGET: if (currentproduct == baseproduct && pd->attribute -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org