Improve config parsing.

diff --git a/src/core/JubConfig.h b/src/core/JubConfig.h
index 00173fa56a03f92da5d4b7c63eae54f3d115ddca..8e8e6ae86b2720812ffe2cbb35eacc7b476eaa2b 100644 (file)
--- a/src/core/JubConfig.h
+++ b/src/core/JubConfig.h
@@ -2,7 +2,7 @@
 
 #define CONFIG_NS @"http://babelmonkeys.de/jubjub/config"
 
-@interface JubConfig : OFObject <OFXMLElementBuilderDelegate>
+@interface JubConfig : OFObject
 {
        OFString *domain, *server;
        OFString *username;

diff --git a/src/core/JubConfig.m b/src/core/JubConfig.m
index 33fe2c5d82f33ac3a6f84e1681c31304291b3f9c..a3f11960ac064d6d5c9fdaf0e12511fa61575666 100644 (file)
--- a/src/core/JubConfig.m
+++ b/src/core/JubConfig.m
@@ -11,14 +11,29 @@
 
        @try {
                OFAutoreleasePool *pool = [OFAutoreleasePool new];
-               OFXMLParser *parser = [OFXMLParser parser];
-               OFXMLElementBuilder *builder =
-                   [OFXMLElementBuilder elementBuilder];
-
-               parser.delegate = builder;
-               builder.delegate = self;
-
-               [parser parseFile: file];
+               OFXMLElement *element = [OFXMLElement elementWithFile: file];
+
+               if (![element.name isEqual: @"config"] ||
+                   ![element.namespace isEqual: CONFIG_NS]) {
+                       // TODO: load default config
+                       [pool release];
+                       return self;
+               }
+
+               // TODO: Add error handling for missing elements
+               of_log(@"Parsed file: %@", element);
+               domain = [[[element
+                   elementForName: @"domain"
+                        namespace: CONFIG_NS] stringValue] copy];
+               server = [[[element
+                   elementForName: @"server"
+                        namespace: CONFIG_NS] stringValue] copy];
+               username = [[[element
+                   elementForName: @"username"
+                        namespace: CONFIG_NS] stringValue] copy];
+               password = [[[element
+                   elementForName: @"password"
+                        namespace: CONFIG_NS] stringValue] copy];
 
                [pool release];
        } @catch (id e) {
@@ -38,19 +53,4 @@
 
        [super dealloc];
 }
-
-- (void)elementBuilder: (OFXMLElementBuilder*)builder
-       didBuildElement: (OFXMLElement*)element
-{
-       // TODO: At error handling for missing elements
-       of_log(@"Parsed file: %@", element);
-       domain = [[[element elementForName: @"domain"
-                                namespace: CONFIG_NS] stringValue] copy];
-       server = [[[element elementForName: @"server"
-                                namespace: CONFIG_NS] stringValue] copy];
-       username = [[[element elementForName: @"username"
-                                  namespace: CONFIG_NS] stringValue] copy];
-       password = [[[element elementForName: @"password"
-                                  namespace: CONFIG_NS] stringValue] copy];
-}
 @end