[Debtags-commits] [svn] r886 - debtags/trunk/src

[Enrico Zini]

Author: enrico
Date: Thu Jun 16 19:46:27 2005
New Revision: 886

Modified:
   debtags/trunk/src/debtags.cc
Log:
Ported to the more templatized libdebtags1

Modified: debtags/trunk/src/debtags.cc
==============================================================================
--- debtags/trunk/src/debtags.cc	(original)
+++ debtags/trunk/src/debtags.cc	Thu Jun 16 19:46:27 2005
@@ -96,7 +96,7 @@
 void readCollection(const string& file, TagcollConsumer<string, string>& output)
 	throw (FileException, ParserException)
 {
-	TrivialSerializer serializer;
+	Serializer<string, string> serializer;
 	if (file == "-")
 	{
 		StdioParserInput input(stdin, "<stdin>");
@@ -389,7 +389,7 @@
 class TODOFilter : public Tagcoll::TagcollFilter<Package, Tag>
 {
 protected:
-	DebtagsSerializer& ser;
+	Serializer<Package, Tag>& ser;
 	Tagexpr* expr;
 
 public:
@@ -413,7 +413,7 @@
 	}
 	virtual void consume(const Package& item, const OpSet<Tag>& tags) throw ()
 	{
-		if (item.state() != 0 && item.state() != 5 && expr->eval(ser.tagToString(tags)))
+		if (item.state() != 0 && item.state() != 5 && expr->eval(ser.tagsToStrings(tags)))
 			consumer->consume(item, tags);
 	}
 };
@@ -421,7 +421,7 @@
 class ExprCollector : public Tagcoll::TagcollConsumer<Package, Tag>, public PackageSet
 {
 protected:
-	DebtagsSerializer& ser;
+	Serializer<Package, Tag>& ser;
 	Tagexpr* expr;
 
 public:
@@ -445,7 +445,7 @@
 	}
 	virtual void consume(const Package& item, const OpSet<Tag>& tags) throw ()
 	{
-		if (expr->eval(ser.tagToString(tags)))
+		if (expr->eval(ser.tagsToStrings(tags)))
 			(*this) += item;
 	}
 };
@@ -453,7 +453,7 @@
 class StatsCollector : public Tagcoll::TagcollConsumer<Package, Tag>
 {
 protected:
-	DebtagsSerializer& ser;
+	Serializer<Package, Tag>& ser;
 	Tagexpr* expr;
 	int stat_seen;
 	int stat_onlynyt;
@@ -484,7 +484,7 @@
 	}
 	virtual void consume(const Package& item, const OpSet<Tag>& tags) throw ()
 	{
-		OpSet<string> stringTags = ser.tagToString(tags); 
+		OpSet<string> stringTags = ser.tagsToStrings(tags); 
 		if (tags.empty()) {
 			stat_notags++;
 		} else if (expr->eval(stringTags)) {
@@ -638,7 +638,7 @@
 		);
 
 		TagCollection<Package, Facet> coll;
-		TagToFacet tagStripper(&coll);
+		TagToFacet<Package> tagStripper(&coll);
 		Debtags::Environment::get().tagDB().outputPatched(tagStripper);
 		Facet f;
 		SmartHierarchyNode<Package, Facet> node(f, coll, 0);
@@ -823,8 +823,6 @@
 
 int outputGrepped(const string& expression, bool invertMatch, TagcollConsumer<string, string>& cons)
 {
-	TrivialSerializer tserializer;
-
 	// Build the grep filter chain
 	FilterChain<string, string> filters;
 	ExpressionFilter<string> filter;
@@ -1086,7 +1084,7 @@
 				wantTagDatabase();
 				string expression = args.next();
 
-				TrivialSerializer tserializer;
+				Serializer<string, string> tserializer;
 				TagcollSink<string, string> sink;
 				TextFormat<string, string> writer(tserializer, stdout);
 
@@ -1498,7 +1496,7 @@
 				wantTagDatabase();
 
 				FacetcollPrinter printer;
-				TagToFacet tagToFacet(&printer);
+				TagToFacet<Package> tagToFacet(&printer);
 				Debtags::Environment::get().tagDB().outputPatched(tagToFacet);
 				break;
 			}
@@ -1525,7 +1523,7 @@
 				// Copied from Debtags class: compute the toplevel facets
 				// TODO: use Debtags instead of Environment throughout all Debtags
 				TagCollection<Package, Facet> coll;
-				TagToFacet tagStripper(&coll);
+				TagToFacet<Package> tagStripper(&coll);
 				Debtags::Environment::get().tagDB().outputPatched(tagStripper);
 				Facet f;
 				SmartHierarchyNode<Package, Facet> node(f, coll, 0);