Author: kkaempf Date: Mon Oct 20 15:02:57 2008 New Revision: 11405 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11405&view=rev Log: adapt to changed dataiterator API Modified: trunk/sat-solver/bindings/dataiterator.i trunk/sat-solver/bindings/solvable.i Modified: trunk/sat-solver/bindings/dataiterator.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/dataiterator.i?rev=11405&r1=11404&r2=11405&view=diff ============================================================================== --- trunk/sat-solver/bindings/dataiterator.i (original) +++ trunk/sat-solver/bindings/dataiterator.i Mon Oct 20 15:02:57 2008 @@ -13,11 +13,12 @@ %constant int SEARCH_SUBSTRING = SEARCH_SUBSTRING; %constant int SEARCH_GLOB = SEARCH_GLOB; %constant int SEARCH_REGEX = SEARCH_REGEX; + %constant int SEARCH_ERROR = SEARCH_ERROR; %constant int SEARCH_NOCASE = SEARCH_NOCASE; %constant int SEARCH_NO_STORAGE_SOLVABLE = SEARCH_NO_STORAGE_SOLVABLE; %constant int SEARCH_SUB = SEARCH_SUB; - %constant int SEARCH_ALL_REPOS = SEARCH_ALL_REPOS; + %constant int SEARCH_ARRAYSENTINEL = SEARCH_ARRAYSENTINEL; %constant int SEARCH_SKIP_KIND = SEARCH_SKIP_KIND; /* By default we don't match in attributes representing filelists @@ -35,7 +36,7 @@ Dataiterator *di = calloc(1, sizeof( Dataiterator )); Solvable *s = 0; if (xs) s = xsolvable_solvable(xs); - dataiterator_init(di, repo, s ? s - repo->pool->solvables : 0, keyname ? str2id(repo->pool, keyname, 0) : 0, match, option); + dataiterator_init(di, repo->pool, repo, s ? s - repo->pool->solvables : 0, keyname ? str2id(repo->pool, keyname, 0) : 0, match, option); return di; } @@ -43,7 +44,7 @@ XSolvable *solvable() { - return xsolvable_new( $self->repo->pool, self->solvid ); + return xsolvable_new( $self->repo->pool, $self->solvid ); } /* @@ -101,7 +102,7 @@ void jump_to_solvable(XSolvable *xs) { - dataiterator_jump_to_solvable($self, xsolvable_solvable(xs)); + dataiterator_jump_to_solvid($self, xs->id); } void jump_to_repo(Repo *repo) Modified: trunk/sat-solver/bindings/solvable.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/solvable.i?rev=11405&r1=11404&r2=11405&view=diff ============================================================================== --- trunk/sat-solver/bindings/solvable.i (original) +++ trunk/sat-solver/bindings/solvable.i Mon Oct 20 15:02:57 2008 @@ -179,7 +179,7 @@ Solvable *s = xsolvable_solvable($self); Dataiterator di; - dataiterator_init(&di, s->repo, $self->id, key, 0, SEARCH_NO_STORAGE_SOLVABLE); + dataiterator_init(&di, s->repo->pool, s->repo, $self->id, key, 0, SEARCH_NO_STORAGE_SOLVABLE); if (dataiterator_step(&di)) { result = dataiterator_value( &di ); @@ -203,7 +203,7 @@ { Solvable *s = xsolvable_solvable($self); Dataiterator di; - dataiterator_init(&di, s->repo, $self->id, 0, 0, SEARCH_NO_STORAGE_SOLVABLE); + dataiterator_init(&di, s->repo->pool, s->repo, $self->id, 0, 0, SEARCH_NO_STORAGE_SOLVABLE); VALUE value; while (dataiterator_step(&di)) { @@ -259,7 +259,7 @@ if (key != ID_NULL) { Solvable *s = xsolvable_solvable($self); Dataiterator di; - dataiterator_init(&di, s->repo, $self->id, key, 0, SEARCH_NO_STORAGE_SOLVABLE); + dataiterator_init(&di, s->repo->pool, s->repo, $self->id, key, 0, SEARCH_NO_STORAGE_SOLVABLE); if (dataiterator_step(&di)) result = Swig_True; } -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org