Index: modules/dnet-parthenos/trunk/src/main/resources/eu/dnetlib/bootstrap/profiles/TransformationRuleDSResources/TransformationRuleDSResourceType/ehri_mapping.xml
===================================================================
--- modules/dnet-parthenos/trunk/src/main/resources/eu/dnetlib/bootstrap/profiles/TransformationRuleDSResources/TransformationRuleDSResourceType/ehri_mapping.xml	(revision 47203)
+++ modules/dnet-parthenos/trunk/src/main/resources/eu/dnetlib/bootstrap/profiles/TransformationRuleDSResources/TransformationRuleDSResourceType/ehri_mapping.xml	(revision 47204)
@@ -12,19 +12,318 @@
 			<SCRIPT>
 				<TITLE>EHRI Mapping</TITLE>
 				<CODE> <![CDATA[
-<x3ml version="1.0" source_type="xpath">
+<?xml version="1.0" encoding="UTF-8"?><!--Sample XML file generated by XMLSpy v2011 sp1 (http://www.altova.com)--><x3ml xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" source_type="xpath" version="1.0" xsi:noNamespaceSchemaLocation="x3ml_v1.0.xsd">
+    <info>
+        <title>EHRI  -&gt; PE  Mapping File Official</title>
+        <general_description>This mapping represents a mapping from the EHRI data registry to the Parthenos Entities format designed for the Parthenos project. The EHRI format is based on EAD. Each record provides metadata about itself qua metadata record and about some collection that it describes.</general_description>
+        <source_info>
+            <source_schema type="" version=""/>
+            <source_collection/>
+        </source_info>
+        <target_info>
+            <target_schema schema_file="cidoc_crm_v6.0-draft-2015January.rdfs" type="rdfs" version="6.0">CIDOC-CRM</target_schema>
+            <target_collection/>
+        </target_info>
+        <target_info>
+            <target_schema schema_file="CRMdig_v3.2.rdfs" type="rdfs" version="3.2">CRMdig</target_schema>
+            <target_collection/>
+        </target_info>
+        <target_info>
+            <target_schema schema_file="CRMext4SKOSandLabel_v1.2.rdfs" type="rdfs" version="1.2">CRMext4SKOSandLabel</target_schema>
+            <target_collection/>
+        </target_info>
+        <target_info>
+            <target_schema schema_file="CRMpc_v1.0.rdfs" type="rdfs" version="1.0">CRMpc</target_schema>
+            <target_collection/>
+        </target_info>
+        <target_info>
+            <target_schema schema_file="CRMpe_v1.8.1.rdfs" type="rdfs" version="1.8.1">CRMpe</target_schema>
+            <target_collection/>
+        </target_info>
+        <target_info>
+            <target_schema type="" version=""/>
+            <target_collection/>
+        </target_info>
+        <mapping_info>
+            <mapping_created_by_org>EHRI</mapping_created_by_org>
+            <mapping_created_by_person>Charles Riondet</mapping_created_by_person>
+            <in_collaboration_with>George Bruseker</in_collaboration_with>
+        </mapping_info>
+        <example_data_info>
+            <example_data_from>EHRI</example_data_from>
+            <example_data_contact_person>Charles Riondet</example_data_contact_person>
+            <example_data_source_record xml_link="sampleInputRecord___28-02-2017143104___4492___07-04-2017154350___10738.xml"/>
+            <generator_policy_info generator_link="PARTHENOS-GeneratorPolicy___15-03-2017144440___5286.xml"/>
+            <example_data_target_record rdf_link="EHRI___01-03-2017163035___1590.rdf"/>
+        </example_data_info>
+    </info>
     <namespaces>
+        <namespace prefix="rdfs" uri="http://www.w3.org/2000/01/rdf-schema#"/>
+        <namespace prefix="xsd" uri="http://www.w3.org/2001/XMLSchema#"/>
         <namespace prefix="crm" uri="http://www.cidoc-crm.org/cidoc-crm/"/>
-        <namespace prefix="rdf" uri="http://www.w3.org/1999/02/22-rdf-syntax-ns#"/>
-        <namespace prefix="rdfs" uri="http://www.w3.org/2000/01/rdf-schema#"/>
+        <namespace prefix="crmdig" uri="http://www.ics.forth.gr/isl/CRMext/CRMdig.rdfs/"/>
+        <namespace prefix="skos" uri="http://www.w3.org/2004/02/skos/core#"/>
+        <namespace prefix="crm" uri="http://www.cidoc-crm.org/cidoc-crm/"/>
+        <namespace prefix="crmpe" uri="http://www.ics.forth.gr/isl/CRMext/CRMpe.rdfs/"/>
+        <namespace prefix="parthenos" uri="http://parthenos-project.eu/EHRI/"/>
     </namespaces>
     <mappings>
         <mapping>
             <domain>
-                <source_node>//COIN</source_node>
+                <source_node>/ead/eadheader</source_node>
                 <target_node>
                     <entity>
-                        <type>crm:E22_Man-Made_Object</type>
+                        <type>crmpe:PE22_Persistent_Dataset</type>
+                        <type>crm:E33_Linguistic_Object</type>
+                        <instance_generator name="DatasetURI">
+                            <arg name="term" type="xpath">eadid/text()</arg>
+                        </instance_generator>
+                        <label_generator name="SimpleLabel">
+                            <arg name="label" type="xpath">eadid/text()</arg>
+                        </label_generator>
+                        <additional>
+                            <relationship>crm:P2_has_type</relationship>
+                            <entity>
+                                <type>crm:E55_Type</type>
+                                <instance_info>
+                                    <constant>metadata</constant>
+                                </instance_info>
+                                <instance_generator name="ConceptURI">
+                                    <arg name="term" type="constant">Metadata</arg>
+                                </instance_generator>
+                                <label_generator name="Constant">
+                                    <arg name="text" type="constant">Metadata</arg>
+                                </label_generator>
+                            </entity>
+                        </additional>
+                    </entity>
+                </target_node>
+            </domain>
+            <link>
+                <path>
+                    <source_relation>
+                        <relation>filedesc/titlestmt/titleproper</relation>
+                    </source_relation>
+                    <target_relation>
+                        <relationship>crm:P102_has_title</relationship>
+                    </target_relation>
+                </path>
+                <range>
+                    <source_node>filedesc/titlestmt/titleproper</source_node>
+                    <target_node>
+                        <entity>
+                            <type>crm:E35_Title</type>
+                            <instance_generator name="DatasetAppellationURI">
+                                <arg name="term" type="xpath">../../../eadid/text()</arg>
+                            </instance_generator>
+                            <label_generator name="SimpleLabel">
+                                <arg name="label" type="xpath">text()</arg>
+                            </label_generator>
+                        </entity>
+                    </target_node>
+                </range>
+            </link>
+            <link>
+                <path>
+                    <source_relation>
+                        <relation>../archdesc</relation>
+                    </source_relation>
+                    <target_relation>
+                        <relationship>crm:P129_is_about</relationship>
+                    </target_relation>
+                </path>
+                <range>
+                    <source_node>../archdesc</source_node>
+                    <target_node>
+                        <entity>
+                            <type>crm:E78_Collection</type>
+                            <instance_generator name="ThingURI">
+                                <arg name="term" type="xpath">did/unitid/text()</arg>
+                            </instance_generator>
+                        </entity>
+                    </target_node>
+                </range>
+            </link>
+            <link>
+                <path>
+                    <source_relation>
+                        <relation>profiledesc/langusage/language</relation>
+                    </source_relation>
+                    <target_relation>
+                        <relationship>crm:P72_has_language</relationship>
+                    </target_relation>
+                    <comments>
+                        <comment type="">
+                            <rationale/>
+                            <alternatives>if this is the language of the metadata or dataset and all cases potentially have a language, then you can double instantiate the eadheader also as E33 Linguistic Object and then use the property p72 has language</alternatives>
+                            <typical_mistakes/>
+                            <local_habits/>
+                            <link_to_cook_book/>
+                            <example>
+                                <example_source/>
+                                <example_target/>
+                            </example>
+                            <comments_last_update date="" person=""/>
+                        </comment>
+                    </comments>
+                </path>
+                <range>
+                    <source_node>profiledesc/langusage/language</source_node>
+                    <target_node>
+                        <entity>
+                            <type>crm:E56_Language</type>
+                            <instance_generator name="ConceptURI">
+                                <arg name="term" type="xpath">text()</arg>
+                            </instance_generator>
+                            <label_generator name="SimpleLabel">
+                                <arg name="label" type="xpath">text()</arg>
+                            </label_generator>
+                        </entity>
+                    </target_node>
+                </range>
+            </link>
+            <link>
+                <path>
+                    <source_relation>
+                        <relation>filedesc/publicationstmt</relation>
+                    </source_relation>
+                    <target_relation>
+                        <relationship>crm:P94i_was_created_by</relationship>
+                        <entity variable="create">
+                            <type>crmdig:D7_Digital_Machine_Event</type>
+                            <instance_generator name="UUID"/>
+                            <label_generator name="CompositeLabel">
+                                <arg name="label" type="constant">Initial Creation of</arg>
+                                <arg name="text" type="xpath">../../eadid/text()</arg>
+                            </label_generator>
+                            <additional>
+                                <relationship>crm:P2_has_type</relationship>
+                                <entity>
+                                    <type>crm:E55_Type</type>
+                                    <instance_info>
+                                        <constant>Initial Creation</constant>
+                                    </instance_info>
+                                    <instance_generator name="ConceptURI">
+                                        <arg name="term" type="constant">Initial Creation</arg>
+                                    </instance_generator>
+                                    <label_generator name="Constant">
+                                        <arg name="text" type="constant">Initial Creation</arg>
+                                    </label_generator>
+                                </entity>
+                            </additional>
+                        </entity>
+                        <relationship>crm:P14_carried_out_by</relationship>
+                    </target_relation>
+                    <comments>
+                        <comment type="">
+                            <rationale/>
+                            <alternatives>is this the creation that is further described in the next map? If so, you should stop with this creation node and put the carried out by the created by in the next map. Looking at your paths though it does not seem clear to me that they are the same creation. Are they?</alternatives>
+                            <typical_mistakes/>
+                            <local_habits/>
+                            <link_to_cook_book/>
+                            <example>
+                                <example_source/>
+                                <example_target/>
+                            </example>
+                            <comments_last_update date="" person=""/>
+                        </comment>
+                    </comments>
+                </path>
+                <range>
+                    <source_node>filedesc/publicationstmt</source_node>
+                    <target_node>
+                        <entity>
+                            <type>crm:E39_Actor</type>
+                            <instance_generator name="ActorURI">
+                                <arg name="term" type="xpath">publisher/text()</arg>
+                            </instance_generator>
+                            <label_generator name="SimpleLabel">
+                                <arg name="label" type="xpath">publisher/text()</arg>
+                            </label_generator>
+                        </entity>
+                    </target_node>
+                </range>
+            </link>
+            <link>
+                <path>
+                    <source_relation>
+                        <relation>profiledesc/creation/date</relation>
+                    </source_relation>
+                    <target_relation>
+                        <relationship>crm:P94i_was_created_by</relationship>
+                        <entity variable="create">
+                            <type>crmdig:D7_Digital_Machine_Event</type>
+                            <instance_generator name="UUID"/>
+                        </entity>
+                        <relationship>crm:P4_has_time-span</relationship>
+                        <entity>
+                            <type>crm:E52_Time-Span</type>
+                            <instance_generator name="UUID"/>
+                            <label_generator name="CompositeLabel">
+                                <arg name="label" type="constant">Time-Span of Initial Creation of </arg>
+                                <arg name="text" type="xpath">../../../eadid/text()</arg>
+                            </label_generator>
+                        </entity>
+                        <relationship>crm:P81_ongoing_throughout</relationship>
+                    </target_relation>
+                </path>
+                <range>
+                    <source_node>profiledesc/creation/date</source_node>
+                    <target_node>
+                        <entity>
+                            <type>http://www.w3.org/2000/01/rdf-schema#Literal</type>
+                            <instance_generator name="Literal">
+                                <arg name="text" type="xpath">text()</arg>
+                            </instance_generator>
+                        </entity>
+                    </target_node>
+                </range>
+            </link>
+            <link>
+                <path>
+                    <source_relation>
+                        <relation>revisiondesc/change</relation>
+                    </source_relation>
+                    <target_relation>
+                        <relationship>crmdig:L11i_was_output_of</relationship>
+                    </target_relation>
+                </path>
+                <range>
+                    <source_node>revisiondesc/change</source_node>
+                    <target_node>
+                        <entity>
+                            <type>crmdig:D7_Digital_Machine_Event</type>
+                            <instance_generator name="UUID"/>
+                            <label_generator name="CompositeLabel">
+                                <arg name="label" type="constant">Update Event for </arg>
+                                <arg name="text" type="xpath">../../eadid/text()</arg>
+                            </label_generator>
+                            <additional>
+                                <relationship>crm:P2_has_type</relationship>
+                                <entity>
+                                    <type>crm:E55_Type</type>
+                                    <instance_info>
+                                        <constant>Update</constant>
+                                    </instance_info>
+                                    <instance_generator name="ConceptURI">
+                                        <arg name="term" type="constant">Update</arg>
+                                    </instance_generator>
+                                    <label_generator name="Constant">
+                                        <arg name="text" type="constant">Update</arg>
+                                    </label_generator>
+                                </entity>
+                            </additional>
+                        </entity>
+                    </target_node>
+                </range>
+            </link>
+        </mapping>
+        <mapping>
+            <domain>
+                <source_node>/ead/eadheader/revisiondesc/change</source_node>
+                <target_node>
+                    <entity>
+                        <type>crmdig:D7_Digital_Machine_Event</type>
                         <instance_generator name="UUID"/>
                     </entity>
                 </target_node>
@@ -31,20 +330,828 @@
             </domain>
             <link>
                 <path>
-                    <source_relation><relation>ID</relation></source_relation>
+                    <source_relation>
+                        <relation>item</relation>
+                    </source_relation>
                     <target_relation>
+                        <relationship>crm:P3_has_note</relationship>
+                    </target_relation>
+                </path>
+                <range>
+                    <source_node>item</source_node>
+                    <target_node>
+                        <entity>
+                            <type>http://www.w3.org/2000/01/rdf-schema#Literal</type>
+                            <instance_generator name="Literal">
+                                <arg name="text" type="xpath">text()</arg>
+                            </instance_generator>
+                        </entity>
+                    </target_node>
+                </range>
+            </link>
+            <link>
+                <path>
+                    <source_relation>
+                        <relation>date</relation>
+                    </source_relation>
+                    <target_relation>
+                        <relationship>crm:P4_has_time-span</relationship>
+                        <entity>
+                            <type>crm:E52_Time-Span</type>
+                            <instance_generator name="UUID"/>
+                            <label_generator name="CompositeLabel">
+                                <arg name="label" type="constant">Time Span of Update Event for </arg>
+                                <arg name="text" type="xpath">../../../eadid/text()</arg>
+                            </label_generator>
+                        </entity>
+                        <relationship>crm:P81_ongoing_throughout</relationship>
+                    </target_relation>
+                </path>
+                <range>
+                    <source_node>date</source_node>
+                    <target_node>
+                        <entity>
+                            <type>http://www.w3.org/2000/01/rdf-schema#Literal</type>
+                            <instance_generator name="Literal">
+                                <arg name="text" type="xpath">text()</arg>
+                            </instance_generator>
+                        </entity>
+                    </target_node>
+                </range>
+            </link>
+        </mapping>
+        <mapping>
+            <domain>
+                <source_node>/ead/archdesc</source_node>
+                <target_node>
+                    <entity>
+                        <type>crm:E78_Collection</type>
+                        <type>crm:E33_Linguistic_Object</type>
+                        <instance_generator name="UUID"/>
+                        <label_generator name="SimpleLabel">
+                            <arg name="label" type="xpath">did/unitid/text()</arg>
+                        </label_generator>
+                    </entity>
+                </target_node>
+                <comments>
+                    <comment type="">
+                        <rationale/>
+                        <alternatives>So is each archive actually a dataset in the sense of a digital object or are they physical archives as well? If they are physical as well, persistent dataset won't work.</alternatives>
+                        <typical_mistakes/>
+                        <local_habits/>
+                        <link_to_cook_book/>
+                        <example>
+                            <example_source/>
+                            <example_target/>
+                        </example>
+                        <comments_last_update date="" person=""/>
+                    </comment>
+                </comments>
+            </domain>
+            <link>
+                <path>
+                    <source_relation>
+                        <relation>dsc/controlaccess/subject</relation>
+                    </source_relation>
+                    <target_relation>
+                        <relationship>crm:P129_is_about</relationship>
+                    </target_relation>
+                </path>
+                <range>
+                    <source_node>dsc/controlaccess/subject</source_node>
+                    <target_node>
+                        <entity>
+                            <type>crm:E55_Type</type>
+                            <instance_generator name="ConceptURI">
+                                <arg name="term" type="xpath">text()</arg>
+                            </instance_generator>
+                            <label_generator name="Constant">
+                                <arg name="text" type="xpath">text()</arg>
+                            </label_generator>
+                        </entity>
+                    </target_node>
+                    <comments>
+                        <comment type="">
+                            <rationale/>
+                            <alternatives>Is control access about authorization to use? Might need to create a new relation for this if so.</alternatives>
+                            <typical_mistakes/>
+                            <local_habits/>
+                            <link_to_cook_book/>
+                            <example>
+                                <example_source/>
+                                <example_target/>
+                            </example>
+                            <comments_last_update date="" person=""/>
+                        </comment>
+                    </comments>
+                </range>
+            </link>
+            <link>
+                <path>
+                    <source_relation>
+                        <relation>did/unittitle</relation>
+                    </source_relation>
+                    <target_relation>
+                        <relationship>crm:P102_has_title</relationship>
+                    </target_relation>
+                </path>
+                <range>
+                    <source_node>did/unittitle</source_node>
+                    <target_node>
+                        <entity>
+                            <type>crm:E35_Title</type>
+                            <instance_generator name="ThingAppellationURI">
+                                <arg name="term" type="xpath">../unitid/text()</arg>
+                            </instance_generator>
+                            <label_generator name="SimpleLabel">
+                                <arg name="label" type="xpath">text()</arg>
+                            </label_generator>
+                        </entity>
+                    </target_node>
+                </range>
+            </link>
+            <link>
+                <path>
+                    <source_relation>
+                        <relation>bioghist/p</relation>
+                    </source_relation>
+                    <target_relation>
+                        <relationship>crm:P108i_was_produced_by</relationship>
+                        <entity variable="col_start">
+                            <type>crm:E12_Production</type>
+                            <instance_generator name="UUID"/>
+                            <label_generator name="CompositeLabel">
+                                <arg name="label" type="constant">Collection Event for </arg>
+                                <arg name="text" type="xpath">../../did/unittitle/text()</arg>
+                            </label_generator>
+                        </entity>
+                        <relationship>crm:P14_carried_out_by</relationship>
+                        <entity variable="actor1">
+                            <type>crm:E39_Actor</type>
+                            <instance_generator name="UUID"/>
+                        </entity>
+                        <relationship>crm:P3_has_note</relationship>
+                    </target_relation>
+                </path>
+                <range>
+                    <source_node>bioghist/p</source_node>
+                    <target_node>
+                        <entity>
+                            <type>http://www.w3.org/2000/01/rdf-schema#Literal</type>
+                            <instance_generator name="Literal">
+                                <arg name="text" type="xpath">text()</arg>
+                            </instance_generator>
+                        </entity>
+                    </target_node>
+                    <comments>
+                        <comment type="">
+                            <rationale/>
+                            <alternatives>why has note here, what is source?</alternatives>
+                            <typical_mistakes/>
+                            <local_habits/>
+                            <link_to_cook_book/>
+                            <example>
+                                <example_source/>
+                                <example_target/>
+                            </example>
+                            <comments_last_update date="" person=""/>
+                        </comment>
+                    </comments>
+                </range>
+            </link>
+            <link>
+                <path>
+                    <source_relation>
+                        <relation>scopecontent/p</relation>
+                    </source_relation>
+                    <target_relation>
+                        <relationship>crm:P3_has_note</relationship>
+                    </target_relation>
+                    <comments>
+                        <comment type="">
+                            <rationale/>
+                            <alternatives/>
+                            <typical_mistakes/>
+                            <local_habits/>
+                            <link_to_cook_book/>
+                            <example>
+                                <example_source/>
+                                <example_target/>
+                            </example>
+                            <comments_last_update date="" person=""/>
+                        </comment>
+                    </comments>
+                </path>
+                <range>
+                    <source_node>scopecontent/p</source_node>
+                    <target_node>
+                        <entity>
+                            <type>http://www.w3.org/2000/01/rdf-schema#Literal</type>
+                            <instance_generator name="CompositeLabel">
+                                <arg name="label" type="constant">Scopecontent: </arg>
+                                <arg name="text" type="xpath">text()</arg>
+                            </instance_generator>
+                        </entity>
+                    </target_node>
+                </range>
+            </link>
+            <link>
+                <path>
+                    <source_relation>
+                        <relation>arrangement/p</relation>
+                    </source_relation>
+                    <target_relation>
+                        <relationship>crm:P147i_was_curated_by</relationship>
+                        <entity>
+                            <type>crm:E87_Curation_Activity</type>
+                            <instance_generator name="UUID"/>
+                            <label_generator name="CompositeLabel">
+                                <arg name="label" type="constant">Curation Activity for</arg>
+                                <arg name="text" type="xpath">../../did/unittitle/text()</arg>
+                            </label_generator>
+                        </entity>
+                        <relationship>crm:P33_used_specific_technique</relationship>
+                        <entity>
+                            <type>crm:E29_Design_or_Procedure</type>
+                            <instance_generator name="UUID"/>
+                            <label_generator name="CompositeLabel">
+                                <arg name="label" type="constant">Curation Plan for </arg>
+                                <arg name="text" type="xpath">../../did/unittitle/text()</arg>
+                            </label_generator>
+                        </entity>
+                        <relationship>crm:P3_has_note</relationship>
+                    </target_relation>
+                </path>
+                <range>
+                    <source_node>arrangement/p</source_node>
+                    <target_node>
+                        <entity>
+                            <type>http://www.w3.org/2000/01/rdf-schema#Literal</type>
+                            <instance_generator name="Literal">
+                                <arg name="text" type="xpath">text()</arg>
+                            </instance_generator>
+                        </entity>
+                    </target_node>
+                </range>
+            </link>
+            <link>
+                <path>
+                    <source_relation>
+                        <relation>did/origination</relation>
+                    </source_relation>
+                    <target_relation>
+                        <relationship>crm:P108i_was_produced_by</relationship>
+                        <entity variable="col_start">
+                            <type>crm:E12_Production</type>
+                            <instance_generator name="UUID"/>
+                            <label_generator name="CompositeLabel">
+                                <arg name="label" type="constant">Production Activity for</arg>
+                                <arg name="text" type="xpath">../unittitle/text()</arg>
+                            </label_generator>
+                        </entity>
+                        <relationship>crm:P14_carried_out_by</relationship>
+                    </target_relation>
+                </path>
+                <range>
+                    <source_node>did/origination</source_node>
+                    <target_node>
+                        <entity variable="actor1">
+                            <type>crm:E39_Actor</type>
+                            <instance_generator name="UUID"/>
+                        </entity>
+                    </target_node>
+                </range>
+            </link>
+            <link>
+                <path>
+                    <source_relation>
+                        <relation>did/physdesc</relation>
+                    </source_relation>
+                    <target_relation>
+                        <relationship>crm:P43_has_dimension</relationship>
+                        <entity>
+                            <type>crm:E54_Dimension</type>
+                            <instance_generator name="UUID"/>
+                            <label_generator name="CompositeLabel">
+                                <arg name="label" type="constant">Dimension of</arg>
+                                <arg name="text" type="xpath">../unittitle/text()</arg>
+                            </label_generator>
+                        </entity>
+                        <relationship>crm:P3_has_note</relationship>
+                    </target_relation>
+                </path>
+                <range>
+                    <source_node>did/physdesc</source_node>
+                    <target_node>
+                        <entity>
+                            <type>http://www.w3.org/2000/01/rdf-schema#Literal</type>
+                            <instance_generator name="Literal">
+                                <arg name="text" type="xpath">text()</arg>
+                            </instance_generator>
+                        </entity>
+                    </target_node>
+                </range>
+            </link>
+            <link>
+                <path>
+                    <source_relation>
+                        <relation>did/repository/corpname</relation>
+                    </source_relation>
+                    <target_relation>
+                        <relationship>crmpe:PP4i_is_object_hosted_by</relationship>
+                        <entity>
+                            <type>crmpe:PE2_Hosting_Service</type>
+                            <instance_generator name="ServiceURI">
+                                <arg name="term" type="xpath">text()</arg>
+                            </instance_generator>
+                            <label_generator name="SimpleLabel">
+                                <arg name="label" type="xpath">text()</arg>
+                            </label_generator>
+                        </entity>
+                        <relationship>crmpe:PP2_provided_by</relationship>
+                    </target_relation>
+                </path>
+                <range>
+                    <source_node>did/repository/corpname</source_node>
+                    <target_node>
+                        <entity>
+                            <type>crm:E39_Actor</type>
+                            <instance_generator name="ActorURI">
+                                <arg name="term" type="xpath">text()</arg>
+                            </instance_generator>
+                            <label_generator name="SimpleLabel">
+                                <arg name="label" type="xpath">text()</arg>
+                            </label_generator>
+                        </entity>
+                    </target_node>
+                    <comments>
+                        <comment type="">
+                            <rationale>Here, the Data Hosting services are the institutions holding the original materials.</rationale>
+                            <alternatives>then you should just go all the way to actor and just use the data hosting service as an intermediate node.</alternatives>
+                            <typical_mistakes/>
+                            <local_habits/>
+                            <link_to_cook_book/>
+                            <example>
+                                <example_source/>
+                                <example_target/>
+                            </example>
+                            <comments_last_update date="" person=""/>
+                        </comment>
+                    </comments>
+                </range>
+            </link>
+            <link>
+                <path>
+                    <source_relation>
+                        <relation>did/unitdate</relation>
+                    </source_relation>
+                    <target_relation>
+                        <relationship>crm:P108i_was_produced_by</relationship>
+                        <entity variable="col_start">
+                            <type>crm:E12_Production</type>
+                            <instance_generator name="UUID"/>
+                        </entity>
+                        <relationship>crm:P4_has_time-span</relationship>
+                        <entity>
+                            <type>crm:E52_Time-Span</type>
+                            <instance_generator name="UUID"/>
+                            <label_generator name="CompositeLabel">
+                                <arg name="label" type="constant">Time span of Collection Event for</arg>
+                                <arg name="text" type="xpath">../unittitle/text()</arg>
+                            </label_generator>
+                        </entity>
+                        <relationship>crm:P3_has_note</relationship>
+                    </target_relation>
+                </path>
+                <range>
+                    <source_node>did/unitdate</source_node>
+                    <target_node>
+                        <entity>
+                            <type>http://www.w3.org/2000/01/rdf-schema#Literal</type>
+                            <instance_generator name="Literal">
+                                <arg name="text" type="xpath">text()</arg>
+                            </instance_generator>
+                        </entity>
+                    </target_node>
+                </range>
+            </link>
+            <link>
+                <path>
+                    <source_relation>
+                        <relation>did/langmaterial/language</relation>
+                    </source_relation>
+                    <target_relation>
+                        <relationship>crm:P72_has_language</relationship>
+                        <entity>
+                            <type>crm:E56_Language</type>
+                            <instance_generator name="UUID"/>
+                        </entity>
+                        <relationship>crm:P3_has_note</relationship>
+                    </target_relation>
+                    <comments>
+                        <comment type="">
+                            <rationale/>
+                            <alternatives>Is this because you want to indicate language of the archival object. in Which case you can double instantiate as Linguistic Object.</alternatives>
+                            <typical_mistakes/>
+                            <local_habits/>
+                            <link_to_cook_book/>
+                            <example>
+                                <example_source/>
+                                <example_target/>
+                            </example>
+                            <comments_last_update date="" person=""/>
+                        </comment>
+                    </comments>
+                </path>
+                <range>
+                    <source_node>did/langmaterial/language</source_node>
+                    <target_node>
+                        <entity>
+                            <type>http://www.w3.org/2000/01/rdf-schema#Literal</type>
+                            <instance_generator name="Literal">
+                                <arg name="text" type="xpath">text()</arg>
+                            </instance_generator>
+                        </entity>
+                    </target_node>
+                </range>
+            </link>
+            <link>
+                <path>
+                    <source_relation>
+                        <relation>originalsloc/p</relation>
+                    </source_relation>
+                    <target_relation>
+                        <relationship>crm:P130_shows_features_of</relationship>
+                        <entity>
+                            <type>crm:E78_Collection</type>
+                            <instance_generator name="UUID"/>
+                            <label_generator name="CompositeLabel">
+                                <arg name="label" type="constant">Collection Containing Original Material of </arg>
+                                <arg name="text" type="xpath">../../did/unittitle/text()</arg>
+                            </label_generator>
+                        </entity>
+                        <relationship>crm:P3_has_note</relationship>
+                    </target_relation>
+                </path>
+                <range>
+                    <source_node>originalsloc/p</source_node>
+                    <target_node>
+                        <entity>
+                            <type>http://www.w3.org/2000/01/rdf-schema#Literal</type>
+                            <instance_generator name="Literal">
+                                <arg name="text" type="xpath">text()</arg>
+                            </instance_generator>
+                        </entity>
+                    </target_node>
+                </range>
+            </link>
+            <link>
+                <path>
+                    <source_relation>
+                        <relation>altformavail/p</relation>
+                    </source_relation>
+                    <target_relation>
+                        <relationship>crm:P130i_features_are_also_found_on</relationship>
+                        <entity>
+                            <type>crm:E78_Collection</type>
+                            <instance_generator name="UUID"/>
+                            <label_generator name="CompositeLabel">
+                                <arg name="label" type="constant">Collection Containing Similar Material as</arg>
+                                <arg name="text" type="xpath">../../did/unittitle/text()</arg>
+                            </label_generator>
+                        </entity>
+                        <relationship>crm:P3_has_note</relationship>
+                    </target_relation>
+                </path>
+                <range>
+                    <source_node>altformavail/p</source_node>
+                    <target_node>
+                        <entity>
+                            <type>http://www.w3.org/2000/01/rdf-schema#Literal</type>
+                            <instance_generator name="Literal">
+                                <arg name="text" type="xpath">text()</arg>
+                            </instance_generator>
+                        </entity>
+                    </target_node>
+                </range>
+            </link>
+            <link>
+                <path>
+                    <source_relation>
+                        <relation>otherfindaid/p</relation>
+                    </source_relation>
+                    <target_relation>
+                        <relationship>crm:P129i_is_subject_of</relationship>
+                        <entity>
+                            <type>crmpe:PE22_Persistent_Dataset</type>
+                            <instance_generator name="UUID"/>
+                            <additional>
+                                <relationship>crm:P2_has_type</relationship>
+                                <entity>
+                                    <type>crm:E55_Type</type>
+                                    <instance_info>
+                                        <constant>metadata</constant>
+                                    </instance_info>
+                                    <instance_generator name="ConceptURI">
+                                        <arg name="term" type="constant">metadata (otherfindaid)</arg>
+                                    </instance_generator>
+                                    <label_generator name="SimpleLabel">
+                                        <arg name="label" type="constant">metadata (otherfindaid)</arg>
+                                    </label_generator>
+                                </entity>
+                            </additional>
+                        </entity>
+                        <relationship>crm:P3_has_note</relationship>
+                    </target_relation>
+                </path>
+                <range>
+                    <source_node>otherfindaid/p</source_node>
+                    <target_node>
+                        <entity>
+                            <type>http://www.w3.org/2000/01/rdf-schema#Literal</type>
+                            <instance_generator name="Literal">
+                                <arg name="text" type="xpath">text()</arg>
+                            </instance_generator>
+                        </entity>
+                    </target_node>
+                    <comments>
+                        <comment type="">
+                            <rationale>This must not be confused with the eadheader, which is the primary metadata of this dataset.</rationale>
+                            <alternatives/>
+                            <typical_mistakes/>
+                            <local_habits/>
+                            <link_to_cook_book/>
+                            <example>
+                                <example_source/>
+                                <example_target/>
+                            </example>
+                            <comments_last_update date="" person=""/>
+                        </comment>
+                    </comments>
+                </range>
+            </link>
+            <link>
+                <path>
+                    <source_relation>
+                        <relation>userestrict/p</relation>
+                    </source_relation>
+                    <target_relation>
+                        <relationship>crm:P129i_is_subject_of</relationship>
+                        <entity>
+                            <type>crm:E30_Right</type>
+                            <instance_generator name="UUID"/>
+                            <additional>
+                                <relationship>crm:P2_has_type</relationship>
+                                <entity>
+                                    <type>crm:E55_Type</type>
+                                    <instance_info>
+                                        <constant>Use Restriction</constant>
+                                    </instance_info>
+                                    <instance_generator name="UUID"/>
+                                </entity>
+                            </additional>
+                        </entity>
+                        <relationship>crm:P3_has_note</relationship>
+                    </target_relation>
+                </path>
+                <range>
+                    <source_node>userestrict/p</source_node>
+                    <target_node>
+                        <entity>
+                            <type>http://www.w3.org/2000/01/rdf-schema#Literal</type>
+                            <instance_generator name="Literal">
+                                <arg name="text" type="xpath">text()</arg>
+                            </instance_generator>
+                        </entity>
+                    </target_node>
+                    <comments>
+                        <comment type="">
+                            <rationale>Not precise enough</rationale>
+                            <alternatives/>
+                            <typical_mistakes/>
+                            <local_habits/>
+                            <link_to_cook_book/>
+                            <example>
+                                <example_source/>
+                                <example_target/>
+                            </example>
+                            <comments_last_update date="" person=""/>
+                        </comment>
+                    </comments>
+                </range>
+            </link>
+            <link>
+                <path>
+                    <source_relation>
+                        <relation>acqinfo/p</relation>
+                    </source_relation>
+                    <target_relation>
+                        <relationship>crm:P24i_changed_ownership_through</relationship>
+                        <entity>
+                            <type>crm:E8_Acquisition</type>
+                            <instance_generator name="UUID"/>
+                            <additional>
+                                <relationship>crm:P2_has_type</relationship>
+                                <entity>
+                                    <type>crm:E55_Type</type>
+                                    <instance_info>
+                                        <constant>AcquisitionEvent</constant>
+                                    </instance_info>
+                                    <instance_generator name="ConceptURI">
+                                        <arg name="term" type="constant">Use Restriction</arg>
+                                    </instance_generator>
+                                    <label_generator name="SimpleLabel">
+                                        <arg name="label" type="constant">Use Restriction</arg>
+                                    </label_generator>
+                                </entity>
+                            </additional>
+                        </entity>
+                        <relationship>crm:P3_has_note</relationship>
+                    </target_relation>
+                </path>
+                <range>
+                    <source_node>acqinfo/p</source_node>
+                    <target_node>
+                        <entity>
+                            <type>http://www.w3.org/2000/01/rdf-schema#Literal</type>
+                            <instance_generator name="Literal">
+                                <arg name="text" type="xpath">text()</arg>
+                            </instance_generator>
+                        </entity>
+                    </target_node>
+                </range>
+            </link>
+            <link>
+                <path>
+                    <source_relation>
+                        <relation>custodhist/p</relation>
+                    </source_relation>
+                    <target_relation>
+                        <relationship>crm:P24i_changed_ownership_through</relationship>
+                        <entity>
+                            <type>crm:E8_Acquisition</type>
+                            <instance_generator name="UUID"/>
+                            <label_generator name="CompositeLabel">
+                                <arg name="label" type="constant">Acquisition Event of </arg>
+                                <arg name="text" type="xpath">../../did/unittitle/text()</arg>
+                            </label_generator>
+                            <additional>
+                                <relationship>crm:P2_has_type</relationship>
+                                <entity>
+                                    <type>crm:E55_Type</type>
+                                    <instance_info>
+                                        <constant>CustodialHistory</constant>
+                                    </instance_info>
+                                    <instance_generator name="UUID"/>
+                                </entity>
+                            </additional>
+                        </entity>
+                        <relationship>crm:P3_has_note</relationship>
+                    </target_relation>
+                </path>
+                <range>
+                    <source_node>custodhist/p</source_node>
+                    <target_node>
+                        <entity>
+                            <type>http://www.w3.org/2000/01/rdf-schema#Literal</type>
+                            <instance_generator name="Literal">
+                                <arg name="text" type="xpath">text()</arg>
+                            </instance_generator>
+                        </entity>
+                    </target_node>
+                </range>
+            </link>
+            <link>
+                <path>
+                    <source_relation>
+                        <relation>dsc/controlaccess/genreform</relation>
+                    </source_relation>
+                    <target_relation>
+                        <relationship>crm:P2_has_type</relationship>
+                    </target_relation>
+                </path>
+                <range>
+                    <source_node>dsc/controlaccess/genreform</source_node>
+                    <target_node>
+                        <entity>
+                            <type>crm:E55_Type</type>
+                            <instance_generator name="ConceptURI">
+                                <arg name="term" type="xpath">text()</arg>
+                            </instance_generator>
+                            <label_generator name="SimpleLabel">
+                                <arg name="label" type="xpath">text()</arg>
+                            </label_generator>
+                        </entity>
+                    </target_node>
+                </range>
+            </link>
+            <link>
+                <path>
+                    <source_relation>
+                        <relation>dsc/controlaccess/geogname</relation>
+                    </source_relation>
+                    <target_relation>
+                        <relationship>crm:P129_is_about</relationship>
+                    </target_relation>
+                </path>
+                <range>
+                    <source_node>dsc/controlaccess/geogname</source_node>
+                    <target_node>
+                        <entity>
+                            <type>crm:E53_Place</type>
+                            <instance_generator name="PlaceURI">
+                                <arg name="term" type="xpath">text()</arg>
+                            </instance_generator>
+                            <label_generator name="SimpleLabel">
+                                <arg name="label" type="xpath">text()</arg>
+                            </label_generator>
+                        </entity>
+                    </target_node>
+                </range>
+            </link>
+        </mapping>
+        <mapping>
+            <domain>
+                <source_node>/ead/eadheader/filedesc/publicationstmt</source_node>
+                <target_node>
+                    <entity>
+                        <type>crm:E39_Actor</type>
+                        <instance_generator name="UUID"/>
+                    </entity>
+                </target_node>
+            </domain>
+            <link>
+                <path>
+                    <source_relation>
+                        <relation>address/addressline</relation>
+                    </source_relation>
+                    <target_relation>
+                        <relationship>crm:P74_has_current_or_former_residence</relationship>
+                        <entity variable="p1">
+                            <type>crm:E53_Place</type>
+                            <instance_generator name="UUID"/>
+                            <label_generator name="CompositeLabel">
+                                <arg name="label" type="constant">Location of </arg>
+                                <arg name="text" type="xpath">../../publisher/text()</arg>
+                            </label_generator>
+                        </entity>
                         <relationship>crm:P1_is_identified_by</relationship>
+                        <entity variable="a1">
+                            <type>crm:E45_Address</type>
+                            <instance_generator name="UUID"/>
+                            <label_generator name="CompositeLabel">
+                                <arg name="label" type="constant">Address for Location of</arg>
+                                <arg name="text" type="xpath">../../publisher/text()</arg>
+                            </label_generator>
+                        </entity>
+                        <relationship>crm:P3_has_note</relationship>
                     </target_relation>
+                    <comments>
+                        <comment type="">
+                            <rationale>check with Nikos for new generator that concatenates the fields</rationale>
+                            <alternatives/>
+                            <typical_mistakes/>
+                            <local_habits/>
+                            <link_to_cook_book/>
+                            <example>
+                                <example_source/>
+                                <example_target/>
+                            </example>
+                            <comments_last_update date="" person=""/>
+                        </comment>
+                    </comments>
                 </path>
                 <range>
-                    <source_node>ID</source_node>
+                    <source_node>address/addressline</source_node>
                     <target_node>
                         <entity>
+                            <type>http://www.w3.org/2000/01/rdf-schema#Literal</type>
+                            <instance_generator name="Literal">
+                                <arg name="text" type="xpath">text()</arg>
+                            </instance_generator>
+                        </entity>
+                    </target_node>
+                </range>
+            </link>
+            <link>
+                <path>
+                    <source_relation>
+                        <relation>publisher</relation>
+                    </source_relation>
+                    <target_relation>
+                        <relationship>crm:P1_is_identified_by</relationship>
+                    </target_relation>
+                </path>
+                <range>
+                    <source_node>publisher</source_node>
+                    <target_node>
+                        <entity>
                             <type>crm:E41_Appellation</type>
-                            <instance_generator name="UUID"/>
-                            <label_generator name="Literal">
-                                <arg name="text">text()</arg>
-                                <arg name="language"/>
+                            <instance_generator name="ActorAppellationURI">
+                                <arg name="term" type="xpath">text()</arg>
+                            </instance_generator>
+                            <label_generator name="SimpleLabel">
+                                <arg name="label" type="xpath">text()</arg>
                             </label_generator>
                         </entity>
                     </target_node>
@@ -52,7 +1159,10 @@
             </link>
         </mapping>
     </mappings>
-</x3ml>]]>
+
+</x3ml>
+
+]]>
 				</CODE>
 			</SCRIPT>
 		</CONFIGURATION>
