[Debtags-commits] [svn] r1591 - in debtags/trunk: . tools

[Enrico Zini]

Author: enrico
Date: Sat Feb 18 14:53:47 2006
New Revision: 1591

Modified:
   debtags/trunk/   (props changed)
   debtags/trunk/tools/Printer.h
   debtags/trunk/tools/debtags.cc
Log:
 r7395 at viaza:  enrico | 2006-02-18 15:53:18 +0100
 Ported to libapt-front 1.6 (update function is still broken)


Modified: debtags/trunk/tools/Printer.h
==============================================================================
--- debtags/trunk/tools/Printer.h	(original)
+++ debtags/trunk/tools/Printer.h	Sat Feb 18 14:53:47 2006
@@ -110,8 +110,6 @@
 	typedef aptFront::cache::entity::Package Package;
 	typedef aptFront::cache::entity::Tag Tag;
 
-	Tagcoll::Converter<Package, std::string> fromitem;
-	Tagcoll::Converter<Tag, std::string> fromtag;
 	Tagcoll::TextFormat<Package, Tag> writer;
 
 	virtual void consumeItemUntagged(const Package& pkg)
@@ -124,7 +122,7 @@
 	}
 
 public:
-	TagcollPrinter() : writer(fromitem, fromtag, stdout) {}
+	TagcollPrinter() : writer(aptFront::cache::Global::get().packagestringconverter(), aptFront::cache::Global::get().tagstringconverter(), stdout) {}
 };
 
 class GroupedTagcollPrinter : public Printer<aptFront::cache::entity::Package, aptFront::cache::entity::Tag>
@@ -133,8 +131,6 @@
 	typedef aptFront::cache::entity::Package Package;
 	typedef aptFront::cache::entity::Tag Tag;
 
-	Tagcoll::Converter<Package, string> fromitem;
-	Tagcoll::Converter<Tag, string> fromtag;
 	Tagcoll::TextFormat<Package, Tag> writer;
 	Tagcoll::ItemGrouper<Package, Tag> grouper;
 
@@ -156,7 +152,7 @@
 	}
 
 public:
-	GroupedTagcollPrinter() : writer(fromitem, fromtag, stdout) {}
+	GroupedTagcollPrinter() : writer(aptFront::cache::Global::get().packagestringconverter(), aptFront::cache::Global::get().tagstringconverter(), stdout) {}
 
 	virtual void flush()
 	{

Modified: debtags/trunk/tools/debtags.cc
==============================================================================
--- debtags/trunk/tools/debtags.cc	(original)
+++ debtags/trunk/tools/debtags.cc	Sat Feb 18 14:53:47 2006
@@ -116,7 +116,7 @@
 void readCollection(const string& file, Tagcoll::Consumer<string, string>& output)
 	throw (FileException, ParserException)
 {
-	Tagcoll::Converter<string, string> conv;
+	Tagcoll::TrivialConverter<string, string> conv;
 	if (file == "-")
 	{
 		StdioParserInput input(stdin, "<stdin>");
@@ -1622,16 +1622,18 @@
 				string file = args.next();
 
 				InputMerger<entity::Package, Tag> coll;
-				Converter<string, Package> toitem;
-				Converter<string, Tag> totag;
-				readCollection(toitem, totag, file, coll);
+				readCollection(
+						Global::get().packagestringconverter(),
+						Global::get().tagstringconverter(),
+						file, coll);
 
 				PatchList<entity::Package, Tag> newpatches;
 				newpatches.addPatch(debtags.tagdb(), coll);
 
-				Converter<entity::Package, string> fromitem;
-				Converter<Tag, string> fromtag;
-				TextFormat<entity::Package, Tag>::outputPatch(fromitem, fromtag, newpatches, stdout);
+				TextFormat<entity::Package, Tag>::outputPatch(
+						Global::get().packagestringconverter(),
+						Global::get().tagstringconverter(),
+						newpatches, stdout);
 				break;
 			}
 			// maintainers
@@ -1739,10 +1741,11 @@
 				if (args.hasNext())
 				{
 					StdioParserInput in(args.next());
-					Converter<string, Package> toitem;
-					Converter<string, Tag> totag;
 					PatchList<entity::Package, Tag> patch =
-							TextFormat<entity::Package, Tag>::parsePatch(toitem, totag, in);
+							TextFormat<entity::Package, Tag>::parsePatch(
+								Global::get().packagestringconverter(),
+								Global::get().tagstringconverter(),
+								in);
 					debtags.sendPatch(patch);
 				}
 				else