[Debtags-commits] [svn] r1350 - debtags/trunk/tools

[Enrico Zini]

Author: enrico
Date: Fri Sep  9 10:19:06 2005
New Revision: 1350

Removed:
   debtags/trunk/tools/Filters.cc
   debtags/trunk/tools/Filters.h
Modified:
   debtags/trunk/tools/Makefile.am
   debtags/trunk/tools/debtags.cc
   debtags/trunk/tools/instantiations.cc
Log:
Use the Filters from libapt-front


Modified: debtags/trunk/tools/Makefile.am
==============================================================================
--- debtags/trunk/tools/Makefile.am	(original)
+++ debtags/trunk/tools/Makefile.am	Fri Sep  9 10:19:06 2005
@@ -7,7 +7,6 @@
 	ChildProcess.cc \
 	CommandlineParser.cc \
 	Environment.cc \
-	Filters.cc \
 	acqprogress.cc \
 	instantiations.cc \
 	debtags.cc

Modified: debtags/trunk/tools/debtags.cc
==============================================================================
--- debtags/trunk/tools/debtags.cc	(original)
+++ debtags/trunk/tools/debtags.cc	Fri Sep  9 10:19:06 2005
@@ -33,6 +33,7 @@
 #include <apt-front/cache/component/tags.h>
 #include <apt-front/cache/component/debtags/expression.h>
 #include <apt-front/cache/component/debtags/update.h>
+#include <apt-front/cache/component/debtags/utils.h>
 #include <apt-front/cache/entity/tag.h>
 #include <apt-front/utils/paths.h>
 
@@ -42,11 +43,8 @@
 #include <tagcoll/InputMerger.h>
 #include <tagcoll/ItemGrouper.h>
 
-//#include <debtags/Filters.h>
-
 #include "Environment.h"
 #include "CommandlineParser.h"
-#include "Filters.h"
 #include "acqprogress.h"
 
 #include <apt-pkg/configuration.h>
@@ -90,6 +88,7 @@
 using namespace aptFront::cache;
 using namespace aptFront::cache::entity;
 using namespace aptFront::cache::component;
+using namespace aptFront::cache::component::debtags;
 using namespace Tagcoll;
 
 component::PackageTags& debtagsInit(bool write = false)
@@ -1416,16 +1415,16 @@
 					entity::Package pkg = packageByName(name);
 					if (pkg.valid())
 					{
-						string record = pkg.candidateVersion().completeRecord();
-						printf("%.*sTags: ", PFSTR(record));
+						cout << pkg.candidateVersion().completeRecord() << endl;
+						cout << "Tags: ";
 						OpSet<Tag> ts = debtags.tagdb().getTags(pkg);
 						for (OpSet<Tag>::const_iterator i = ts.begin();
 								i != ts.end(); i++)
 							if (i == ts.begin())
-								printf("%.*s", PFSTR(i->fullname()));
+								cout << i->fullname();
 							else
-								printf(", %.*s", PFSTR(i->fullname()));
-						printf("\n");
+								cout << ", " + i->fullname();
+						cout << endl;
 						return 0;
 					} else {
 						verbose("Package %.*s not found", PFSTR(name));

Modified: debtags/trunk/tools/instantiations.cc
==============================================================================
--- debtags/trunk/tools/instantiations.cc	(original)
+++ debtags/trunk/tools/instantiations.cc	Fri Sep  9 10:19:06 2005
@@ -1,11 +1,8 @@
 #define INSTANTIATING_TEMPLATES
 
-#include <apt-front/cache/entity/package.h>
 #include <apt-front/cache/entity/tag.h>
 
 #include <tagcoll/InputMerger.cc>
-#include <tagcoll/CardinalityStore.cc>
-#include <tagcoll/SmartHierarchy.cc>
 
 #include <string>
 
@@ -13,8 +10,6 @@
 
 using namespace aptFront::cache;
 
-template class InputMerger<std::string, entity::Tag>;
-template class CardinalityStore<entity::Package, entity::Facet>;
-template class SmartHierarchyNode<entity::Package, entity::Facet>;
+template class Tagcoll::InputMerger<std::string, entity::Tag>;
 
 // vim:set ts=4 sw=4: