diff options
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/filesystem/FileLocator.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/filesystem/FileLocator.hpp | 2 | ||||
| -rw-r--r-- | src/plugins/html/DemoOutput.hpp | 8 | ||||
| -rw-r--r-- | src/plugins/xml/XmlOutput.cpp | 13 | ||||
| -rw-r--r-- | src/plugins/xml/XmlOutput.hpp | 4 |
5 files changed, 15 insertions, 16 deletions
diff --git a/src/plugins/filesystem/FileLocator.cpp b/src/plugins/filesystem/FileLocator.cpp index 2fd5483..994bbb9 100644 --- a/src/plugins/filesystem/FileLocator.cpp +++ b/src/plugins/filesystem/FileLocator.cpp @@ -103,8 +103,8 @@ void FileLocator::addDefaultSearchPaths(const std::string &relativeTo) // Add the search paths fs::path base{relativeTo}; addSearchPath(base.generic_string(), ResourceType::UNKNOWN); - addSearchPath((base / "domain").generic_string(), - ResourceType::DOMAIN_DESC); + addSearchPath((base / "ontology").generic_string(), + ResourceType::ONTOLOGY); addSearchPath((base / "typesystem").generic_string(), ResourceType::TYPESYSTEM); } diff --git a/src/plugins/filesystem/FileLocator.hpp b/src/plugins/filesystem/FileLocator.hpp index ad64db8..d1de6d0 100644 --- a/src/plugins/filesystem/FileLocator.hpp +++ b/src/plugins/filesystem/FileLocator.hpp @@ -116,7 +116,7 @@ public: * <li>The global application data directory used for make install * (default is /usr/local/share on UNIX)</li> * </ul> - * Resource type specific subdirectories (domain, typesytem, etc.) + * Resource type specific subdirectories (ontology, typesytem, etc.) * are automatically added to the aforementioned paths. */ void addDefaultSearchPaths(); diff --git a/src/plugins/html/DemoOutput.hpp b/src/plugins/html/DemoOutput.hpp index 4367202..b038a96 100644 --- a/src/plugins/html/DemoOutput.hpp +++ b/src/plugins/html/DemoOutput.hpp @@ -19,7 +19,7 @@ /** * @file DemoOutput.hpp * - * This implements a Demo HTML output for the following domains: + * This implements a Demo HTML output for the following ontologies: * * book * * headings * * emphasis @@ -67,18 +67,18 @@ public: * This writes a HTML representation of the given document to the given * output stream. Note that this method lacks the generality of our Ousia * approach with respect to two important points: - * 1.) It hardcodes the dependency to a certain set of domains in the C++ + * 1.) It hardcodes the dependency to a certain set of ontologies in the C++ * code. * 2.) It does not use the proposed pipeline of first copying the document * graph, then attaching style attributes and then transforming it to a * specific output format but does all of these steps at once. - * 3.) It does not use different transformers for the different domains but + * 3.) It does not use different transformers for the different ontologies but * does all transformations at once. * Therefore this is not an adequate model of our algorithms but only a * Demo. * * @param doc is a Document using concepts of the book, headings, - * emphasis and lists domains but no other. + * emphasis and lists ontologies but no other. * @param out is the output stream the data shall be written to. * @param pretty is a flag that manipulates whether newlines and tabs are * used. diff --git a/src/plugins/xml/XmlOutput.cpp b/src/plugins/xml/XmlOutput.cpp index ea1bc30..ffdecab 100644 --- a/src/plugins/xml/XmlOutput.cpp +++ b/src/plugins/xml/XmlOutput.cpp @@ -51,20 +51,19 @@ void XmlTransformer::writeXml(Handle<Document> doc, std::ostream &out, Manager &mgr = doc->getManager(); // the outermost tag is the document itself. Rooted<Element> document{new Element{mgr, {nullptr}, "document"}}; - // write imports for all referenced domains. - for (auto d : doc->getDomains()) { + // write imports for all referenced ontologies. + for (auto d : doc->getOntologys()) { Rooted<Element> import = - createImportElement(document, d, resourceManager, "domain"); + createImportElement(document, d, resourceManager, "ontology"); if (import != nullptr) { document->addChild(import); // add the import as namespace information to the document node as // well. document->getAttributes().emplace( - std::string("xmlns:") + d->getName(), - import->getAttributes()["src"]); + std::string("xmlns:") + d->getName(), d->getName()); } else { logger.warning(std::string( - "The location of domain \"" + d->getName() + + "The location of ontology \"" + d->getName() + "\" could not be retrieved using the given ResourceManager.")); } } @@ -200,7 +199,7 @@ Rooted<Element> XmlTransformer::transformStructuredEntity( Rooted<Element> elem{ new Element{mgr, parent, s->getDescriptor()->getName(), transformAttributes(s->getName(), s.get(), logger, pretty), - s->getDescriptor()->getParent().cast<Domain>()->getName()}}; + s->getDescriptor()->getParent().cast<Ontology>()->getName()}}; // then transform the children. transformChildren(s.get(), elem, logger, pretty); return elem; diff --git a/src/plugins/xml/XmlOutput.hpp b/src/plugins/xml/XmlOutput.hpp index da406a7..55c1c67 100644 --- a/src/plugins/xml/XmlOutput.hpp +++ b/src/plugins/xml/XmlOutput.hpp @@ -62,7 +62,7 @@ public: /** * This writes an XML serialization of the given document to the given * output stream. The serialization is equivalent to the input XML format, - * safe for the domain references. TODO: Can we change this? If so: how? + * safe for the ontology references. TODO: Can we change this? If so: how? * Note, though, that the serialization will not exploit transparency. * TODO: Can we change that? * @@ -70,7 +70,7 @@ public: * @param out is the output stream the XML serialization of the document * shall be written to. * @param logger is the logger errors shall be written to. - * @param resMgr is the ResourceManager to locate the domains and + * @param resMgr is the ResourceManager to locate the ontologies and * typesystems that were imported in this document. * @param pretty is a flag that manipulates whether newlines and tabs are * used. |