Author: jreidinger Date: Tue May 6 16:19:37 2008 New Revision: 9958 URL: http://svn.opensuse.org/viewcvs/zypp?rev=9958&view=rev Log: change names in locks serialize to more human friendly Modified: trunk/libzypp/tests/zypp/data/Locks/locks trunk/libzypp/tests/zypp/data/PoolQuery/savedqueries trunk/libzypp/zypp/PoolQuery.cc Modified: trunk/libzypp/tests/zypp/data/Locks/locks URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/zypp/data/Locks/locks?rev=9958&r1=9957&r2=9958&view=diff ============================================================================== --- trunk/libzypp/tests/zypp/data/Locks/locks (original) +++ trunk/libzypp/tests/zypp/data/Locks/locks Tue May 6 16:19:37 2008 @@ -1 +1 @@ -global_string: zypper +query_string: zypper Modified: trunk/libzypp/tests/zypp/data/PoolQuery/savedqueries URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/zypp/data/PoolQuery/savedqueries?rev=9958&r1=9957&r2=9958&view=diff ============================================================================== --- trunk/libzypp/tests/zypp/data/PoolQuery/savedqueries (original) +++ trunk/libzypp/tests/zypp/data/PoolQuery/savedqueries Tue May 6 16:19:37 2008 @@ -2,10 +2,10 @@ repo: factory-nonoss repo: zypp_svn -global_string: ma* +query_string: ma* repo: factory -kind: patch -string_type: regex +type: patch +match_type: regex require_all: on case_sensitive: on install_status: not-installed Modified: trunk/libzypp/zypp/PoolQuery.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/PoolQuery.cc?rev=9958&r1=9957&r2=9958&view=diff ============================================================================== --- trunk/libzypp/zypp/PoolQuery.cc (original) +++ trunk/libzypp/zypp/PoolQuery.cc Tue May 6 16:19:37 2008 @@ -928,9 +928,9 @@ const PoolQueryAttr PoolQueryAttr::noAttr; const PoolQueryAttr PoolQueryAttr::repoAttr( "repo" ); - const PoolQueryAttr PoolQueryAttr::kindAttr( "kind" ); - const PoolQueryAttr PoolQueryAttr::stringAttr( "global_string" ); - const PoolQueryAttr PoolQueryAttr::stringTypeAttr("string_type"); + const PoolQueryAttr PoolQueryAttr::kindAttr( "type" ); + const PoolQueryAttr PoolQueryAttr::stringAttr( "query_string" ); + const PoolQueryAttr PoolQueryAttr::stringTypeAttr("match_type"); const PoolQueryAttr PoolQueryAttr::requireAllAttr("require_all"); const PoolQueryAttr PoolQueryAttr::caseSensitiveAttr("case_sensitive"); const PoolQueryAttr PoolQueryAttr::installStatusAttr("install_status"); @@ -1126,7 +1126,8 @@ for_( it, kinds().begin(), kinds().end() ) { - str << "kind: " << it->idStr() << delim ; + str << PoolQueryAttr::kindAttr.asString() << ": " + << it->idStr() << delim ; } if (matchType()!=q.matchType()) @@ -1134,16 +1135,17 @@ switch( matchType() ) { case SEARCH_STRING: - str << "string_type: exact" << delim; + str << PoolQueryAttr::stringTypeAttr.asString() << ": exact" << delim; break; case SEARCH_SUBSTRING: - str << "string_type: substring" << delim; + str << PoolQueryAttr::stringTypeAttr.asString() + << ": substring" << delim; break; case SEARCH_GLOB: - str << "string_type: glob" << delim; + str << PoolQueryAttr::stringTypeAttr.asString() << ": glob" << delim; break; case SEARCH_REGEX: - str << "string_type: regex" << delim; + str << PoolQueryAttr::stringTypeAttr.asString() << ": regex" << delim; break; default: WAR << "unknown match type " << matchType() << endl; @@ -1194,7 +1196,7 @@ for_( it, strings().begin(), strings().end() ) { - str << "global_string: " << *it << delim; + str << PoolQueryAttr::stringAttr.asString()<< ": " << *it << delim; } for_( it, attributes().begin(), attributes().end() ) -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org