April 2008 - Zypp Development - openSUSE Mailing Lists

[zypp-devel] using PoolQuery in UIs
by Jan Kupec 10 Apr '08

10 Apr '08

Duncan Mac-Vicar Prett wrote: > Jan Kupec wrote: >> <nice-to-have> >> Duncan do you think you could make use of the PoolQuery (selectable >> iterator) in the Qt package selector? I certainly want to use it in >> zypper (search showing selectables by default). The could should be much >> cleaner using it. >> </nice-to-have> >> >> Cheers, >> >> jano >> > I could look into it, can you point me how to use it? See zypp/PoolQuery_test.cc for how to set up various queries. Once set up, you just iterate using selectable{Begin,End}(). Typically you do: PoolQuery q; q.addString("zypper"); q.addAttribute(sat::SolvAttr::name); if (search_in_descriptions) { q.addAttribute(sat::SolvAttr::summary); q.addAttribute(sat::SolvAttr::description); } if (use_globs) q.setMatchGlob(); // etc.... for (PoolQuery::Selectable_iterator it = q.selectableBegin(); it != q.selectableEnd(); ++it) { Selectable::Ptr s = *it; } q.begin() q.end() returns solvables; the SolvIterMixin makes also q.poolItem{Begin,End} available IIRC. If you'll need some convenience methods, or the perfomance is bad or what, just tell me. Just bear in mind it currently returns one selectable for each solvable, this needs to be fixed yet. CCing zypp-devel just in case someone finds the info useful. j. -- To unsubscribe, e-mail: zypp-devel+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-devel+help(a)opensuse.org

1 0

[zypp-devel] Re: [zypp-commit] r9486 - in /trunk/libzypp/zypp: Patch.cc Patch.h
by Klaus Kaempf 09 Apr '08

09 Apr '08

* dmacvicar(a)svn.opensuse.org <dmacvicar(a)svn.opensuse.org> [Apr 09. 2008 16:41]: > Author: dmacvicar > Date: Wed Apr 9 16:41:27 2008 > New Revision: 9486 > > URL: http://svn.opensuse.org/viewcvs/zypp?rev=9486&view=rev > Log: > API for retrieving bugzilla and security references using a nice iterator (thanks > Michael for the tips) > > The implementation needs to fix the attribute names svn rev 9487 of sat-solver provides the missing attribute names in knownid.h Klaus --- SUSE LINUX Products GmbH, GF: Markus Rex, HRB 16746 (AG Nürnberg) -- To unsubscribe, e-mail: zypp-devel+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-devel+help(a)opensuse.org

1 0

[zypp-devel] Regexes in Dataiterator and PoolQuery (Re: [zypp-commit] r9481 - in /trunk/sat-solver/src: repo.h repodata.c)
by Jan Kupec 09 Apr '08

09 Apr '08

Hi, i enabled regex matching in sat-solver's Dataiterator. One thing that puzzles me is how to report regex compilation error to the library user (both sat-solver and libzypp): Currently i do the following: - Dataiterator.regex_err holds return value of regcomp() - libzypp chceck this value if want's to use regexes and throws an exception if regex_err is not zero. This happens in PoolQuery::ResultIterator::begin() My questions: - shouldn't dataiterator_init return int (0 on success, non-zero in error)? - should PoolQuery::ResultIterator::begin() ever throw? shouldn't it just log the incident and return end()? Cheers, jano jkupec(a)svn.opensuse.org wrote: > Author: jkupec > Date: Wed Apr 9 16:09:26 2008 > New Revision: 9481 > > URL: http://svn.opensuse.org/viewcvs/zypp?rev=9481&view=rev > Log: > - enable regex matching in Dataiterator > > Modified: > trunk/sat-solver/src/repo.h > trunk/sat-solver/src/repodata.c > > Modified: trunk/sat-solver/src/repo.h > URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/repo.h?rev=9481&r… > ============================================================================== > --- trunk/sat-solver/src/repo.h (original) > +++ trunk/sat-solver/src/repo.h Wed Apr 9 16:09:26 2008 > @@ -13,6 +13,8 @@ > #ifndef SATSOLVER_REPO_H > #define SATSOLVER_REPO_H > > +#include <regex.h> > + > #include "pooltypes.h" > #include "pool.h" > #if 0 > @@ -188,6 +190,8 @@ > unsigned flags; > unsigned state; > KeyValue kv; > + regex_t regex; > + int regex_err; > } Dataiterator; > > /* Use these like: > > Modified: trunk/sat-solver/src/repodata.c > URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/repodata.c?rev=94… > ============================================================================== > --- trunk/sat-solver/src/repodata.c (original) > +++ trunk/sat-solver/src/repodata.c Wed Apr 9 16:09:26 2008 > @@ -667,7 +667,35 @@ > di->data = repo->repodata + repo->nrepodata - 1; > di->state = 0; > } > + > di->match = match; > + if ((di->flags & SEARCH_STRINGMASK) == SEARCH_REGEX) > + { > + if (di->match) > + { > + /* We feed multiple lines eventually (e.g. authors or descriptions), > + so set REG_NEWLINE. */ > + di->regex_err = > + regcomp(&di->regex, di->match, > + REG_EXTENDED | REG_NOSUB | REG_NEWLINE > + | ((di->flags & SEARCH_NOCASE) ? REG_ICASE : 0)); > +#if 0 > + if (di->regex_err != 0) > + { > + fprintf(stderr, "Given regex failed to compile: %s\n", di->match); > + fprintf(stderr, "regcomp error code: %d\n", di->regex_err); > + exit(1); > + } > +#else > + } > + else > + { > + di->flags |= (di->flags & SEARCH_STRINGMASK) | SEARCH_STRING; > + di->regex_err = 0; > +#endif > + } > + } > + > di->keyname = keyname; > static Id zeroid = 0; > di->keyp = &zeroid; > @@ -728,11 +756,10 @@ > if (fnmatch(match, kv->str, (flags & SEARCH_NOCASE) ? FNM_CASEFOLD : 0)) > return 0; > break; > -#if 0 > case SEARCH_REGEX: > if (regexec((const regex_t *)vmatch, kv->str, 0, NULL, 0)) > return 0; > -#endif > + break; > default: > return 0; > } > @@ -743,7 +770,10 @@ > static int > dataiterator_match_int(Dataiterator *di) > { > - return dataiterator_match_int_real(di, di->flags, di->match); > + if ((di->flags & SEARCH_STRINGMASK) == SEARCH_REGEX) > + return dataiterator_match_int_real(di, di->flags, &di->regex); > + else > + return dataiterator_match_int_real(di, di->flags, di->match); > } > > int > -- To unsubscribe, e-mail: zypp-devel+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-devel+help(a)opensuse.org

