[sword-app-changelog] SF.net SVN: sword-app:[460] sss/branches/sss-2/sss

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

Revision: 460
          http://sword-app.svn.sourceforge.net/sword-app/?rev=460&view=rev
Author:   richard-jones
Date:     2012-01-22 21:22:35 +0000 (Sun, 22 Jan 2012)
Log Message:
-----------
improve logging and import Namespaces object in the __init__ script

Modified Paths:
--------------
    sss/branches/sss-2/sss/__init__.py
    sss/branches/sss-2/sss/core.py

Modified: sss/branches/sss-2/sss/__init__.py
===================================================================
--- sss/branches/sss-2/sss/__init__.py	2012-01-22 18:04:24 UTC (rev 459)
+++ sss/branches/sss-2/sss/__init__.py	2012-01-22 21:22:35 UTC (rev 460)
@@ -2,7 +2,7 @@
 
 from core import Auth, AuthException, Authenticator, DeleteRequest, DeleteResponse, DepositRequest, DepositResponse, EntryDocument, SDCollection, SWORDRequest, ServiceDocument, Statement, SwordError, SwordServer, WebUI
 from config import Configuration, SSS_CONFIG_FILE
-from spec import Errors, HttpHeaders
+from spec import Errors, HttpHeaders, Namespaces
 
 import ingesters_disseminators
 import negotiator

Modified: sss/branches/sss-2/sss/core.py
===================================================================
--- sss/branches/sss-2/sss/core.py	2012-01-22 18:04:24 UTC (rev 459)
+++ sss/branches/sss-2/sss/core.py	2012-01-22 21:22:35 UTC (rev 460)
@@ -923,15 +923,15 @@
         
         # now check that all those uris tie up:
         if describes_uri != aggregation_uri:
-            ssslog.info("Validation of Ore Statement failed; ore:describes URI does not match Aggregation URI: " +
-                        str(describes_uri) + " != " + str(aggregation_uri))
+            ssslog.info("Validation of RDF as valid ReM failed; ore:describes URI does not match Aggregation URI: " +
+                        str(describes_uri) + " != " + str(aggregation_uri) + " (this is non fatal, don't panic)")
             valid = False
         if rem_uri not in is_described_by_uris:
-            ssslog.info("Validation of Ore Statement failed; Resource Map URI does not match one of ore:isDescribedBy URIs: " + 
-                        str(rem_uri) + " not in " + str(is_described_by_uris))
+            ssslog.info("Validation of RDF as valid ReM failed; Resource Map URI does not match one of ore:isDescribedBy URIs: " + 
+                        str(rem_uri) + " not in " + str(is_described_by_uris) + " (this is non fatal, don't panic)")
             valid = False
         
-        ssslog.info("Statement validation; was it a success? " + str(valid))
+        ssslog.info("Was supplied RDF a ReM? " + str(valid))
         return valid
 
     def _get_aggregation_element(self, rdf):
@@ -953,6 +953,8 @@
         Get an lxml Element object back representing this statement
         """
 
+        ssslog.debug("Merging with supplied RDF string: " + existing_rdf_as_string)
+
         # first parse in the existing rdf if necessary
         rdf = None
         aggregation = None

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