X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=textmodel.cc;h=977bd447e35ecca8efd0b71617597f709577771b;hb=cf035fa1849a5e65c0d636ce2718bc2c85994680;hp=281042002423e99527fa8677237c2f6034d93ff0;hpb=9199c6da801c1555dadb23b230b400e3f1364abc;p=odcread.git

diff --git a/textmodel.cc b/textmodel.cc
index 2810420..977bd44 100644
--- a/textmodel.cc
+++ b/textmodel.cc
@@ -89,8 +89,8 @@ void StdTextModel::internalize(Reader &reader) {
 //				INC(org, len) -- increment org by len ?
 		} else { // embedded view
 			//std::cout << "Found View piece" << std::endl;
-			reader.readInt(); reader.readInt();
-			Store *view = reader.readStore(); // fixme: save somewhere
+			reader.readInt(); reader.readInt(); // view width + height: ignore
+			Store *view = reader.readStore();
 //				NEW(v); v.len := 1; v.attr := attr;
 //				rd.ReadInt(v.w); rd.ReadInt(v.h); Views.ReadView(rd, v.view);
 //				v.view.InitContext(NewContext(v, t));
@@ -157,37 +157,60 @@ std::string StdTextModel::toString() {
 	return sofar + "}";
 }
 
+std::string StdTextModel::toPlainText() {
+	std::string sofar = "";
+	for (int i = 0; i < d_pieces.size(); ++i) {
+		sofar += d_pieces[i]->toPlainText();
+	}
+	return sofar;
+}
+
 TextPiece::TextPiece(size_t len): d_len(len) {}
 
 LongPiece::LongPiece(size_t len): TextPiece(len) {}
 
+LongPiece::~LongPiece() {
+	delete d_buf;
+}
+
 void LongPiece::read(Reader &reader) {
-	CHAR *buf = new CHAR[d_len];
-	reader.readLChar(buf, d_len);
-	delete buf;
+	d_buf = new CHAR[d_len];
+	reader.readLChar(d_buf, d_len);
 }
 
 std::string LongPiece::toString() {
-	return std::string("LongPiece");
+	return std::string("LongPiece(FIXME)");// + std::wstring((wchar_t*)d_buf) + std::string(")");
+}
+
+std::string LongPiece::toPlainText() {
+	return std::string("FIXME");// + std::wstring((wchar_t*)d_buf) + std::string(")");
 }
 
 ShortPiece::ShortPiece(size_t len): TextPiece(len) {}
 
+ShortPiece::~ShortPiece() {
+	delete d_buf;
+}
+
 void ShortPiece::read(Reader &reader) {
 //	static char piece[] = "pieceA";
-	SHORTCHAR *buf = new SHORTCHAR[d_len + 1];
-	reader.readSChar(buf, d_len);
-	buf[d_len] = 0;
-	std::cout.write(buf, d_len);
+	d_buf = new SHORTCHAR[d_len + 1];
+	reader.readSChar(d_buf, d_len);
+	d_buf[d_len] = 0;
+//	std::cout.write(buf, d_len);
 //	std::ofstream ofs(piece, std::ios::out);
 //	ofs.write(buf, d_len);
 //	ofs.close();
 //	++piece[5];
-	delete buf;
+//	delete buf;
 }
 
 std::string ShortPiece::toString() {
-	return std::string("ShortPiece");
+	return std::string("ShortPiece(") + std::string(d_buf) + std::string(")");
+}
+
+std::string ShortPiece::toPlainText() {
+	return std::string(d_buf);
 }
 
 ViewPiece::ViewPiece(Store *view): TextPiece(0), d_view(view) {}
@@ -200,4 +223,8 @@ std::string ViewPiece::toString() {
 	return std::string("ViewPiece { ") + d_view->toString() + " }";
 }
 
+std::string ViewPiece::toPlainText() {
+	return d_view->toPlainText();
+}
+
 } // namespace odc