Improved the way file:// URI-s are used in the final graph. Although …

…this change does not seem to affect the usage within RDFLib, it is important for the separate RDFLib/pyRdfa package and it is better to have the sources synchronised...

pyRdfa/__init__.py

@@ -155,7 +155,7 @@
 """
 
 """
- $Id: __init__.py,v 1.84 2012-11-27 14:18:46 ivan Exp $
+ $Id: __init__.py,v 1.87 2012-12-26 12:30:39 ivan Exp $
 """
 
 __version__ = "3.4.3"
@@ -433,7 +433,6 @@ def _get_input(self, name) :
 						self.required_base = name
 					return url_request.data
 				else :
-					self.base = name
 					# Creating a File URI for this thing
 					if self.required_base == None :
 						self.required_base = "file://" + os.path.join(os.getcwd(),name)
@@ -488,15 +487,16 @@ def copyGraph(tog, fromg) :
 
 		# Create the initial state. This takes care of things
 		# like base, top level namespace settings, etc.
-		state = ExecutionContext(topElement, default_graph, base=self.base, options=self.options, rdfa_version=self.rdfa_version)
+		state = ExecutionContext(topElement, default_graph, base=self.required_base if self.required_base != None else "", options=self.options, rdfa_version=self.rdfa_version)
+		#state = ExecutionContext(topElement, default_graph, base=self.base, options=self.options, rdfa_version=self.rdfa_version)
 
 		# Perform the built-in and external transformations on the HTML tree. 
 		for trans in self.options.transformers + builtInTransformers :
 			trans(topElement, self.options, state)
 
 		# This may have changed if the state setting detected an explicit version information:
 		self.rdfa_version = state.rdfa_version
-				
+
 		# The top level subject starts with the current document; this
 		# is used by the recursion
 		# this function is the real workhorse

pyRdfa/options.py

@@ -11,7 +11,7 @@
 """
 
 """
-$Id: options.py,v 1.17 2012/11/16 17:51:53 ivan Exp $ $Date: 2012/11/16 17:51:53 $
+$Id: options.py,v 1.18 2012-12-26 12:28:57 ivan Exp $ $Date: 2012-12-26 12:28:57 $
 """
 
 import sys, datetime