* temporary fix for handling relative/absolute filenames in

  the inclusion mechanisms of dictionaries

diff --git a/helm/DEVEL/mathml_editor/src/TDictionary.cc b/helm/DEVEL/mathml_editor/src/TDictionary.cc
index 3cf2334876ded1f66367a302c558675c6c017f51..590a7db3093d7dd49975278fd04320f655eecd7a 100644 (file)
--- a/helm/DEVEL/mathml_editor/src/TDictionary.cc
+++ b/helm/DEVEL/mathml_editor/src/TDictionary.cc
@@ -8,19 +8,41 @@
 
 static TDictionary::Entry undefinedEntry;
 
+static std::string
+getURIBase(const std::string& uri)
+{
+  std::string::size_type slash = uri.rfind('/');
+  if (slash != std::string::npos) return uri.substr(0, slash + 1);
+  else return "";
+}
+
+static std::string
+getURIName(const std::string& uri)
+{
+  std::string::size_type slash = uri.rfind('/');
+  if (slash != std::string::npos) return uri.substr(slash + 1, uri.size());
+  else return uri;
+}
+
 void
 TDictionary::load(const std::string& uri)
 {
-  logger.debug("Dictionary: loading `" + uri + "'");
+  load(getURIName(uri), getURIBase(uri));
+}
+
+void
+TDictionary::load(const std::string& name, const std::string& base)
+{
+  logger.debug("Dictionary: loading `" + base + name + "'");
 
   DOM::DOMImplementation di;
-  DOM::Document doc = di.createDocumentFromURI(uri.c_str());
+  DOM::Document doc = di.createDocumentFromURI((base + name).c_str());
   assert(doc);
-  load(doc);
+  load(doc, base);
 }
 
 void
-TDictionary::load(const DOM::Document& doc)
+TDictionary::load(const DOM::Document& doc, const std::string& base)
 {
   assert(doc);
 
@@ -36,8 +58,14 @@ TDictionary::load(const DOM::Document& doc)
        DOM::Element el = p;
        assert(el);
        if (el.hasAttribute("href"))
-         // WARNING: this may result into an infinite loop!
-         load(std::string(el.getAttribute("href")));
+         {
+           // WARNING: this may result into an infinite loop!
+           std::string href = el.getAttribute("href");
+           std::string newBase = getURIBase(href);
+           std::string newName = getURIName(href);
+           if (newBase != "") load(newName, newBase);
+           else load(newName, base);
+         }
        else
          logger.warning("Dictionary: include statement with no href attribute (ignored)");
       }

diff --git a/helm/DEVEL/mathml_editor/src/TDictionary.hh b/helm/DEVEL/mathml_editor/src/TDictionary.hh
index 5349cf00475d5b9debee02353f1bfe2f80a24064..358481ee06728a86b541d9978de261d75cb7ff77 100644 (file)
--- a/helm/DEVEL/mathml_editor/src/TDictionary.hh
+++ b/helm/DEVEL/mathml_editor/src/TDictionary.hh
@@ -59,8 +59,9 @@ public:
     unsigned table : 1;
   };
 
-  void load(const std::string& uri);
-  void load(const DOM::Document& doc);
+  void load(const std::string&);
+  void load(const std::string&, const std::string&);
+  void load(const DOM::Document&, const std::string& = "");
   const Entry& find(const std::string&) const;
 
 private:

diff --git a/helm/DEVEL/mathml_editor/test/editor.cc b/helm/DEVEL/mathml_editor/test/editor.cc
index b22bd3beda42b021a979814678083699dce614a4..b251d4ede2ff8fe4988e0d37ef318375c90e592f 100644 (file)
--- a/helm/DEVEL/mathml_editor/test/editor.cc
+++ b/helm/DEVEL/mathml_editor/test/editor.cc
@@ -114,7 +114,7 @@ main(int argc, char* argv[])
 
   TDictionary dictionary(logger);
   logger.info("loading the dictionary...");
-  dictionary.load("dictionary-test.xml");
+  dictionary.load("/home/luca/projects/helm/DEVEL/mathml_editor/dictionary-test.xml");
 
   logger.info("loading the stylesheet...");
   DOM::DOMImplementation di;