diff --git a/CMakeLists.txt b/CMakeLists.txt index f7fe7ba4061e0b124c1e69bd6309a081c0c35281..5b329ab0caf427509c5aa310a686a1c56e8f6fd4 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 36f821aeb416a05793e2cf46dc261489b01ff2e4..c11759aa8cb6db066e490720c077972aad6e97d0 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 6b9265c8ec9132561896966767a423115bce10f6..886c5ea275ad59efeea12e7449fe2a3b3802a18b 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();