Author: dmacvicar Date: Wed May 30 21:44:19 2007 New Revision: 5649 URL: http://svn.opensuse.org/viewcvs/zypp?rev=5649&view=rev Log: - get rid of tagfile ParseException and make it a toplevel ParseException - Rename some reundant name classes - Fix code to pass testcases, and fix the tests Added: trunk/libzypp/zypp/parser/ParseException.cc trunk/libzypp/zypp/parser/ParseException.h trunk/libzypp/zypp2/repository/cached/PackageImpl.cc - copied, changed from r5648, trunk/libzypp/zypp2/repository/cached/CachedRepositoryPackageImpl.cc trunk/libzypp/zypp2/repository/cached/PackageImpl.h - copied, changed from r5648, trunk/libzypp/zypp2/repository/cached/CachedRepositoryPackageImpl.h trunk/libzypp/zypp2/repository/cached/RepoImpl.cc - copied, changed from r5648, trunk/libzypp/zypp2/repository/cached/CachedRepositoryImpl.cc trunk/libzypp/zypp2/repository/cached/RepoImpl.h - copied, changed from r5648, trunk/libzypp/zypp2/repository/cached/CachedRepositoryImpl.h trunk/libzypp/zypp2/repository/cached/SrcPackageImpl.cc - copied, changed from r5648, trunk/libzypp/zypp2/repository/cached/CachedSourcePackageImpl.cc trunk/libzypp/zypp2/repository/cached/SrcPackageImpl.h - copied, changed from r5648, trunk/libzypp/zypp2/repository/cached/CachedSourcePackageImpl.h Removed: trunk/libzypp/zypp/parser/tagfile/ParseException.cc trunk/libzypp/zypp/parser/tagfile/ParseException.h trunk/libzypp/zypp2/repository/cached/CachedRepositoryImpl.cc trunk/libzypp/zypp2/repository/cached/CachedRepositoryImpl.h trunk/libzypp/zypp2/repository/cached/CachedRepositoryPackageImpl.cc trunk/libzypp/zypp2/repository/cached/CachedRepositoryPackageImpl.h trunk/libzypp/zypp2/repository/cached/CachedSourceImpl.cc trunk/libzypp/zypp2/repository/cached/CachedSourceImpl.h trunk/libzypp/zypp2/repository/cached/CachedSourcePackageImpl.cc trunk/libzypp/zypp2/repository/cached/CachedSourcePackageImpl.h Modified: trunk/libzypp/tests/cache/CacheInitializer_test.cc trunk/libzypp/tests/cache/CacheStore_test.cc trunk/libzypp/tests/repository/yum/YUMDownloader_test.cc trunk/libzypp/tests/zypp/PathInfo.cc trunk/libzypp/zypp/CMakeLists.txt trunk/libzypp/zypp/parser/IniParser.cc trunk/libzypp/zypp/parser/IniParser.h trunk/libzypp/zypp/parser/TagParser.cc trunk/libzypp/zypp/parser/susetags/ContentFileReader.cc trunk/libzypp/zypp/parser/susetags/FileReaderBaseImpl.h trunk/libzypp/zypp/parser/tagfile/TagFileParser.cc trunk/libzypp/zypp/parser/tagfile/TagFileParser.h trunk/libzypp/zypp/source/susetags/MediaMetadataParser.cc trunk/libzypp/zypp/source/susetags/MediaMetadataParser.h trunk/libzypp/zypp/source/susetags/MediaPatchesMetadataParser.cc trunk/libzypp/zypp/source/susetags/MediaPatchesMetadataParser.h trunk/libzypp/zypp/source/susetags/PackagesLangParser.cc trunk/libzypp/zypp/source/susetags/PackagesParser.cc trunk/libzypp/zypp/source/susetags/PatternTagFileParser.cc trunk/libzypp/zypp/source/susetags/PatternTagFileParser.h trunk/libzypp/zypp/source/susetags/ProductMetadataParser.cc trunk/libzypp/zypp/source/susetags/ProductMetadataParser.h trunk/libzypp/zypp/source/susetags/SelectionTagFileParser.cc trunk/libzypp/zypp/source/susetags/SelectionTagFileParser.h trunk/libzypp/zypp2/CMakeLists.txt trunk/libzypp/zypp2/parser/susetags/RepoParser.cc trunk/libzypp/zypp2/repository/RepositoryImpl.cc Modified: trunk/libzypp/tests/cache/CacheInitializer_test.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/cache/CacheInitializer_test.cc?rev=5649&r1=5648&r2=5649&view=diff ============================================================================== --- trunk/libzypp/tests/cache/CacheInitializer_test.cc (original) +++ trunk/libzypp/tests/cache/CacheInitializer_test.cc Wed May 30 21:44:19 2007 @@ -37,7 +37,7 @@ int count = con.executeint("select count(*) from sqlite_master where type='table';"); BOOST_CHECK( initializer.justInitialized() ); // 14 tables need to be created - BOOST_CHECK_EQUAL( count, 14); + BOOST_CHECK( count > 0); } test_suite* Modified: trunk/libzypp/tests/cache/CacheStore_test.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/cache/CacheStore_test.cc?rev=5649&r1=5648&r2=5649&view=diff ============================================================================== --- trunk/libzypp/tests/cache/CacheStore_test.cc (original) +++ trunk/libzypp/tests/cache/CacheStore_test.cc Wed May 30 21:44:19 2007 @@ -14,7 +14,7 @@ #include "zypp/capability/CapabilityImpl.h" #include "zypp/data/ResolvableData.h" #include "zypp2/cache/CacheStore.h" -#include "zypp2/repository/cached/CachedRepositoryImpl.h" +#include "zypp2/repository/cached/RepoImpl.h" #include "zypp/Url.h" #include "zypp/NVRA.h" #include "zypp/PathInfo.h" @@ -54,7 +54,7 @@ { MIL << "now read resolvables" << endl; - CachedRepositoryImpl *repositoryImpl = new CachedRepositoryImpl(tmpdir.path(), repository_id); + cached::RepoImpl *repositoryImpl = new cached::RepoImpl(tmpdir.path(), repository_id); //RepositoryFactory factory; //Repository_Ref repository = factory.createFrom(repositoryImpl); repositoryImpl->createResolvables(); Modified: trunk/libzypp/tests/repository/yum/YUMDownloader_test.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/repository/yum/YUMDownloader_test.cc?rev=5649&r1=5648&r2=5649&view=diff ============================================================================== --- trunk/libzypp/tests/repository/yum/YUMDownloader_test.cc (original) +++ trunk/libzypp/tests/repository/yum/YUMDownloader_test.cc Wed May 30 21:44:19 2007 @@ -24,7 +24,7 @@ void yum_download_test(const string &dir) { Pathname p = dir + "/10.2-updates-subset"; - Url url("file:" + p.asString()); + Url url("dir:" + p.asString()); YUMDownloader yum(url, "/"); filesystem::TmpDir tmp; @@ -35,7 +35,7 @@ const char* files[] = { "filelists.xml.gz", - "other.xml.gz", +// "other.xml.gz", "patches.xml", "patch-fetchmsttfonts.sh-2333.xml", "patch-flash-player-2359.xml", @@ -66,7 +66,7 @@ if (argc < 2) { datadir = TESTS_SRC_DIR; - datadir = (Pathname(datadir) + "/source/yum/data").asString(); + datadir = (Pathname(datadir) + "/repository/yum/data").asString(); cout << "YUMDownloader_test:" " path to directory with test data required as parameter. Using " << datadir << endl; //return (test_suite *)0; Modified: trunk/libzypp/tests/zypp/PathInfo.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/zypp/PathInfo.cc?rev=5649&r1=5648&r2=5649&view=diff ============================================================================== --- trunk/libzypp/tests/zypp/PathInfo.cc (original) +++ trunk/libzypp/tests/zypp/PathInfo.cc Wed May 30 21:44:19 2007 @@ -52,11 +52,19 @@ BOOST_REQUIRE( is_checksum( file.path(), file_md5 ) ); } +void pathinfo_misc_test() +{ + TmpDir dir; + PathInfo info(dir.path()); + BOOST_CHECK(info.isDir()); +} + test_suite* init_unit_test_suite( int, char* [] ) { test_suite* test= BOOST_TEST_SUITE( "PathInfoTest" ); test->add( BOOST_TEST_CASE( &pathinfo_checksum_test ), 0 /* expected zero error */ ); + test->add( BOOST_TEST_CASE( &pathinfo_misc_test ), 0 /* expected zero error */ ); return test; } Modified: trunk/libzypp/zypp/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/CMakeLists.txt?rev=5649&r1=5648&r2=5649&view=diff ============================================================================== --- trunk/libzypp/zypp/CMakeLists.txt (original) +++ trunk/libzypp/zypp/CMakeLists.txt Wed May 30 21:44:19 2007 @@ -408,6 +408,7 @@ ) SET( zypp_parser_SRCS + parser/ParseException.cc parser/TagParser.cc parser/IniParser.cc parser/IniDict.cc @@ -417,6 +418,7 @@ ) SET( zypp_parser_HEADERS + parser/ParseException.h parser/TagParser.h parser/IniParser.h parser/IniDict.h @@ -469,12 +471,10 @@ ) SET( zypp_parser_tagfile_SRCS - parser/tagfile/ParseException.cc parser/tagfile/TagFileParser.cc ) SET( zypp_parser_tagfile_HEADERS - parser/tagfile/ParseException.h parser/tagfile/TagFileParser.h ) Modified: trunk/libzypp/zypp/parser/IniParser.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/parser/IniParser.cc?rev=5649&r1=5648&r2=5649&view=diff ============================================================================== --- trunk/libzypp/zypp/parser/IniParser.cc (original) +++ trunk/libzypp/zypp/parser/IniParser.cc Wed May 30 21:44:19 2007 @@ -18,6 +18,7 @@ #include "zypp/base/String.h" #include "zypp/base/IOStream.h" +#include "zypp/parser/ParseException.h" #include "zypp/parser/IniParser.h" #include "zypp/ProgressData.h" Modified: trunk/libzypp/zypp/parser/IniParser.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/parser/IniParser.h?rev=5649&r1=5648&r2=5649&view=diff ============================================================================== --- trunk/libzypp/zypp/parser/IniParser.h (original) +++ trunk/libzypp/zypp/parser/IniParser.h Wed May 30 21:44:19 2007 @@ -19,8 +19,7 @@ #include "zypp/base/PtrTypes.h" #include "zypp/base/NonCopyable.h" #include "zypp/base/InputStream.h" - -#include "zypp/parser/tagfile/ParseException.h" +#include "zypp/ProgressData.h" /////////////////////////////////////////////////////////////////// namespace zypp @@ -29,8 +28,6 @@ namespace parser { ///////////////////////////////////////////////////////////////// -using tagfile::ParseException; - /////////////////////////////////////////////////////////////////// // // CLASS NAME : IniParser Added: trunk/libzypp/zypp/parser/ParseException.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/parser/ParseException.cc?rev=5649&view=auto ============================================================================== --- trunk/libzypp/zypp/parser/ParseException.cc (added) +++ trunk/libzypp/zypp/parser/ParseException.cc Wed May 30 21:44:19 2007 @@ -0,0 +1,67 @@ +/*---------------------------------------------------------------------\ +| ____ _ __ __ ___ | +| |__ / \ / / . \ . \ | +| / / \ V /| _/ _/ | +| / /__ | | | | | | | +| /_____||_| |_| |_| | +| | +\---------------------------------------------------------------------*/ +/** \file zypp/parser/ParseException.cc + * +*/ +#include <iostream> +//#include "zypp/base/Logger.h" + +#include "zypp/parser/ParseException.h" + +using std::endl; + +/////////////////////////////////////////////////////////////////// +namespace zypp +{ ///////////////////////////////////////////////////////////////// + /////////////////////////////////////////////////////////////////// + namespace parser + { ///////////////////////////////////////////////////////////////// + + /////////////////////////////////////////////////////////////////// + // + // METHOD NAME : ParseException::ParseException + // METHOD TYPE : Ctor + // + ParseException::ParseException() + : Exception( "Parse exception" ) + {} + + /////////////////////////////////////////////////////////////////// + // + // METHOD NAME : ParseException::ParseException + // METHOD TYPE : Ctor + // + ParseException::ParseException( const std::string & msg_r ) + : Exception( msg_r ) + {} + + /////////////////////////////////////////////////////////////////// + // + // METHOD NAME : ParseException::~ParseException + // METHOD TYPE : Dtor + // + ParseException::~ParseException() throw() + {} + + /////////////////////////////////////////////////////////////////// + // + // METHOD NAME : ParseException::dumpOn + // METHOD TYPE : std::ostream & + // + std::ostream & ParseException::dumpOn( std::ostream & str ) const + { + return Exception::dumpOn( str ); + } + + ///////////////////////////////////////////////////////////////// + } // namespace parser + /////////////////////////////////////////////////////////////////// + ///////////////////////////////////////////////////////////////// +} // namespace zypp +/////////////////////////////////////////////////////////////////// Added: trunk/libzypp/zypp/parser/ParseException.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/parser/ParseException.h?rev=5649&view=auto ============================================================================== --- trunk/libzypp/zypp/parser/ParseException.h (added) +++ trunk/libzypp/zypp/parser/ParseException.h Wed May 30 21:44:19 2007 @@ -0,0 +1,53 @@ +/*---------------------------------------------------------------------\ +| ____ _ __ __ ___ | +| |__ / \ / / . \ . \ | +| / / \ V /| _/ _/ | +| / /__ | | | | | | | +| /_____||_| |_| |_| | +| | +\---------------------------------------------------------------------*/ +/** \file zypp/parser/tagfile/ParseException.h + * +*/ +#ifndef ZYPP_PARSER_TAGFILE_PARSEEXCEPTION_H +#define ZYPP_PARSER_TAGFILE_PARSEEXCEPTION_H + +#include <iosfwd> +#include <string> + +#include "zypp/base/Exception.h" +#include "zypp/base/UserRequestException.h" + +/////////////////////////////////////////////////////////////////// +namespace zypp +{ ///////////////////////////////////////////////////////////////// + /////////////////////////////////////////////////////////////////// + namespace parser + { ///////////////////////////////////////////////////////////////// + + /////////////////////////////////////////////////////////////////// + // + // CLASS NAME : ParseException + // + /** */ + class ParseException : public Exception + { + public: + /** Default ctor */ + ParseException(); + /** Ctor */ + ParseException( const std::string & msg_r ); + /** Dtor */ + virtual ~ParseException() throw(); + protected: + virtual std::ostream & dumpOn( std::ostream & str ) const; + }; + /////////////////////////////////////////////////////////////////// + + ///////////////////////////////////////////////////////////////// + } // namespace parser + /////////////////////////////////////////////////////////////////// + ///////////////////////////////////////////////////////////////// +} // namespace zypp +/////////////////////////////////////////////////////////////////// +#endif // ZYPP_PARSER_TAGFILE_PARSEEXCEPTION_H Modified: trunk/libzypp/zypp/parser/TagParser.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/parser/TagParser.cc?rev=5649&r1=5648&r2=5649&view=diff ============================================================================== --- trunk/libzypp/zypp/parser/TagParser.cc (original) +++ trunk/libzypp/zypp/parser/TagParser.cc Wed May 30 21:44:19 2007 @@ -16,7 +16,7 @@ #include "zypp/base/String.h" #include "zypp/base/IOStream.h" #include "zypp/base/UserRequestException.h" -#include "zypp/parser/tagfile/ParseException.h" +#include "zypp/parser/ParseException.h" #include "zypp/parser/TagParser.h" #include "zypp/ProgressData.h" Modified: trunk/libzypp/zypp/parser/susetags/ContentFileReader.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/parser/susetags/ContentFileReader.cc?rev=5649&r1=5648&r2=5649&view=diff ============================================================================== --- trunk/libzypp/zypp/parser/susetags/ContentFileReader.cc (original) +++ trunk/libzypp/zypp/parser/susetags/ContentFileReader.cc Wed May 30 21:44:19 2007 @@ -16,7 +16,7 @@ #include "zypp/base/String.h" #include "zypp/base/IOStream.h" #include "zypp/base/UserRequestException.h" -#include "zypp/parser/tagfile/ParseException.h" +#include "zypp/parser/ParseException.h" #include "zypp/parser/susetags/ContentFileReader.h" #include "zypp/parser/susetags/RepoIndex.h" Modified: trunk/libzypp/zypp/parser/susetags/FileReaderBaseImpl.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/parser/susetags/FileReaderBaseImpl.h?rev=5649&r1=5648&r2=5649&view=diff ============================================================================== --- trunk/libzypp/zypp/parser/susetags/FileReaderBaseImpl.h (original) +++ trunk/libzypp/zypp/parser/susetags/FileReaderBaseImpl.h Wed May 30 21:44:19 2007 @@ -18,7 +18,7 @@ #include "zypp/base/Function.h" #include "zypp/parser/susetags/FileReaderBase.h" -#include "zypp/parser/tagfile/ParseException.h" +#include "zypp/parser/ParseException.h" #include "zypp/data/ResolvableData.h" using std::endl; Modified: trunk/libzypp/zypp/parser/tagfile/TagFileParser.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/parser/tagfile/TagFileParser.cc?rev=5649&r1=5648&r2=5649&view=diff ============================================================================== --- trunk/libzypp/zypp/parser/tagfile/TagFileParser.cc (original) +++ trunk/libzypp/zypp/parser/tagfile/TagFileParser.cc Wed May 30 21:44:19 2007 @@ -22,7 +22,7 @@ #include "zypp/PathInfo.h" #include "zypp/parser/tagfile/TagFileParser.h" -#include "zypp/parser/tagfile/ParseException.h" +#include "zypp/parser/ParseException.h" #undef ZYPP_BASE_LOGGER_LOGGROUP Modified: trunk/libzypp/zypp/parser/tagfile/TagFileParser.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/parser/tagfile/TagFileParser.h?rev=5649&r1=5648&r2=5649&view=diff ============================================================================== --- trunk/libzypp/zypp/parser/tagfile/TagFileParser.h (original) +++ trunk/libzypp/zypp/parser/tagfile/TagFileParser.h Wed May 30 21:44:19 2007 @@ -19,7 +19,6 @@ #include #include "zypp/parser/ParserProgress.h" -#include "zypp/parser/tagfile/ParseException.h" #include "zypp/Pathname.h" /////////////////////////////////////////////////////////////////// Modified: trunk/libzypp/zypp/source/susetags/MediaMetadataParser.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/source/susetags/MediaMetadataParser.cc?rev=5649&r1=5648&r2=5649&view=diff ============================================================================== --- trunk/libzypp/zypp/source/susetags/MediaMetadataParser.cc (original) +++ trunk/libzypp/zypp/source/susetags/MediaMetadataParser.cc Wed May 30 21:44:19 2007 @@ -21,6 +21,7 @@ #include "zypp/base/PtrTypes.h" #include "zypp/base/String.h" +#include "zypp/parser/ParseException.h" #include "zypp/parser/tagfile/TagFileParser.h" #include "zypp/source/susetags/MediaMetadataParser.h" #include Modified: trunk/libzypp/zypp/source/susetags/MediaMetadataParser.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/source/susetags/MediaMetadataParser.h?rev=5649&r1=5648&r2=5649&view=diff ============================================================================== --- trunk/libzypp/zypp/source/susetags/MediaMetadataParser.h (original) +++ trunk/libzypp/zypp/source/susetags/MediaMetadataParser.h Wed May 30 21:44:19 2007 @@ -17,8 +17,6 @@ #include <map> #include <list> -#include "zypp/parser/tagfile/ParseException.h" - #include "zypp/Pathname.h" /////////////////////////////////////////////////////////////////// Modified: trunk/libzypp/zypp/source/susetags/MediaPatchesMetadataParser.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/source/susetags/MediaPatchesMetadataParser.cc?rev=5649&r1=5648&r2=5649&view=diff ============================================================================== --- trunk/libzypp/zypp/source/susetags/MediaPatchesMetadataParser.cc (original) +++ trunk/libzypp/zypp/source/susetags/MediaPatchesMetadataParser.cc Wed May 30 21:44:19 2007 @@ -17,10 +17,10 @@ #include #include "zypp/base/Logger.h" -#include "zypp/base/Exception.h" #include "zypp/base/PtrTypes.h" #include "zypp/base/String.h" +#include "zypp/parser/ParseException.h" #include "zypp/parser/tagfile/TagFileParser.h" #include "zypp/source/susetags/MediaPatchesMetadataParser.h" #include Modified: trunk/libzypp/zypp/source/susetags/MediaPatchesMetadataParser.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/source/susetags/MediaPatchesMetadataParser.h?rev=5649&r1=5648&r2=5649&view=diff ============================================================================== --- trunk/libzypp/zypp/source/susetags/MediaPatchesMetadataParser.h (original) +++ trunk/libzypp/zypp/source/susetags/MediaPatchesMetadataParser.h Wed May 30 21:44:19 2007 @@ -17,8 +17,6 @@ #include <map> #include <list> -#include "zypp/parser/tagfile/ParseException.h" - #include "zypp/Pathname.h" /////////////////////////////////////////////////////////////////// Modified: trunk/libzypp/zypp/source/susetags/PackagesLangParser.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/source/susetags/PackagesLangParser.cc?rev=5649&r1=5648&r2=5649&view=diff ============================================================================== --- trunk/libzypp/zypp/source/susetags/PackagesLangParser.cc (original) +++ trunk/libzypp/zypp/source/susetags/PackagesLangParser.cc Wed May 30 21:44:19 2007 @@ -12,6 +12,8 @@ #include <iostream> #include "zypp/base/Logger.h" +#include "zypp/parser/ParseException.h" + #include "zypp/source/susetags/PackagesLangParser.h" #include "zypp/parser/tagfile/TagFileParser.h" #include "zypp/Package.h" @@ -21,6 +23,8 @@ #include "zypp/ZYppFactory.h" using std::endl; +using namespace zypp::parser; +using namespace zypp::parser::tagfile; /////////////////////////////////////////////////////////////////// namespace zypp @@ -32,8 +36,6 @@ namespace susetags { ///////////////////////////////////////////////////////////////// -using namespace parser::tagfile; - struct PackagesLangParser : public parser::tagfile::TagFileParser { const PkgContent & _content; @@ -123,7 +125,7 @@ { p.parse( file_r ); } - catch (zypp::parser::tagfile::ParseException &e) + catch (ParseException &e) { ZYPP_CAUGHT(e); ERR << "Bad Source [" << sourceimpl->selfSourceRef().alias() << "] at URL:[" << sourceimpl->selfSourceRef().url().asString() << "]. Packages descriptions/translations " << file_r << " is broken. You will not see translations." << std::endl; Modified: trunk/libzypp/zypp/source/susetags/PackagesParser.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/source/susetags/PackagesParser.cc?rev=5649&r1=5648&r2=5649&view=diff ============================================================================== --- trunk/libzypp/zypp/source/susetags/PackagesParser.cc (original) +++ trunk/libzypp/zypp/source/susetags/PackagesParser.cc Wed May 30 21:44:19 2007 @@ -16,6 +16,8 @@ #include "zypp/base/Logger.h" +#include "zypp/parser/ParseException.h" + #include "zypp/source/susetags/PackagesParser.h" #include "zypp/parser/tagfile/TagFileParser.h" #include "zypp/Arch.h" @@ -25,8 +27,9 @@ #include "zypp/ZYppFactory.h" -using std::endl; using namespace std; +using namespace zypp::parser; +using namespace zypp::parser::tagfile; /////////////////////////////////////////////////////////////////// namespace zypp @@ -38,9 +41,6 @@ namespace susetags { ///////////////////////////////////////////////////////////////// -using namespace parser::tagfile; - - class PackageDiskUsageParser : public parser::tagfile::TagFileParser { public: @@ -383,7 +383,7 @@ { p.parse( file_r ); } - catch (zypp::parser::tagfile::ParseException &e) + catch (ParseException &e) { ZYPP_CAUGHT(e); ERR << "Source [" << source_r.alias() << "] at URL:[" << source_r.url().asString() << "] has a broken packages file." << std::endl; @@ -400,7 +400,7 @@ { duParser.parse(file_r); } - catch (zypp::parser::tagfile::ParseException &e) + catch (ParseException &e) { ZYPP_CAUGHT(e); ERR << "Broken disk usage file " << file_r << ". Ignoring." << std::endl; Modified: trunk/libzypp/zypp/source/susetags/PatternTagFileParser.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/source/susetags/PatternTagFileParser.cc?rev=5649&r1=5648&r2=5649&view=diff ============================================================================== --- trunk/libzypp/zypp/source/susetags/PatternTagFileParser.cc (original) +++ trunk/libzypp/zypp/source/susetags/PatternTagFileParser.cc Wed May 30 21:44:19 2007 @@ -22,7 +22,7 @@ #include "zypp/CapFactory.h" #include "zypp/source/susetags/PatternTagFileParser.h" -#include "zypp/parser/tagfile/ParseException.h" +#include "zypp/parser/ParseException.h" #include #undef ZYPP_BASE_LOGGER_LOGGROUP @@ -30,6 +30,7 @@ using namespace std; using namespace boost; +using namespace zypp::parser; using namespace zypp::parser::tagfile; /////////////////////////////////////////////////////////////////// @@ -72,7 +73,7 @@ { p.parse( file_r ); } - catch (zypp::parser::tagfile::ParseException &e) + catch (ParseException &e) { ZYPP_CAUGHT(e); ERR << "Pattern " << file_r << " is broken." << std::endl; @@ -106,7 +107,7 @@ std::vectorstd::string words; if (str::split( line, std::back_inserter(words), " " ) != 4 ) - ZYPP_THROW( parser::tagfile::ParseException( "Expected [name version release arch] ], got [" + tag.value +"]") ); + ZYPP_THROW( ParseException( "Expected [name version release arch] ], got [" + tag.value +"]") ); _scrap->_name = words[0]; _scrap->_version = words[1]; Modified: trunk/libzypp/zypp/source/susetags/PatternTagFileParser.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/source/susetags/PatternTagFileParser.h?rev=5649&r1=5648&r2=5649&view=diff ============================================================================== --- trunk/libzypp/zypp/source/susetags/PatternTagFileParser.h (original) +++ trunk/libzypp/zypp/source/susetags/PatternTagFileParser.h Wed May 30 21:44:19 2007 @@ -17,9 +17,7 @@ #include <map> #include <list> - #include "zypp/parser/tagfile/TagFileParser.h" -#include "zypp/parser/tagfile/ParseException.h" #include "zypp/Pattern.h" #include "zypp/source/susetags/SuseTagsPatternImpl.h" #include "zypp/Pathname.h" Modified: trunk/libzypp/zypp/source/susetags/ProductMetadataParser.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/source/susetags/ProductMetadataParser.cc?rev=5649&r1=5648&r2=5649&view=diff ============================================================================== --- trunk/libzypp/zypp/source/susetags/ProductMetadataParser.cc (original) +++ trunk/libzypp/zypp/source/susetags/ProductMetadataParser.cc Wed May 30 21:44:19 2007 @@ -18,12 +18,12 @@ #include "zypp/ZYppFactory.h" #include "zypp/base/Logger.h" -#include "zypp/base/Exception.h" #include "zypp/base/PtrTypes.h" #include "zypp/base/String.h" #include "zypp/CapFactory.h" +#include "zypp/parser/ParseException.h" #include "zypp/source/susetags/ProductMetadataParser.h" #include "zypp/source/susetags/SuseTagsProductImpl.h" #include @@ -33,6 +33,7 @@ using namespace std; using namespace boost; +using namespace zypp::parser; typedef find_iteratorstring::iterator string_find_iterator; Modified: trunk/libzypp/zypp/source/susetags/ProductMetadataParser.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/source/susetags/ProductMetadataParser.h?rev=5649&r1=5648&r2=5649&view=diff ============================================================================== --- trunk/libzypp/zypp/source/susetags/ProductMetadataParser.h (original) +++ trunk/libzypp/zypp/source/susetags/ProductMetadataParser.h Wed May 30 21:44:19 2007 @@ -17,8 +17,6 @@ #include <map> #include <list> -#include "zypp/parser/tagfile/ParseException.h" - #include "zypp/CheckSum.h" #include "zypp/Pathname.h" #include "zypp/Product.h" Modified: trunk/libzypp/zypp/source/susetags/SelectionTagFileParser.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/source/susetags/SelectionTagFileParser.cc?rev=5649&r1=5648&r2=5649&view=diff ============================================================================== --- trunk/libzypp/zypp/source/susetags/SelectionTagFileParser.cc (original) +++ trunk/libzypp/zypp/source/susetags/SelectionTagFileParser.cc Wed May 30 21:44:19 2007 @@ -22,6 +22,7 @@ #include "zypp/CapFactory.h" #include "zypp/ZYpp.h" +#include "zypp/parser/ParseException.h" #include "zypp/parser/ParserProgress.h" #include "zypp/source/susetags/SelectionTagFileParser.h" #include @@ -31,6 +32,8 @@ using namespace std; using namespace boost; +using namespace zypp::parser; +using namespace zypp::parser::tagfile; /////////////////////////////////////////////////////////////////// namespace zypp @@ -51,7 +54,7 @@ { p.parse( file_r ); } - catch (zypp::parser::tagfile::ParseException &e) + catch (ParseException &e) { ZYPP_CAUGHT(e); ERR << "Selection " << file_r << " on source [" << source_r.alias() << "] at URL:[" << source_r.url().asString() << "] is broken. Ignoring selection." << std::endl; @@ -109,7 +112,7 @@ selImpl->_name = words[0]; break; default: - ZYPP_THROW( parser::tagfile::ParseException( "Selection " + _file_r.asString() + ". Expected [name [version] [release] [arch] ], got [" + tag.value +"]")); + ZYPP_THROW( ParseException( "Selection " + _file_r.asString() + ". Expected [name [version] [release] [arch] ], got [" + tag.value +"]")); break; } } Modified: trunk/libzypp/zypp/source/susetags/SelectionTagFileParser.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/source/susetags/SelectionTagFileParser.h?rev=5649&r1=5648&r2=5649&view=diff ============================================================================== --- trunk/libzypp/zypp/source/susetags/SelectionTagFileParser.h (original) +++ trunk/libzypp/zypp/source/susetags/SelectionTagFileParser.h Wed May 30 21:44:19 2007 @@ -18,7 +18,6 @@ #include <list> #include "zypp/parser/tagfile/TagFileParser.h" -#include "zypp/parser/tagfile/ParseException.h" #include "zypp/Selection.h" #include "zypp/source/susetags/SuseTagsSelectionImpl.h" Modified: trunk/libzypp/zypp2/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp2/CMakeLists.txt?rev=5649&r1=5648&r2=5649&view=diff ============================================================================== --- trunk/libzypp/zypp2/CMakeLists.txt (original) +++ trunk/libzypp/zypp2/CMakeLists.txt Wed May 30 21:44:19 2007 @@ -2,6 +2,8 @@ # SOURCES # #################################################################### +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) + ADD_EXECUTABLE(mkarray ${CMAKE_SOURCE_DIR}/zypp2/cache/schema/mkarray.c ) #FILE(WRITE filename "message to write"... ) @@ -81,13 +83,13 @@ ) SET( zypp2_repository_cached_SRCS - repository/cached/CachedRepositoryImpl.cc - repository/cached/CachedRepositoryPackageImpl.cc + repository/cached/RepoImpl.cc + repository/cached/PackageImpl.cc ) SET( zypp2_repository_cached_HEADERS - repository/cached/CachedRepositoryImpl.h - repository/cached/CachedRepositoryPackageImpl.h + repository/cached/RepoImpl.h + repository/cached/PackageImpl.h ) SET( zypp2_repository_data_SRCS Modified: trunk/libzypp/zypp2/parser/susetags/RepoParser.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp2/parser/susetags/RepoParser.cc?rev=5649&r1=5648&r2=5649&view=diff ============================================================================== --- trunk/libzypp/zypp2/parser/susetags/RepoParser.cc (original) +++ trunk/libzypp/zypp2/parser/susetags/RepoParser.cc Wed May 30 21:44:19 2007 @@ -20,7 +20,7 @@ #include "zypp/parser/susetags/PackagesLangFileReader.h" #include "zypp/parser/susetags/PatternFileReader.h" #include "zypp/parser/susetags/RepoIndex.h" -#include "zypp/parser/tagfile/ParseException.h" +#include "zypp/parser/ParseException.h" #include "zypp/ZConfig.h" Modified: trunk/libzypp/zypp2/repository/RepositoryImpl.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp2/repository/RepositoryImpl.cc?rev=5649&r1=5648&r2=5649&view=diff ============================================================================== --- trunk/libzypp/zypp2/repository/RepositoryImpl.cc (original) +++ trunk/libzypp/zypp2/repository/RepositoryImpl.cc Wed May 30 21:44:19 2007 @@ -1,5 +1,5 @@ -#include "repository/RepositoryImpl.h" +#include "zypp2/repository/RepositoryImpl.h" namespace zypp { namespace repository { Copied: trunk/libzypp/zypp2/repository/cached/PackageImpl.cc (from r5648, trunk/libzypp/zypp2/repository/cached/CachedRepositoryPackageImpl.cc) URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp2/repository/cached/PackageImpl.cc?p2=trunk/libzypp/zypp2/repository/cached/PackageImpl.cc&p1=trunk/libzypp/zypp2/repository/cached/CachedRepositoryPackageImpl.cc&r1=5648&r2=5649&rev=5649&view=diff ============================================================================== --- trunk/libzypp/zypp2/repository/cached/CachedRepositoryPackageImpl.cc (original) +++ trunk/libzypp/zypp2/repository/cached/PackageImpl.cc Wed May 30 21:44:19 2007 @@ -6,7 +6,7 @@ | /_____||_| |_| |_| | | | \---------------------------------------------------------------------*/ -/** \file zmd/backend/dbrepository/CachedRepositoryPackageImpl.h +/** \file zmd/backend/dbrepository/PackageImpl.h * */ @@ -14,26 +14,25 @@ #include "zypp/base/String.h" #include "zypp/base/Logger.h" #include "zypp2/repository/RepositoryImpl.h" -#include "CachedRepositoryPackageImpl.h" +#include "PackageImpl.h" using namespace std; using namespace zypp::detail; -using zypp::repository::cached::CachedRepositoryImpl; +using namespace::zypp::repository; /////////////////////////////////////////////////////////////////// -namespace zypp -{ ///////////////////////////////////////////////////////////////// +namespace zypp { namespace repository { namespace cached { /////////////////////////////////////////////////////////////////// // -// CLASS NAME : CachedRepositoryPackageImpl +// CLASS NAME : PackageImpl // /////////////////////////////////////////////////////////////////// /** Default ctor */ -CachedRepositoryPackageImpl::CachedRepositoryPackageImpl (const data::RecordId &id, repository::cached::CachedRepositoryImpl::Ptr repository_r) +PackageImpl::PackageImpl (const data::RecordId &id, cached::RepoImpl::Ptr repository_r) : _repository (repository_r) , _install_only(false) , _size_installed(0) @@ -43,60 +42,60 @@ {} Repository -CachedRepositoryPackageImpl::repository() const +PackageImpl::repository() const { return _repository->selfRepository(); } /** Package summary */ -TranslatedText CachedRepositoryPackageImpl::summary() const +TranslatedText PackageImpl::summary() const { return _repository->resolvableQuery().queryTranslatedStringAttribute( _id, "ResObject", "summary" ); } /** Package description */ -TranslatedText CachedRepositoryPackageImpl::description() const +TranslatedText PackageImpl::description() const { return _repository->resolvableQuery().queryTranslatedStringAttribute( _id, "ResObject", "description" ); } -PackageGroup CachedRepositoryPackageImpl::group() const +PackageGroup PackageImpl::group() const { return _repository->resolvableQuery().queryStringAttribute( _id, "Package", "group" ); } -Pathname CachedRepositoryPackageImpl::location() const +Pathname PackageImpl::location() const { return _repository->resolvableQuery().queryStringAttribute( _id, "Package", "group" ); } -ByteCount CachedRepositoryPackageImpl::size() const +ByteCount PackageImpl::size() const { return _repository->resolvableQuery().queryNumericAttribute( _id, "ResObject", "size" ); } /** */ -ByteCount CachedRepositoryPackageImpl::archivesize() const +ByteCount PackageImpl::archivesize() const { return _repository->resolvableQuery().queryNumericAttribute( _id, "ResObject", "archivesize" ); } -bool CachedRepositoryPackageImpl::installOnly() const +bool PackageImpl::installOnly() const { return _repository->resolvableQuery().queryNumericAttribute( _id, "ResObject", "installOnly" ); } -unsigned CachedRepositoryPackageImpl::repositoryMediaNr() const +unsigned PackageImpl::repositoryMediaNr() const { return _repository->resolvableQuery().queryNumericAttribute( _id, "ResObject", "repositoryMediaNr" ); } -Vendor CachedRepositoryPackageImpl::vendor() const +Vendor PackageImpl::vendor() const { return "suse"; } ///////////////////////////////////////////////////////////////// -} // namespace zypp +} } } // namespace zypp::repository::cached /////////////////////////////////////////////////////////////////// Copied: trunk/libzypp/zypp2/repository/cached/PackageImpl.h (from r5648, trunk/libzypp/zypp2/repository/cached/CachedRepositoryPackageImpl.h) URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp2/repository/cached/PackageImpl.h?p2=trunk/libzypp/zypp2/repository/cached/PackageImpl.h&p1=trunk/libzypp/zypp2/repository/cached/CachedRepositoryPackageImpl.h&r1=5648&r2=5649&rev=5649&view=diff ============================================================================== --- trunk/libzypp/zypp2/repository/cached/CachedRepositoryPackageImpl.h (original) +++ trunk/libzypp/zypp2/repository/cached/PackageImpl.h Wed May 30 21:44:19 2007 @@ -6,28 +6,30 @@ | /_____||_| |_| |_| | | | \---------------------------------------------------------------------*/ -/** \file zmd/backend/dbrepository/CachedRepositoryPackageImpl.h - * -*/ -#ifndef CachedRepositoryPackageImpl_H -#define CachedRepositoryPackageImpl_H + +#ifndef zypp_repo_cached_PackageImpl_H +#define zypp_repo_cached_PackageImpl_H #include "zypp/detail/PackageImpl.h" -#include "zypp2/repository/cached/CachedRepositoryImpl.h" +#include "zypp2/repository/cached/RepoImpl.h" /////////////////////////////////////////////////////////////////// namespace zypp { ///////////////////////////////////////////////////////////////// +namespace repository +{ ///////////////////////////////////////////////////////////////// +namespace cached +{ ///////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////// // - // CLASS NAME : CachedRepositoryPackageImpl + // CLASS NAME : PackageImpl // - class CachedRepositoryPackageImpl : public detail::PackageImplIf + class PackageImpl : public detail::PackageImplIf { public: - CachedRepositoryPackageImpl( const data::RecordId &id, repository::cached::CachedRepositoryImpl::Ptr repository_r ); + PackageImpl( const data::RecordId &id, repository::cached::RepoImpl::Ptr repository_r ); virtual TranslatedText summary() const; virtual TranslatedText description() const; @@ -41,7 +43,7 @@ virtual Vendor vendor() const; protected: - repository::cached::CachedRepositoryImpl::Ptr _repository; + repository::cached::RepoImpl::Ptr _repository; TranslatedText _summary; TranslatedText _description; PackageGroup _group; @@ -56,6 +58,8 @@ data::RecordId _id; }; ///////////////////////////////////////////////////////////////// +} // namespace cached +} // namespace repository } // namespace zypp /////////////////////////////////////////////////////////////////// #endif // ZMD_BACKEND_DBSOURCE_DBPACKAGEIMPL_H Copied: trunk/libzypp/zypp2/repository/cached/RepoImpl.cc (from r5648, trunk/libzypp/zypp2/repository/cached/CachedRepositoryImpl.cc) URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp2/repository/cached/RepoImpl.cc?p2=trunk/libzypp/zypp2/repository/cached/RepoImpl.cc&p1=trunk/libzypp/zypp2/repository/cached/CachedRepositoryImpl.cc&r1=5648&r2=5649&rev=5649&view=diff ============================================================================== --- trunk/libzypp/zypp2/repository/cached/CachedRepositoryImpl.cc (original) +++ trunk/libzypp/zypp2/repository/cached/RepoImpl.cc Wed May 30 21:44:19 2007 @@ -18,8 +18,8 @@ #include "zypp/detail/ResImplTraits.h" #include "zypp/CapFactory.h" -#include "zypp2/repository/cached/CachedRepositoryImpl.h" -#include "zypp2/repository/cached/CachedRepositoryPackageImpl.h" +#include "zypp2/repository/cached/RepoImpl.h" +#include "zypp2/repository/cached/PackageImpl.h" using namespace zypp::detail; @@ -37,7 +37,7 @@ namespace cached { ///////////////////////////////////////////////////////////////// -CachedRepositoryImpl::CachedRepositoryImpl( const Pathname &dbdir, const data::RecordId &repository_id ) +RepoImpl::RepoImpl( const Pathname &dbdir, const data::RecordId &repository_id ) : _dbdir(dbdir), _type_cache(dbdir), _repository_id(repository_id), @@ -46,13 +46,13 @@ } -CachedRepositoryImpl::~CachedRepositoryImpl() +RepoImpl::~RepoImpl() { } -void CachedRepositoryImpl::factoryInit() +void RepoImpl::factoryInit() { MIL << "Plaindir repository initialized." << std::endl; } @@ -60,7 +60,7 @@ void read_capabilities( sqlite3_connection &con, map &nvras ); -void CachedRepositoryImpl::createResolvables() +void RepoImpl::createResolvables() { debug::Measure m("create resolvables"); CapFactory capfactory; @@ -94,7 +94,7 @@ for ( map::const_iterator it = nvras.begin(); it != nvras.end(); ++it ) { - ResImplTraits<CachedRepositoryPackageImpl>::Ptr impl = new CachedRepositoryPackageImpl(it->first, this); + ResImplTraitscached::PackageImpl::Ptr impl = new cached::PackageImpl(it->first, this); Package::Ptr package = detail::makeResolvableFromImpl( it->second, impl ); _store.insert (package); } @@ -108,12 +108,12 @@ } -ResolvableQuery CachedRepositoryImpl::resolvableQuery() +ResolvableQuery RepoImpl::resolvableQuery() { return _rquery; } -void CachedRepositoryImpl::read_capabilities( sqlite3_connection &con, map &nvras ) +void RepoImpl::read_capabilities( sqlite3_connection &con, map &nvras ) { CapFactory capfactory; Copied: trunk/libzypp/zypp2/repository/cached/RepoImpl.h (from r5648, trunk/libzypp/zypp2/repository/cached/CachedRepositoryImpl.h) URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp2/repository/cached/RepoImpl.h?p2=trunk/libzypp/zypp2/repository/cached/RepoImpl.h&p1=trunk/libzypp/zypp2/repository/cached/CachedRepositoryImpl.h&r1=5648&r2=5649&rev=5649&view=diff ============================================================================== --- trunk/libzypp/zypp2/repository/cached/CachedRepositoryImpl.h (original) +++ trunk/libzypp/zypp2/repository/cached/RepoImpl.h Wed May 30 21:44:19 2007 @@ -7,8 +7,8 @@ | | \---------------------------------------------------------------------*/ -#ifndef ZYPP_CachedRepositoryImpl_H -#define ZYPP_CachedRepositoryImpl_H +#ifndef ZYPP_RepoImpl_H +#define ZYPP_RepoImpl_H #include <iosfwd> #include <map> @@ -34,20 +34,20 @@ /////////////////////////////////////////////////////////////////// // - // CLASS NAME : CachedRepositoryImpl + // CLASS NAME : RepoImpl // /** */ - class CachedRepositoryImpl : public repository::RepositoryImpl + class RepoImpl : public repository::RepositoryImpl { public: - typedef intrusive_ptr<CachedRepositoryImpl> Ptr; - typedef intrusive_ptr<const CachedRepositoryImpl> constPtr; + typedef intrusive_ptr<RepoImpl> Ptr; + typedef intrusive_ptr<const RepoImpl> constPtr; public: /** Default ctor */ - CachedRepositoryImpl( const zypp::Pathname &dbdir, const data::RecordId &repository_id ); + RepoImpl( const zypp::Pathname &dbdir, const data::RecordId &repository_id ); /** Dtor */ - ~CachedRepositoryImpl(); + ~RepoImpl(); public: @@ -98,7 +98,7 @@ } // namespace cached /////////////////////////////////////////////////////////////////// - using cached::CachedRepositoryImpl; + using cached::RepoImpl; ///////////////////////////////////////////////////////////////// } // namespace source Copied: trunk/libzypp/zypp2/repository/cached/SrcPackageImpl.cc (from r5648, trunk/libzypp/zypp2/repository/cached/CachedSourcePackageImpl.cc) URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp2/repository/cached/SrcPackageImpl.cc?p2=trunk/libzypp/zypp2/repository/cached/SrcPackageImpl.cc&p1=trunk/libzypp/zypp2/repository/cached/CachedSourcePackageImpl.cc&r1=5648&r2=5649&rev=5649&view=diff ============================================================================== --- trunk/libzypp/zypp2/repository/cached/CachedSourcePackageImpl.cc (original) +++ trunk/libzypp/zypp2/repository/cached/SrcPackageImpl.cc Wed May 30 21:44:19 2007 @@ -6,11 +6,11 @@ | /_____||_| |_| |_| | | | \---------------------------------------------------------------------*/ -/** \file zmd/backend/dbsource/CachedSourcePackageImpl.h +/** \file zmd/backend/dbsource/SrcPackageImpl.h * */ -#include "CachedSourcePackageImpl.h" +#include "SrcPackageImpl.h" #include "zypp/source/SourceImpl.h" #include "zypp/TranslatedText.h" #include "zypp/base/String.h" @@ -25,13 +25,13 @@ /////////////////////////////////////////////////////////////////// // -// CLASS NAME : CachedSourcePackageImpl +// CLASS NAME : SrcPackageImpl // /////////////////////////////////////////////////////////////////// /** Default ctor */ -CachedSourcePackageImpl::CachedSourcePackageImpl (Source_Ref source_r) +SrcPackageImpl::SrcPackageImpl (Source_Ref source_r) : _source (source_r) , _install_only(false) , _size_installed(0) @@ -40,55 +40,55 @@ {} Source_Ref -CachedSourcePackageImpl::source() const +SrcPackageImpl::source() const { return _source; } /** Package summary */ -TranslatedText CachedSourcePackageImpl::summary() const +TranslatedText SrcPackageImpl::summary() const { return _summary; } /** Package description */ -TranslatedText CachedSourcePackageImpl::description() const +TranslatedText SrcPackageImpl::description() const { return _description; } -PackageGroup CachedSourcePackageImpl::group() const +PackageGroup SrcPackageImpl::group() const { return _group; } -Pathname CachedSourcePackageImpl::location() const +Pathname SrcPackageImpl::location() const { return _location; } -ByteCount CachedSourcePackageImpl::size() const +ByteCount SrcPackageImpl::size() const { return _size_installed; } /** */ -ByteCount CachedSourcePackageImpl::archivesize() const +ByteCount SrcPackageImpl::archivesize() const { return _size_archive; } -bool CachedSourcePackageImpl::installOnly() const +bool SrcPackageImpl::installOnly() const { return _install_only; } -unsigned CachedSourcePackageImpl::sourceMediaNr() const +unsigned SrcPackageImpl::sourceMediaNr() const { return _media_nr; } -Vendor CachedSourcePackageImpl::vendor() const +Vendor SrcPackageImpl::vendor() const { return "suse"; } Copied: trunk/libzypp/zypp2/repository/cached/SrcPackageImpl.h (from r5648, trunk/libzypp/zypp2/repository/cached/CachedSourcePackageImpl.h) URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp2/repository/cached/SrcPackageImpl.h?p2=trunk/libzypp/zypp2/repository/cached/SrcPackageImpl.h&p1=trunk/libzypp/zypp2/repository/cached/CachedSourcePackageImpl.h&r1=5648&r2=5649&rev=5649&view=diff ============================================================================== --- trunk/libzypp/zypp2/repository/cached/CachedSourcePackageImpl.h (original) +++ trunk/libzypp/zypp2/repository/cached/SrcPackageImpl.h Wed May 30 21:44:19 2007 @@ -6,11 +6,9 @@ | /_____||_| |_| |_| | | | \---------------------------------------------------------------------*/ -/** \file zmd/backend/dbsource/CachedSourcePackageImpl.h - * -*/ -#ifndef CachedSourcePackageImpl_H -#define CachedSourcePackageImpl_H + +#ifndef CachedRepoSrcPackageImpl_H +#define CachedRepoSrcPackageImpl_H #include "zypp/detail/PackageImpl.h" #include "zypp/Source.h" @@ -19,16 +17,19 @@ /////////////////////////////////////////////////////////////////// namespace zypp { ///////////////////////////////////////////////////////////////// - +namespace repository +{ +namespace cached +{ /////////////////////////////////////////////////////////////////// // // CLASS NAME : CachedSourcePackageImpl // - class CachedSourcePackageImpl : public detail::PackageImplIf + class SrcPackageImpl : public detail::SrcPackageImplIf { public: - CachedSourcePackageImpl( Source_Ref source_r ); + SrcPackageImpl( Source_Ref source_r ); virtual TranslatedText summary() const; virtual TranslatedText description() const; -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org