[sword-app-changelog] SF.net SVN: sword-app:[451] sss/branches/sss-2/sss/config.py

[SVN c. m. f. t. SWORD-A. p. <swo...@li...>]

Revision: 451
          http://sword-app.svn.sourceforge.net/sword-app/?rev=451&view=rev
Author:   richard-jones
Date:     2012-01-15 23:37:11 +0000 (Sun, 15 Jan 2012)
Log Message:
-----------
add some null checking to class loader

Modified Paths:
--------------
    sss/branches/sss-2/sss/config.py

Modified: sss/branches/sss-2/sss/config.py
===================================================================
--- sss/branches/sss-2/sss/config.py	2012-01-15 16:30:27 UTC (rev 450)
+++ sss/branches/sss-2/sss/config.py	2012-01-15 23:37:11 UTC (rev 451)
@@ -1,6 +1,7 @@
 import os, uuid, sys, json
 from ingesters_disseminators import DefaultEntryIngester, DefaultDisseminator, FeedDisseminator, BinaryIngester, SimpleZipIngester, METSDSpaceIngester
 from negotiator import AcceptParameters, ContentType
+from core import SwordServer, Authenticator, WebUI
 
 from sss_logging import logging
 ssslog = logging.getLogger(__name__)
@@ -141,13 +142,22 @@
         # the json string.  How much does this matter?
     
     def get_server_implementation(self):
-        return self._get_class(self.sword_server)
+        if self.sword_server is not None:
+            return self._get_class(self.sword_server)
+        else:
+            return SwordServer
     
     def get_authenticator_implementation(self):
-        return self._get_class(self.authenticator)
+        if self.authenticator is not None:
+            return self._get_class(self.authenticator)
+        else:
+            return Authenticator
         
     def get_webui_implementation(self):
-        return self._get_class(self.webui)
+        if self.webui is not None:
+            return self._get_class(self.webui)
+        else:
+            return WebUI
     
     def get_container_formats(self):
         default_params = self._get_accept_params(self.container_format_default)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.