From 036c4433a3f351dd9e9ce04efc4245d3f66de0a6 Mon Sep 17 00:00:00 2001
From: Adam Radziszewski <adam.radziszewski@pwr.wroc.pl>
Date: Fri, 21 Jun 2013 15:11:21 +0200
Subject: [PATCH] rm autogen params from CCLReader since every reader now does
autogen
---
CMakeLists.txt | 2 +-
libcorpus2/io/cclreader.cpp | 24 ++----------------------
libcorpus2/io/cclreader.h | 6 ++----
3 files changed, 5 insertions(+), 27 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f7fe7ba..5b329ab 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,7 +2,7 @@ PROJECT(Corpus2Library)
set(corpus2_ver_major "1")
set(corpus2_ver_minor "5")
-set(corpus2_ver_patch "0")
+set(corpus2_ver_patch "1")
cmake_minimum_required(VERSION 2.8.0)
diff --git a/libcorpus2/io/cclreader.cpp b/libcorpus2/io/cclreader.cpp
index 36f821a..c11759a 100644
--- a/libcorpus2/io/cclreader.cpp
+++ b/libcorpus2/io/cclreader.cpp
@@ -40,24 +40,6 @@ public:
~CclReaderImpl();
- void set_autogen_sent_id(bool) {
- // won't work
- // now this is always true for each reader
- }
-
- bool get_autogen_sent_id() const {
- return true; // always true by design
- }
-
- void set_autogen_chunk_id(bool) {
- // won't work
- // left for backwards compatibility
- }
-
- bool get_autogen_chunk_id() const {
- return true; // always true by design
- }
-
protected:
bool process_start_element(const Glib::ustring & name,
const AttributeList& attributes);
@@ -92,8 +74,7 @@ protected:
};
CclReader::CclReader(const Tagset& tagset, std::istream& is,
- bool disamb_only, bool disamb_sh, bool autogen_sent_id,
- bool autogen_chunk_id)
+ bool disamb_only, bool disamb_sh)
: BufferedChunkReader(tagset),
impl_(new CclReaderImpl(*this, chunk_buf_, disamb_only, disamb_sh))
{
@@ -101,8 +82,7 @@ CclReader::CclReader(const Tagset& tagset, std::istream& is,
}
CclReader::CclReader(const Tagset& tagset, const std::string& filename,
- bool disamb_only, bool disamb_sh, bool autogen_sent_id,
- bool autogen_chunk_id)
+ bool disamb_only, bool disamb_sh)
: BufferedChunkReader(tagset),
impl_(new CclReaderImpl(*this, chunk_buf_, disamb_only, disamb_sh))
{
diff --git a/libcorpus2/io/cclreader.h b/libcorpus2/io/cclreader.h
index 6b9265c..886c5ea 100644
--- a/libcorpus2/io/cclreader.h
+++ b/libcorpus2/io/cclreader.h
@@ -31,12 +31,10 @@ class CclReader : public BufferedChunkReader
{
public:
CclReader(const Tagset& tagset, std::istream& is,
- bool disamb_only = false, bool disamb_sh = false,
- bool autogen_sent_id = false, bool autogen_chunk_id_ = false);
+ bool disamb_only = false, bool disamb_sh = false);
CclReader(const Tagset& tagset, const std::string& filename,
- bool disamb_only = false, bool disamb_sh = false,
- bool autogen_sent_id = false, bool autogen_chunk_id_ = false);
+ bool disamb_only = false, bool disamb_sh = false);
~CclReader();
--
GitLab