added plugin parameters for loading specified xml and dtd file

git-svn-id: file:///home/tobias/sandbox/vdr/--/vdr-pkg/vdr-pkg/submenu/trunk@5693 cd0d6b48-d4f9-0310-940f-ab8c4eb44d3f

1 files changed, 5 insertions, 8 deletions

diff --git a/src/xmlmenu.cpp b/src/xmlmenu.cpp
index b7d4ae7..99581c1 100644
--- a/src/xmlmenu.cpp
+++ b/src/xmlmenu.cpp
@@ -32,22 +32,19 @@
 using namespace xmlpp;
 using namespace std;
 
-MenuNode* XmlMenu::LoadXmlMenu(string menuFileName)
+MenuNode* XmlMenu::LoadXmlMenu(string menuFileName, string schemaFileName)
 { 
     MenuNode* menuRoot = new MenuNode();
 
     try
     {
-        DomParser parser;
+        dsyslog("loading menuorg config file from %s and schema from %s",menuFileName, schemaFileName);
 
-        //TODO: patch the xmlfile with the xsd definition for validate the schema
-        //parser.set_validate();
+        DomParser parser;
         parser.set_substitute_entities(); //We just want the text to be resolved/unescaped automatically.
-//        parser.parse_file(menuFileName);
-        parser.parse_file("/var/lib/vdr/plugins/menuorg.xml");
+        parser.parse_file(menuFileName);
 
-        //DtdValidator validator( dtdFileName );
-        DtdValidator validator( "/var/lib/vdr/plugins/menuorg.dtd" );
+        DtdValidator validator(schemaFileName);
         Document *pDoc = parser.get_document();
         validator.validate( pDoc );