zypper port starts. zypp2 to zypp

[platform/upstream/libzypp.git] / devel / devel.ma / Parse.cc

diff --git a/devel/devel.ma/Parse.cc b/devel/devel.ma/Parse.cc
index 61a311a..2556a71 100644 (file)
--- a/devel/devel.ma/Parse.cc
+++ b/devel/devel.ma/Parse.cc
@@ -29,7 +29,8 @@
 #include "zypp/parser/susetags/ContentFileReader.h"
 #include "zypp/parser/susetags/RepoIndex.h"
 
-#include "zypp2/parser/susetags/RepoParser.h"
+#include "zypp/parser/susetags/RepoParser.h"
+#include "zypp/cache/CacheStore.h"
 
 using namespace std;
 using namespace zypp;
@@ -133,7 +134,7 @@ namespace zypp
 ///////////////////////////////////////////////////////////////////
 
 using namespace zypp::parser::susetags;
-#include "zypp2/cache/CacheStore.h"
+#include "zypp/cache/CacheStore.h"
 
 void consumeIndex( const parser::susetags::RepoIndex_Ptr & index_r )
 {
@@ -186,6 +187,7 @@ void pPattern( const Pathname & p )
   tp.setConsumer( consumePat );
   tp.parse( p );
 }
+
  /******************************************************************
 **
 **      FUNCTION NAME : main
@@ -200,11 +202,11 @@ int main( int argc, char * argv[] )
   Pathname reporoot( "lmd" );
 
   cache::CacheStore store( dbdir );
-  data::RecordId catalogId = store.lookupOrAppendCatalog( Url("dir:///"), "/" );
+  data::RecordId repositoryId = store.lookupOrAppendRepository( Url("dir:///"), "/" );
   {
     Measure x( "XXXXXXXXXXXXX" );
 
-    parser::susetags::RepoParser repo( catalogId, store );
+    parser::susetags::RepoParser repo( repositoryId, store );
     repo.parse( reporoot );
 
     store.commit();
@@ -228,9 +230,9 @@ int main( int argc, char * argv[] )
     Pathname metadir( "lmd" );
 
     cache::CacheStore store( dbdir );
-    data::RecordId catalogId = store.lookupOrAppendCatalog( Url("http://www.google.com"), "/" );
+    data::RecordId repositoryId = store.lookupOrAppendRepository( Url("http://www.google.com"), "/" );
 
-    RepoParser( metadir, catalogId, store );
+    RepoParser( metadir, repositoryId, store );
 
   }
 
@@ -241,9 +243,9 @@ int main( int argc, char * argv[] )
       Pathname dbfile( "data.db" );
       cache::CacheStore store(getenv("PWD"));
 
-      data::RecordId catalog_id = store.lookupOrAppendCatalog( Url("http://www.google.com"), "/");
+      data::RecordId repository_id = store.lookupOrAppendRepository( Url("http://www.google.com"), "/");
 
-      PackagesParser parser( catalog_id, store);
+      PackagesParser parser( repository_id, store);
       Measure m;
       parser.start(argv[1], &progress_function);
       m.elapsed();