Pass/save full header/metadata element to PyOAI object

src/oaipmh/client.py

@@ -326,7 +326,7 @@ def buildHeader(header_node, namespaces):
         str(e('string(oai:datestamp/text())')))
     setspec = [str(s) for s in e('oai:setSpec/text()')]
     deleted = e("@status = 'deleted'") 
-    return common.Header(identifier, datestamp, setspec, deleted)
+    return common.Header(header_node, identifier, datestamp, setspec, deleted)
 
 def ResumptionListGenerator(firstBatch, nextBatch):
     result, token = firstBatch()

src/oaipmh/common.py

@@ -3,17 +3,21 @@
 from oaipmh import error
 
 class Header(object):
-    def __init__(self, identifier, datestamp, setspec, deleted):
+    def __init__(self, element, identifier, datestamp, setspec, deleted):
+        self._element = element
         # force identifier to be a string, it might be 
         # an lxml.etree._ElementStringResult...
         self._identifier = str(identifier)
         self._datestamp = datestamp
         self._setspec = setspec
         self._deleted = deleted
-
+
+    def element(self):
+        return self._element
+
     def identifier(self):
         return self._identifier
-    
+
     def datestamp(self):
         return self._datestamp
 
@@ -24,12 +28,16 @@ def isDeleted(self):
         return self._deleted
 
 class Metadata(object):
-    def __init__(self, map):
+    def __init__(self, element, map):
+        self._element = element
         self._map = map
 
+    def element(self):
+        return self._element
+
     def getMap(self):
         return self._map
-    
+
     def getField(self, name):
         return self._map[name]
 

src/oaipmh/metadata.py

@@ -80,7 +80,7 @@ def __call__(self, element):
             else:
                 raise Error, "Unknown field type: %s" % field_type
             map[field_name] = value
-        return common.Metadata(map)
+        return common.Metadata(element, map)
 
 oai_dc_reader = MetadataReader(
     fields={