[tools] Use doc.origin_filename accessors

Author: mpsonntag

odml/tools/odmlparser.py

@@ -186,7 +186,7 @@ def from_file(self, file, doc_format=None):
             par = DictReader(show_warnings=self.show_warnings)
             self.doc = par.to_odml(self.parsed_doc)
             # Provide original file name via the in memory document
-            self.doc._origin_file_name = basename(file)
+            self.doc.origin_file_name = basename(file)
             return self.doc
 
         elif self.parser == 'JSON':
@@ -200,7 +200,7 @@ def from_file(self, file, doc_format=None):
             par = DictReader(show_warnings=self.show_warnings)
             self.doc = par.to_odml(self.parsed_doc)
             # Provide original file name via the in memory document
-            self.doc._origin_file_name = basename(file)
+            self.doc.origin_file_name = basename(file)
             return self.doc
 
         elif self.parser == 'RDF':

odml/tools/rdf_converter.py

@@ -184,8 +184,8 @@ def save_document(self, doc, curr_node=None):
 
         # If available, add the documents' filename to the document node
         # so we can identify where the data came from.
-        if hasattr(doc, "_origin_file_name"):
-            curr_lit = Literal(doc._origin_file_name)
+        if hasattr(doc, "origin_file_name"):
+            curr_lit = Literal(doc.origin_file_name)
             self.graph.add((curr_node, ODML_NS.hasFileName, curr_lit))
 
         for k in fmt.rdf_map_keys:
@@ -383,7 +383,7 @@ def from_file(self, filename, doc_format):
         docs = self.to_odml()
         for curr_doc in docs:
             # Provide original file name via the document
-            curr_doc._origin_file_name = os.path.basename(filename)
+            curr_doc.origin_file_name = os.path.basename(filename)
 
         return docs
 

odml/tools/xmlparser.py

@@ -304,7 +304,8 @@ def from_file(self, xml_file):
 
         # Provide original file name via the in memory document
         if isinstance(xml_file, unicode):
-            doc._origin_file_name = basename(xml_file)
+            doc.origin_file_name = basename(xml_file)
+
         return doc
 
     def from_string(self, string):