2 1

[zypp-devel] libzypp architecture
by Rajasekharam Naidu Pujala 08 Apr '08

08 Apr '08

In order to consider the mirror fail over, I am trying to modify the current working approach of libzypp, under Google Summer of Code Project. Dr. Peter Poeml is going to be my mentor in this project. I want the information about the architecture (or levels in the implementation) of libzypp. Please help me in this regard and let me know the point of contact. -- To unsubscribe, e-mail: zypp-devel+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-devel+help(a)opensuse.org

1 0

[zypp-devel] Documenting the attribute store (aka repodata)
by Klaus Kaempf 08 Apr '08

08 Apr '08

All you sat-solver developers, please have a look at sat-solver/doc/README.attr which tries to document the attribute store (well, at least start with some docs). Additions / Corrections welcome. By svn commit, not by mail ;-) Klaus -- To unsubscribe, e-mail: zypp-devel+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-devel+help(a)opensuse.org

1 0

[zypp-devel] Re: [zypp-commit] r9426 - /trunk/sat-solver/tools/repo_patchxml.c
by Michael Matz 07 Apr '08

07 Apr '08

Hi Klaus, On Mon, 7 Apr 2008, kkaempf(a)svn.opensuse.org wrote: > Author: kkaempf > Date: Mon Apr 7 16:11:23 2008 > New Revision: 9426 > > URL: http://svn.opensuse.org/viewcvs/zypp?rev=9426&view=rev > Log: > parse <package-manager/> to 'update:restart' attribute > > Modified: > trunk/sat-solver/tools/repo_patchxml.c > > @@ -81,6 +82,7 @@ > { STATE_PATCH, "description", STATE_DESCRIPTION, 1 }, > { STATE_PATCH, "category", STATE_CATEGORY, 1 }, > { STATE_PATCH, "reboot-needed", STATE_REBOOT, 0 }, > + { STATE_PATCH, "package-manager", STATE_RESTART, 0 }, You don't parse the content of this tag here (which makes sense as you mentioned "<package-manager/>", i.e. a content-less tag) ... > { STATE_PATCH, "rpm:requires", STATE_REQUIRES, 0 }, > { STATE_PATCH, "rpm:provides", STATE_PROVIDES, 0 }, > { STATE_PATCH, "rpm:requires", STATE_REQUIRES, 0 }, > @@ -579,6 +581,9 @@ > case STATE_REBOOT: > repodata_set_str(pd->data, pd->datanum, UPDATE_REBOOT, pd->content); > break; > + case STATE_RESTART: > + repodata_set_str(pd->data, pd->datanum, UPDATE_RESTART, pd->content); > + break; ... but this means that pd->content will be empty, of course. Which means it doesn't make sense to store this attribute as a string. It seems the mere existence of it has significance. If that is the case then please use repodata_set_void(). It's the same for the other attributes you recently added. Ciao, Michael. -- To unsubscribe, e-mail: zypp-devel+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-devel+help(a)opensuse.org

