From 708b5372fb1afe4775691a2f96b3aeee0685562e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20K=C4=99dzia?= <Pawel.Kedzia@pwr.wroc.pl>
Date: Thu, 29 Dec 2011 13:45:18 +0100
Subject: [PATCH] Fix poliqarpcorpusreader/poliqarpdocumentreader
---
libcorpus2_whole/io/poliqarpcorpusreader.cpp | 5 ++++-
libcorpus2_whole/io/poliqarpdocumentreader.cpp | 4 +++-
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/libcorpus2_whole/io/poliqarpcorpusreader.cpp b/libcorpus2_whole/io/poliqarpcorpusreader.cpp
index 2bf5786..acc6e36 100644
--- a/libcorpus2_whole/io/poliqarpcorpusreader.cpp
+++ b/libcorpus2_whole/io/poliqarpcorpusreader.cpp
@@ -17,7 +17,10 @@ boost::shared_ptr<Corpus> PoliqarpCorpusReader::read(const std::string& corpus_f
this->pq_doc_reader_ = boost::shared_ptr<PoliqarpDocumentReader>(
new PoliqarpDocumentReader(tagset_, corpus_file));
- while ((doc = this->pq_doc_reader_->read())) {
+ while (1) {
+ if (!(doc = this->pq_doc_reader_->read())) {
+ break;
+ }
corpus->add_document(doc);
}
diff --git a/libcorpus2_whole/io/poliqarpdocumentreader.cpp b/libcorpus2_whole/io/poliqarpdocumentreader.cpp
index 62953d7..8e41832 100644
--- a/libcorpus2_whole/io/poliqarpdocumentreader.cpp
+++ b/libcorpus2_whole/io/poliqarpdocumentreader.cpp
@@ -12,9 +12,11 @@ PoliqarpDocumentReader::PoliqarpDocumentReader(const Tagset& tagset, const std::
boost::shared_ptr<Document> PoliqarpDocumentReader::read()
{
- boost::shared_ptr<Document> document = boost::make_shared<Document>();
+ boost::shared_ptr<Document> document;
boost::shared_ptr<Chunk> chunk = this->pqr_->get_next_chunk();
+
if (chunk) {
+ document = boost::make_shared<Document>();
document->add_paragraph(chunk);
}
return document;
--
GitLab