[Debtags-commits] [svn] r1756 - in tagcoll/2.0: . tagcoll tools

[Enrico Zini]

Author: enrico
Date: Thu May 11 02:24:39 2006
New Revision: 1756

Added:
   tagcoll/2.0/tools/BasicStringDiskIndex.cc
   tagcoll/2.0/tools/BasicStringDiskIndex.h
Removed:
   tagcoll/2.0/tagcoll/BasicStringDiskIndex.cc
   tagcoll/2.0/tagcoll/BasicStringDiskIndex.h
Modified:
   tagcoll/2.0/   (props changed)
   tagcoll/2.0/tagcoll/Makefile.am
   tagcoll/2.0/tools/Makefile.am
   tagcoll/2.0/tools/tagidx.cc
Log:
 r2691 at viaza:  enrico | 2006-05-10 13:48:40 -0500
 Disabled compiling tagidx: it's not used now, disabling until there's a request for it


Modified: tagcoll/2.0/tagcoll/Makefile.am
==============================================================================
--- tagcoll/2.0/tagcoll/Makefile.am	(original)
+++ tagcoll/2.0/tagcoll/Makefile.am	Thu May 11 02:24:39 2006
@@ -41,8 +41,6 @@
 		TextFormat.h \
 		TextFormat.tcc \
 		\
-		BasicStringDiskIndex.h \
-		\
 		Implications.h \
 		Implications.tcc \
 		DerivedTags.h \
@@ -86,8 +84,6 @@
 		\
 		SmartHierarchy.cc
 
-#		BasicStringDiskIndex.cc \
-#		\
 #		CardinalityStore.cc \
 #		\
 #		experiments.cc

Modified: tagcoll/2.0/tools/Makefile.am
==============================================================================
--- tagcoll/2.0/tools/Makefile.am	(original)
+++ tagcoll/2.0/tools/Makefile.am	Thu May 11 02:24:39 2006
@@ -2,14 +2,15 @@
 
 TESTS = tagcoll-test
 
-bin_PROGRAMS = tagcoll tagidx
+bin_PROGRAMS = tagcoll
+# tagidx
 noinst_PROGRAMS = manpage
 
 tagcoll_SOURCES = tagcoll.cc
 tagcoll_LDADD = ../tagcoll/libtagcoll.la ../tagcoll/tagexpr/libtagexpr.la
 
-tagidx_SOURCES = tagidx.cc
-tagidx_LDADD = ../tagcoll/libtagcoll.la ../tagcoll/tagexpr/libtagexpr.la
+#tagidx_SOURCES = BasicStringDiskIndex.cc tagidx.cc
+#tagidx_LDADD = ../tagcoll/libtagcoll.la ../tagcoll/tagexpr/libtagexpr.la
 
 manpage_SOURCES = manpage.cc
 manpage_LDADD = ../tagcoll/libtagcoll.la ../tagcoll/tagexpr/libtagexpr.la

Modified: tagcoll/2.0/tools/tagidx.cc
==============================================================================
--- tagcoll/2.0/tools/tagidx.cc	(original)
+++ tagcoll/2.0/tools/tagidx.cc	Thu May 11 02:24:39 2006
@@ -36,10 +36,9 @@
 
 #include "TagidxParser.h"
 
-#include <tagcoll/BasicStringDiskIndex.h>
-#include <tagcoll/ItemGrouper.h>
-#include <tagcoll/Consumer.h>
-#include <tagcoll/PatchCollection.h>
+#include <BasicStringDiskIndex.h>
+#include <tagcoll/coll/fast.h>
+#include <tagcoll/coll/patched.h>
 
 #include <sys/stat.h>
 #include <sys/types.h>
@@ -50,7 +49,7 @@
 #include <stdlib.h>	// getenv
 #include <errno.h>
 
-#include <tagcoll/StdioParserInput.h>
+#include <tagcoll/input/stdio.h>
 #include <tagcoll/TextFormat.h>
 
 #include <iostream>
@@ -148,19 +147,18 @@
 }
 #endif
 
-void readCollection(const string& file, Consumer<string, string>& builder)
+template<typename OUT>
+void readCollection(const string& file, const OUT& out)
 {
-	TrivialConverter<string, string> conv;
-
 	if (file == "-")
 	{
-		StdioParserInput input(stdin, "<stdin>");
-		TextFormat<string, string>::parse(conv, conv, input, builder);
+		input::Stdio input(stdin, "<stdin>");
+		textformat::parse(input, out);
 	}
 	else
 	{
-		StdioParserInput input(file);
-		TextFormat<string, string>::parse(conv, conv, input, builder);
+		input::Stdio input(file);
+		textformat::parse(input, out);
 	}
 }