removed dtd command parameters

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

4 files changed, 7 insertions, 18 deletions

diff --git a/src/menuconfiguration.cpp b/src/menuconfiguration.cpp
index a25c56c..0c0d7b4 100644
--- a/src/menuconfiguration.cpp
+++ b/src/menuconfiguration.cpp
@@ -40,13 +40,13 @@ const string MenuConfiguration::_dtd =
   "<!ELEMENT plugin EMPTY>\n"
   "<!ATTLIST plugin name CDATA #REQUIRED>\n";
 
-MenuNode* MenuConfiguration::LoadMenu(string menuFileName, string schemaFileName)
+MenuNode* MenuConfiguration::LoadMenu(string menuFileName)
 { 
     MenuNode* menuRoot = new MenuNode();
 
     try
     {
-        dsyslog("loading menuorg config file from %s and schema from %s", menuFileName.c_str(), schemaFileName.c_str());
+        dsyslog("loading menuorg config file from %s", menuFileName.c_str());
 
         DomParser parser;
         parser.set_substitute_entities();
diff --git a/src/menuconfiguration.h b/src/menuconfiguration.h
index 65ac1d3..b992ac2 100644
--- a/src/menuconfiguration.h
+++ b/src/menuconfiguration.h
@@ -33,9 +33,9 @@ class MenuConfiguration
 {
     private:
         static const std::string _dtd;
-    
+
     public:
-        MenuNode* LoadMenu(std::string menuFileName, std::string schemaFileName);
+        MenuNode* LoadMenu(std::string menuFileName);
 
     private:
         void ParseElement(const xmlpp::Element* a_node, MenuNode* menuNode);
diff --git a/src/menuorg.cpp b/src/menuorg.cpp
index ce15527..3cdea25 100644
--- a/src/menuorg.cpp
+++ b/src/menuorg.cpp
@@ -67,9 +67,7 @@ const char* MenuOrgPlugin::MainMenuEntry(void)
 const char *MenuOrgPlugin::CommandLineHelp(void)
 {
     return " -c FILE   --config=FILE   loads the specified xml file\n"
-           "                           (default: ConfigDir/plugins/menuorg.xml)\n"
-           " -s FILE   --schema=FILE   loads the specified schema file\n"
-           "                           (default: ConfigDir/plugins/menuorg.dtd)\n";
+           "                           (default: ConfigDir/plugins/menuorg.xml)\n";
 }
 
 bool MenuOrgPlugin::ProcessArgs(int argc, char *argv[])
@@ -77,7 +75,6 @@ bool MenuOrgPlugin::ProcessArgs(int argc, char *argv[])
     static struct option longOptions[] =
     {
         { "config", required_argument, NULL, 'c'},
-        { "schema", required_argument, NULL, 's'},
         { NULL}
     };
 
@@ -86,7 +83,7 @@ bool MenuOrgPlugin::ProcessArgs(int argc, char *argv[])
 
     int optionChar;
     int optionIndex = 0;
-    while ((optionChar = getopt_long(argc, argv, "c:s:", longOptions, &optionIndex)) != -1)
+    while ((optionChar = getopt_long(argc, argv, "c:", longOptions, &optionIndex)) != -1)
     {
         switch (optionChar)
         {
@@ -94,10 +91,6 @@ bool MenuOrgPlugin::ProcessArgs(int argc, char *argv[])
                 configFile = optarg;
                 break;
 
-            case 's':
-                schemaFile = optarg;
-                break;
-
             default:
                 cerr << argv[0] << ": " << "invalid option " <<  argv[optind-1] << endl;
                 return false;
@@ -113,10 +106,7 @@ bool MenuOrgPlugin::Initialize(void)
     if(configFile.empty())
         configFile = (string) ConfigDirectory() + "/menuorg.xml";
 
-    if(schemaFile.empty())
-        schemaFile = (string) ConfigDirectory() + "/menuorg.dtd";
-
-    MenuNode* menu = menuConfiguration.LoadMenu(configFile, schemaFile);
+    MenuNode* menu = menuConfiguration.LoadMenu(configFile);
     if (menu)
     {
         _subMenuProvider = new MainMenuItemsProvider(menu);
diff --git a/src/menuorg.h b/src/menuorg.h
index 1bea63e..250fb28 100644
--- a/src/menuorg.h
+++ b/src/menuorg.h
@@ -35,7 +35,6 @@ class MenuOrgPlugin : public cPlugin
     private:
         MainMenuItemsProvider* _subMenuProvider;
         string configFile;
-        string schemaFile;
 
     public:
         MenuOrgPlugin(void);