[Debtags-commits] [svn] r914 - tagcolledit/trunk/src

[Enrico Zini]

Author: enrico
Date: Sat Jun 18 15:58:02 2005
New Revision: 914

Modified:
   tagcolledit/trunk/src/Makefile.am
   tagcolledit/trunk/src/TagcollDocument.cc
   tagcolledit/trunk/src/instantiations.cc
Log:
Ported to libtagcoll 1.0.3

Modified: tagcolledit/trunk/src/Makefile.am
==============================================================================
--- tagcolledit/trunk/src/Makefile.am	(original)
+++ tagcolledit/trunk/src/Makefile.am	Sat Jun 18 15:58:02 2005
@@ -5,6 +5,7 @@
 tagcolledit_SOURCES = \
 	Environment.cc \
 	CommandlineParser.cc \
+	Serializer.cc \
 	Tag.cc \
 	TagSet.cc \
 	TagcollDocument.cc \

Modified: tagcolledit/trunk/src/TagcollDocument.cc
==============================================================================
--- tagcolledit/trunk/src/TagcollDocument.cc	(original)
+++ tagcolledit/trunk/src/TagcollDocument.cc	Sat Jun 18 15:58:02 2005
@@ -35,6 +35,7 @@
 #include <tagcoll/SerializationFilters.h>
 
 #include "Environment.h"
+#include "Serializer.h"
 
 #include <errno.h>
 
@@ -134,25 +135,11 @@
 		debug("Change had no effect\n");
 }
 
-class MySerializer : public Serializer<string, Tag>
-{
-protected:
-	FacetSet& vocab;
-
-public:
-	MySerializer(FacetSet& vocab) throw () : vocab(vocab) {} 
-
-	std::string tagToString(const Tag& tag) throw () { return tag.fullname(); }
-	Tag stringToTag(const std::string& tag) throw () { return vocab.obtainTag(tag); }
-	std::string itemToString(const std::string& item) throw () { return item; }
-	std::string stringToItem(const std::string& item) throw () { return item; }
-};
-
 template<class T>
 void TagcollDocument<T>::load(const string& file)
 	throw (FileException, ParserException)
 {
-	MySerializer serializer(_facets);
+	Serializer<string, Tag> serializer(_facets);
 	if (file == "-")
 	{
 		StdioParserInput in(stdin, "<stdin>");
@@ -186,7 +173,7 @@
 		throw FileException(errno, "opening file " + file);
 
 	// Output the collection, grouping the items
-	MySerializer serializer(_facets);
+	Serializer<string, Tag> serializer(_facets);
 	ItemGrouper<T, Tag> grouper;
 	output(grouper);
 

Modified: tagcolledit/trunk/src/instantiations.cc
==============================================================================
--- tagcolledit/trunk/src/instantiations.cc	(original)
+++ tagcolledit/trunk/src/instantiations.cc	Sat Jun 18 15:58:02 2005
@@ -2,7 +2,7 @@
 #define NOTESTS
 #define INSTANTIATING_TEMPLATES
 
-#include "Tag.h"
+#include "Serializer.h"
 
 #include <tagcoll/TagcollConsumer.cc>
 #include <tagcoll/TagcollFilter.cc>