compile

diff --git a/devel/devel.dmacvicar/aj.cc b/devel/devel.dmacvicar/aj.cc
index 4a792b5..b24492f 100644 (file)
--- a/devel/devel.dmacvicar/aj.cc
+++ b/devel/devel.dmacvicar/aj.cc
@@ -84,7 +84,7 @@ int main()
     
     for (SourceManager::Source_const_iterator it = manager->Source_begin(); it !=  manager->Source_end(); ++it) {
       zypp::ResStore store = it->resolvables();
-      MIL << "Catalog " << it->id() << " contributing " << store.size() << " resolvables" << endl;
+      MIL << "Repository " << it->id() << " contributing " << store.size() << " resolvables" << endl;
       z->addResolvables( store, false );
     }  
   

diff --git a/devel/devel.jkupec/YUMParser_test.cc b/devel/devel.jkupec/YUMParser_test.cc
index 721073d..810c7f7 100644 (file)
--- a/devel/devel.jkupec/YUMParser_test.cc
+++ b/devel/devel.jkupec/YUMParser_test.cc
@@ -36,10 +36,10 @@ int main(int argc, char **argv)
   {
     ZYpp::Ptr z = getZYpp();
 
-    Measure open_repository_timer("CacheStore: lookupOrAppendCatalog");
+    Measure open_repository_timer("CacheStore: lookupOrAppendRepository");
 
     cache::CacheStore store(getenv("PWD"));
-    data::RecordId repository_id = store.lookupOrAppendCatalog( Url("http://some.url"), "/");
+    data::RecordId repository_id = store.lookupOrAppendRepository( Url("http://some.url"), "/");
 
     open_repository_timer.stop();
 

diff --git a/devel/devel.ma/Parse.cc b/devel/devel.ma/Parse.cc
index b7da041..2fd4850 100644 (file)
--- a/devel/devel.ma/Parse.cc
+++ b/devel/devel.ma/Parse.cc
@@ -202,7 +202,7 @@ int main( int argc, char * argv[] )
   Pathname reporoot( "lmd" );
 
   cache::CacheStore store( dbdir );
-  data::RecordId repositoryId = store.lookupOrAppendCatalog( Url("dir:///"), "/" );
+  data::RecordId repositoryId = store.lookupOrAppendRepository( Url("dir:///"), "/" );
   {
     Measure x( "XXXXXXXXXXXXX" );
 
@@ -230,7 +230,7 @@ int main( int argc, char * argv[] )
     Pathname metadir( "lmd" );
 
     cache::CacheStore store( dbdir );
-    data::RecordId repositoryId = store.lookupOrAppendCatalog( Url("http://www.google.com"), "/" );
+    data::RecordId repositoryId = store.lookupOrAppendRepository( Url("http://www.google.com"), "/" );
 
     RepoParser( metadir, repositoryId, store );
 
@@ -243,7 +243,7 @@ int main( int argc, char * argv[] )
       Pathname dbfile( "data.db" );
       cache::CacheStore store(getenv("PWD"));
 
-      data::RecordId repository_id = store.lookupOrAppendCatalog( Url("http://www.google.com"), "/");
+      data::RecordId repository_id = store.lookupOrAppendRepository( Url("http://www.google.com"), "/");
 
       PackagesParser parser( repository_id, store);
       Measure m;

diff --git a/tests/cache/CacheQuery_test.cc b/tests/cache/CacheQuery_test.cc
index e681686..826d4a6 100644 (file)
--- a/tests/cache/CacheQuery_test.cc
+++ b/tests/cache/CacheQuery_test.cc
@@ -49,7 +49,7 @@ void resolvable_query_test(const string &dir)
   {
     cache::CacheStore store(tmpdir.path());
     
-    data::RecordId repository_id = store.lookupOrAppendCatalog( Url("http://novell.com"), "/");
+    data::RecordId repository_id = store.lookupOrAppendRepository( Url("http://novell.com"), "/");
     
     zypp::debug::Measure cap_parse_timer("store resolvables");
     for ( list<MiniResolvable>::iterator it = res_list.begin(); it != res_list.end(); it++)

diff --git a/tests/cache/CacheStore_test.cc b/tests/cache/CacheStore_test.cc
index 95ce2cd..9f42d20 100644 (file)
--- a/tests/cache/CacheStore_test.cc
+++ b/tests/cache/CacheStore_test.cc
@@ -40,7 +40,7 @@ void cache_write_test(const string &dir)
     
     cache::CacheStore store(tmpdir.path());
     
-    repository_id = store.lookupOrAppendCatalog( Url("http://novell.com"), "/");
+    repository_id = store.lookupOrAppendRepository( Url("http://novell.com"), "/");
     
     zypp::debug::Measure cap_parse_timer("store resolvables");
     for ( list<MiniResolvable>::iterator it = res_list.begin(); it != res_list.end(); it++)

diff --git a/tools/registration/zypp-query-pool.cc b/tools/registration/zypp-query-pool.cc
index 766b1a6..21c34d9 100644 (file)
--- a/tools/registration/zypp-query-pool.cc
+++ b/tools/registration/zypp-query-pool.cc
@@ -120,7 +120,7 @@ query_pool( ZYpp::Ptr Z, const string & filter, const string & repository)
   for (SourceManager::Source_const_iterator it = manager->Source_begin(); it !=  manager->Source_end(); ++it)
   {
     zypp::ResStore store = it->resolvables();
-    MIL << "Catalog " << it->id() << " contributing " << store.size() << " resolvables" << endl;
+    MIL << "Repository " << it->id() << " contributing " << store.size() << " resolvables" << endl;
     Z->addResolvables( store, false );
   }
 

diff --git a/zypp2/cache/CacheStore.cpp b/zypp2/cache/CacheStore.cpp
index 1f414f0..f84153e 100644 (file)
--- a/zypp2/cache/CacheStore.cpp
+++ b/zypp2/cache/CacheStore.cpp
@@ -206,12 +206,12 @@ void CacheStore::consumePackage( const RecordId &repository_id, data::Package_Pt
   appendStringAttribute( pkgid, "Package", "location", package->repositoryLocation.filePath.asString() );
 }
 
-void CacheStore::consumeSourcePackage( const data::RecordId &catalog_id, data::SrcPackage_Ptr srcpackage )
+void CacheStore::consumeSourcePackage( const data::RecordId &repository_id, data::SrcPackage_Ptr srcpackage )
 {
 #warning TBD
 }
 
-void CacheStore::consumePatch( const data::RecordId &catalog_id, data::Patch_Ptr patch)
+void CacheStore::consumePatch( const data::RecordId &repository_id, data::Patch_Ptr patch)
 {
   RecordId id = appendResolvable( repository_id, ResTraits<Patch>::kind, NVRA( patch->name, patch->edition, patch->arch ), patch->deps );
   consumeResObject( id, patch );
@@ -552,7 +552,7 @@ RecordId CacheStore::lookupOrAppendFile( const Pathname &path )
   return static_cast<RecordId>(id);
 }
 
-void CacheStore::updateCatalog( const RecordId &id,
+void CacheStore::updateRepository( const RecordId &id,
                     const string &checksum,
                     const Date &timestamp )
 {
@@ -562,7 +562,7 @@ void CacheStore::updateCatalog( const RecordId &id,
   _pimpl->insert_repository_cmd->executenonquery();
 }
 
-RecordId CacheStore::lookupOrAppendCatalog( const Url &url, const Pathname &path )
+RecordId CacheStore::lookupOrAppendRepository( const Url &url, const Pathname &path )
 {
   _pimpl->select_repository_cmd->bind(":url", url.asString());
   _pimpl->select_repository_cmd->bind(":path", path.asString());

diff --git a/zypp2/cache/CacheStore.h b/zypp2/cache/CacheStore.h
index 5cfa7b1..ccdb209 100644 (file)
--- a/zypp2/cache/CacheStore.h
+++ b/zypp2/cache/CacheStore.h
@@ -39,7 +39,7 @@ namespace zypp
      * \code
      * CacheStore store("/path");
      * RecordId repository_id =
-     *   store.lookupOrAppendCatalog("http://updates.novell.com", "/");
+     *   store.lookupOrAppendRepository("http://updates.novell.com", "/");
      * store.consumePackage( repository_id, package_ptr );
      * store.commit();
      * \endcode
@@ -176,7 +176,7 @@ namespace zypp
        *
        * You have to specify the RecordId for the repository owning
        * this resolvable. Yuu can obtain it with
-       * \ref lookupOrAppendCatalog
+       * \ref lookupOrAppendRepository
        *
        * You can create those \a deps using \ref capability::parse
        * functions, or the build methods to create specific types
@@ -359,7 +359,7 @@ namespace zypp
        * be created and the new inserted entry's id will
        * be returned.
        */
-      data::RecordId lookupOrAppendCatalog( const Url &url,
+      data::RecordId lookupOrAppendRepository( const Url &url,
                                             const Pathname &path );
 
       /**
@@ -449,9 +449,9 @@ namespace zypp
        *
        * It is responsability of the caller to operate with
        * a valid record id. You can get one
-       * Using \ref lookupOrAppendCatalog
+       * Using \ref lookupOrAppendRepository
        */
-      void updateCatalog( const data::RecordId &id,
+      void updateRepository( const data::RecordId &id,
                                     const std::string &checksum,
                                     const Date &timestamp = Date::now() );
 

diff --git a/zypp2/parser/susetags/RepoParser.cc b/zypp2/parser/susetags/RepoParser.cc
index d4d0705..48df94e 100644 (file)
--- a/zypp2/parser/susetags/RepoParser.cc
+++ b/zypp2/parser/susetags/RepoParser.cc
@@ -76,19 +76,19 @@ namespace zypp
           void consumePkg( const data::Package_Ptr & data_r )
           {
             SEC << "[Package]" << data_r << endl;
-           _consumer.consumePackage( _catalogId, data_r );
+           _consumer.consumePackage( _repositoryId, data_r );
           }
 
           void consumeSrcPkg( const data::SrcPackage_Ptr & data_r )
           {
             SEC << "[SrcPackage]" << data_r << endl;
-           _consumer.consumeSourcePackage( _catalogId, data_r );
+           _consumer.consumeSourcePackage( _repositoryId, data_r );
           }
 
           void consumePat( const data::Pattern_Ptr & data_r )
           {
             SEC << "[Pattern]" << data_r << endl;
-           _consumer.consumePattern( _catalogId, data_r );
+           _consumer.consumePattern( _repositoryId, data_r );
           }
          //@}
 

diff --git a/zypp2/parser/susetags/RepoParser.h b/zypp2/parser/susetags/RepoParser.h
index 04b7f1d..27c6596 100644 (file)
--- a/zypp2/parser/susetags/RepoParser.h
+++ b/zypp2/parser/susetags/RepoParser.h
@@ -49,7 +49,7 @@ namespace zypp
        *   Pathname reporoot( "lmd" );
        *
        *   cache::CacheStore store( dbdir );
-       *   data::RecordId catalogId = store.lookupOrAppendCatalog( Url("dir:///somewhere"), "/" );
+       *   data::RecordId catalogId = store.lookupOrAppendRepository( Url("dir:///somewhere"), "/" );
        *
        *   parser::susetags::RepoParser repo( catalogId, store );
        *   repo.parse( reporoot );

diff --git a/zypp2/parser/yum/YUMParser.h b/zypp2/parser/yum/YUMParser.h
index a66577a..84d6831 100644 (file)
--- a/zypp2/parser/yum/YUMParser.h
+++ b/zypp2/parser/yum/YUMParser.h
@@ -59,7 +59,7 @@ namespace zypp
    * \code
    * 
    * cache::CacheStore store(dbdir);
-   * data::RecordId repository_id = store.lookupOrAppendCatalog(sourceurl, "/");
+   * data::RecordId repository_id = store.lookupOrAppendRepository(sourceurl, "/");
    *
    * YUMParser parser(repository_id, store, &progress_function);
    * parser.start(source_cache_dir);