2 2

[zypp-devel] some zypp strings need polishing?
by Jan Kupec 07 Apr '08

07 Apr '08

Just brought to my attention http://lists.opensuse.org/opensuse-translation/2008-04/msg00025.html -- To unsubscribe, e-mail: zypp-devel+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-devel+help(a)opensuse.org

2 1

[zypp-devel] PoolQuery
by Jan Kupec 07 Apr '08

07 Apr '08

Hi, i committed a version of PoolQuery that currently supports basic queries like: PoolQuery q; q.addString("zypper"); q.addAttribute(sat::SolvAttr::name); for_each(q.begin(), q.end(), do_something_wih_solvables); see PoolQuery_test testsuite for more examples The query string can be set globally with addString(string) and per-attribute with addAttribute(attr, string). If you use addAttribute(attr) without the query string, you are supposed to use at least one addString() to add a global query string (otherwise you did not set any condition for the attribute). To sum it up: Curretnly supported and tested: * zero or one search string for each attribute * zero, one or multiple attributes (== condition only) A solvable matches if ANY of the attributes matches do we also want ALL condition? * ALL or one repository * case-(in)sensitive search, exact value search (need test cases for these) Not tested/planned (starting with the highest priority): * drop non-matching kinds (or move this to the sat solver) (easy) * support regexes (incl. wildcards) * add addAttribute(SolvAttr, string, Rel) to enable >,<,>=,<= conditions. (probably harder) * enable addDep() (shouldn't be hard) * multiple search strings (will use regex to comine them). * different values for different attributes * multiple repositories * enable setMatchWord() (should be easy once regexes are working) ---- * somewhere in between - beautify & optimize & make the code politically correct * one special high-priority task: an adapter to PoolQuery which would return Selectables (ui::SelectablePoolQuery perhaps). Help with advices/patches appreciated. Cheers, jano -- To unsubscribe, e-mail: zypp-devel+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-devel+help(a)opensuse.org

2 2

[zypp-devel] Re: [zypp-commit] r9405 - in /trunk/libzypp/zypp/sat: SolvAttr.cc SolvAttr.h
by Duncan Mac-Vicar P. 07 Apr '08

07 Apr '08

Do we need this? I thought name was not an attribute. jkupec(a)svn.opensuse.org wrote: > Author: jkupec > Date: Sat Apr 5 11:11:18 2008 > New Revision: 9405 > > URL: http://svn.opensuse.org/viewcvs/zypp?rev=9405&view=rev > Log: > - solvable name added > > Modified: > trunk/libzypp/zypp/sat/SolvAttr.cc > trunk/libzypp/zypp/sat/SolvAttr.h > > Modified: trunk/libzypp/zypp/sat/SolvAttr.cc > URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/sat/SolvAttr.cc?rev… > ============================================================================== > --- trunk/libzypp/zypp/sat/SolvAttr.cc (original) > +++ trunk/libzypp/zypp/sat/SolvAttr.cc Sat Apr 5 11:11:18 2008 > @@ -33,6 +33,7 @@ > #warning STILL ATTRIBUTES HERE WHICH ARE NOT PROVIDED BY SOLV FILES > // At least the ones that do nat have a satsolver/knownid. > > + const SolvAttr SolvAttr::name ( SOLVABLE_NAME ); > const SolvAttr SolvAttr::summary ( SOLVABLE_SUMMARY ); // translated > const SolvAttr SolvAttr::description ( SOLVABLE_DESCRIPTION ); // translated > const SolvAttr SolvAttr::insnotify ( SOLVABLE_MESSAGEINS ); // translated > > Modified: trunk/libzypp/zypp/sat/SolvAttr.h > URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/sat/SolvAttr.h?rev=… > ============================================================================== > --- trunk/libzypp/zypp/sat/SolvAttr.h (original) > +++ trunk/libzypp/zypp/sat/SolvAttr.h Sat Apr 5 11:11:18 2008 > @@ -41,6 +41,7 @@ > /** Value representing \c noAttr (<tt>""</tt>)*/ > static const SolvAttr noAttr; > > + static const SolvAttr name; > static const SolvAttr summary; > static const SolvAttr description; > static const SolvAttr insnotify; > > -- To unsubscribe, e-mail: zypp-devel+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-devel+help(a)opensuse.org

3 2

[zypp-devel] I'm in prague
by Michael Matz 06 Apr '08

06 Apr '08

Hi guys, I'll be in Prague from Monday afternoon to Wednesday afternoon/evening. In case anyone wants to meet me, I'll be hanging around in the office :) Ciao, Michael. -- To unsubscribe, e-mail: zypp-devel+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-devel+help(a)opensuse.org

1 0