summaryrefslogtreecommitdiff
path: root/src/cli
diff options
context:
space:
mode:
authorAndreas Stöckel <astoecke@techfak.uni-bielefeld.de>2015-02-15 22:57:47 +0100
committerAndreas Stöckel <astoecke@techfak.uni-bielefeld.de>2015-02-15 22:57:47 +0100
commit40f33ed35691c5052beaa98ca89c0f22ceb12666 (patch)
tree67e0ffa1763c9e63dc379466159d23627b7b9ca5 /src/cli
parentfa567345de49d5f8f14f6f613b207b8a3f5d8ce5 (diff)
Added (completely untested) osxml parser
Diffstat (limited to 'src/cli')
-rw-r--r--src/cli/Main.cpp12
1 files changed, 9 insertions, 3 deletions
diff --git a/src/cli/Main.cpp b/src/cli/Main.cpp
index 8d7893a..2658851 100644
--- a/src/cli/Main.cpp
+++ b/src/cli/Main.cpp
@@ -50,6 +50,7 @@
#include <plugins/filesystem/FileLocator.hpp>
#include <plugins/html/DemoOutput.hpp>
#include <formats/osxml/OsxmlParser.hpp>
+#include <formats/osml/OsmlParser.hpp>
#include <plugins/xml/XmlOutput.hpp>
const size_t ERROR_IN_COMMAND_LINE = 1;
@@ -209,11 +210,16 @@ int main(int argc, char **argv)
// fill registry
registry.registerDefaultExtensions();
- OsxmlParser xmlParser;
+ OsmlParser osmlParser;
+ OsxmlParser osxmlParser;
registry.registerParser(
- {"text/vnd.ousia.oxm", "text/vnd.ousia.oxd"},
+ {"text/vnd.ousia.osml"},
{&RttiTypes::Document, &RttiTypes::Domain, &RttiTypes::Typesystem},
- &xmlParser);
+ &osmlParser);
+ registry.registerParser(
+ {"text/vnd.ousia.osml+xml"},
+ {&RttiTypes::Document, &RttiTypes::Domain, &RttiTypes::Typesystem},
+ &osxmlParser);
registry.registerResourceLocator(&fileLocator);
// register search paths