X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=odcread.cc;h=d2aa025e12713d516fa5355d7d4751a03c5a1a50;hb=123f20a45dc791d5566433a041155d44744b9a90;hp=4ba36802c058412591472bd9fb6c4af470c6a41f;hpb=d7f2452e20b04d1559b7bdd3aa49b6fbf7d0abaf;p=odcread.git

diff --git a/odcread.cc b/odcread.cc
index 4ba3680..d2aa025 100644
--- a/odcread.cc
+++ b/odcread.cc
@@ -1,6 +1,7 @@
 #include <iostream>
 #include <fstream>
 #include <string>
+#include <stack>
 
 #include <oberon.h>
 #include <reader.h>
@@ -8,6 +9,13 @@
 #include <textmodel.h>
 #include <visitor.h>
 
+// Character encoding conversions
+#include <langinfo.h> // determine the current charset
+#include <locale.h> // locale support
+#include <iconv.h> // charset conversions
+#include <errno.h> // error codes
+#include <string.h> // string descriptions of error codes
+
 namespace odc {
 	class Context {
 		public:
@@ -52,40 +60,88 @@ namespace odc {
 
 	class MyVisitor : public Visitor {
 		private:
-		std::vector<Context*> d_context;
+		std::stack<Context*> d_context;
 
 		void terminateContext() {
-			Context *c = *(d_context.end() - 1);
-			d_context.erase(d_context.end() - 1);
-			if (d_context.size() == 0) {
+			Context *c = d_context.top();
+			d_context.pop();
+			if (d_context.empty()) {
 				std::cout << c->getPlainText() << std::endl;
 			} else {
 				std::string text = c->getPlainText();
-				(*(d_context.end() - 1))->addPiece(text);
+				d_context.top()->addPiece(text);
 			}
 			delete c;
 		}
 		
 		public:
 		virtual void partStart() {
-			d_context.push_back(new PartContext());
+			d_context.push(new PartContext());
 		}
 		virtual void partEnd() {
 			terminateContext();
 		}
 		virtual void foldLeft(bool collapsed) {
-			d_context.push_back(new FoldContext(collapsed));
+			d_context.push(new FoldContext(collapsed));
 		}
 		virtual void foldRight() {
 			terminateContext();
 		}
+		char *getCharSet() {
+			return nl_langinfo(CODESET);
+		}
 		virtual void textShortPiece(const ShortPiece *piece) {
-			std::string text = piece->getText();
-			(*(d_context.end() - 1))->addPiece(text);
+			std::string str = convert((char *)piece->getBuffer(), piece->size() + 1, (char *)"ISO-8859-1", 1);
+			d_context.top()->addPiece(str);
 		}
 		virtual void textLongPiece(const LongPiece *piece) {
-			std::string text = piece->getText();
-			(*(d_context.end() - 1))->addPiece(text);
+			std::string str = convert((char *)piece->getBuffer(), piece->size() + 2, (char *)"UCS-2", 2);
+			d_context.top()->addPiece(str);
+		}
+
+		/**
+		 * Convert an input character buffer in the given encoding to the
+		 * locale's encoding.
+		 */
+		std::string convert(char *in, size_t bytesIn, char *encodingIn, size_t inBytesPerChar) {
+			// Convert from the input encoding to the locale's encoding
+			iconv_t conv = iconv_open(getCharSet(), encodingIn);
+
+			// Handle errors by throwing a readable message
+			if (conv == (iconv_t)-1) {
+				std::string str("iconv initialization error: ");
+				str += strerror(errno);
+				throw str.c_str();
+			}
+
+			// Assume at most 4 bytes per character are needed
+			size_t bytesOut = 4 * bytesIn / inBytesPerChar;
+
+			// Allocate the output buffer
+			char *out = new char[bytesOut];
+			char *outPtr = out;
+
+			// Perform conversion
+			size_t rval = iconv(conv, &in, &bytesIn, &outPtr, &bytesOut);
+			if (rval == (size_t)-1) {
+				std::string str("iconv error: ");
+				str += strerror(errno);
+				throw str.c_str();
+			}
+
+			// Free the iconv state
+			iconv_close(conv);
+
+			// Copy result into a std::string
+			std::string str(out);
+			delete out;
+
+			// Convert newlines
+			for (std::string::iterator it = str.begin(); it < str.end(); ++it) {
+				if (*it == '\r') *it = '\n';
+			}
+
+			return str;
 		}
 	};
 
@@ -110,13 +166,32 @@ int main(int argc, char *argv[]) {
 	if (argc < 2) {
 		return 1;
 	}
+
+	// Set the locale according to the terminal's environment
+	setlocale(LC_ALL, "");
+
 	std::ifstream in(argv[1], std::ios::in | std::ios::binary);
-	odc::Store* s = odc::importDocument(in);
+
+	odc::Store* s;
+	try {
+		s = odc::importDocument(in);
+	} catch (int trap) {
+		std::cerr << "Exception in parsing file: BlackBox trap no. " << trap << std::endl;
+		return 2;
+	} catch (const char * exception) {
+		std::cerr << "Exception in parsing file: " << exception << std::endl;
+		return 2;
+	}
 //	std::cout << s->toPlainText() << std::endl;
 //	std::cout << std::endl << std::endl;
 
-	odc::MyVisitor visitor;
-	s->accept(visitor);
+	try {
+		odc::MyVisitor visitor;
+		s->accept(visitor);
+	} catch (const char * exception) {
+		std::cerr << "Exception in processing document: " << exception << std::endl;
+		return 3;
+	}
 //	std::cout << s->toString() << std::endl;
 //	std::cout << in.tellg() << " " << in.eof() << std::endl;