Merge branch 'master' of nlp.pwr.wroc.pl:corpus2

poliqarp/pqclient.cpp

@@ -147,7 +147,9 @@ Token* PoliqarpClient::get_token(size_t pos)
 		poliqarp_get_interpretation(&set, &interp, i);
 		poliqarp_get_interpretation_info(&interp, &iinfo);
 		Tag tag = tagset_.parse_simple_tag(iinfo.tag);
-		res->add_lexeme(Lexeme(UnicodeString::fromUTF8(iinfo.base), tag));
+		Lexeme lex = Lexeme(UnicodeString::fromUTF8(iinfo.base), tag);
+		lex.set_disamb(interp.disamb);
+		res->add_lexeme(lex);
 	}
 	return res.release();
 }

swig/tagset.i

@@ -107,6 +107,11 @@ namespace Corpus2 {
 
     std::string id_string() const;
     std::string id_string(const Tag& tag) const;
+
+    const std::string& get_value_name(int index) const;
+    const std::string& get_attribute_name(int index) const;
+    const std::string& get_pos_name(int index) const;
+
   };
 }