merge inverses in this new world

Author: azaroth42

cromulent/data/crm_vocab.tsv

@@ -1363,16 +1363,17 @@
     }, 
     "current_or_former_residence": {
       "@id": "crm:P74_has_current_or_former_residence", 
-      "@type": "@id"
+      "@type": "@id", 
+      "@container": "@set"
     }, 
     "current_or_former_residence_of": {
       "@id": "crm:P74i_is_current_or_former_residence_of", 
-      "@type": "@id"
+      "@type": "@id", 
+      "@container": "@set"
     }, 
     "possesses": {
       "@id": "crm:P75_possesses", 
-      "@type": "@id", 
-      "@container": "@set"
+      "@type": "@id"
     }, 
     "possessed_by": {
       "@id": "crm:P75i_is_possessed_by", 
@@ -1499,13 +1500,14 @@
       "@id": "crm:P100_was_death_of", 
       "@type": "@id"
     }, 
-    "died_in": {
+    "died": {
       "@id": "crm:P100i_died_in", 
       "@type": "@id"
     }, 
-    "as_general_use": {
+    "general_use": {
       "@id": "crm:P101_had_as_general_use", 
-      "@type": "@id"
+      "@type": "@id", 
+      "@container": "@set"
     }, 
     "use_of": {
       "@id": "crm:P101i_was_use_of", 

cromulent/data/linked-art.json

@@ -15,7 +15,7 @@
         'data/cidoc-extension.json', 'data/crm-profile.json']
     },
     test_suite="tests",
-    version = '0.9.13',
+    version = '0.10.1',
     description = 'A library for mapping CIDOC-CRM classes to Python objects',
     author = 'Rob Sanderson',
     author_email = '[email protected]',

setup.py

@@ -113,36 +113,12 @@ Instances of SP6 Declarative Places may be used to approximate instances of E53
 </rdf:Property>
 
 
-<!-- This is truly, truly horrible :(  -->
+<!-- Proxies are very magical -->
 
 <rdfs:Class rdf:about="http://www.openarchives.org/ore/terms/Proxy">
     <rdfs:label xml:lang="en">Proxy</rdfs:label>
     <rdfs:comment>Proxy for a resource within the context of an Aggregation.</rdfs:comment>
-    <rdfs:subClassOf rdf:resource="E36_Visual_Item"/>
-<!--
-    <rdfs:subClassOf rdf:resource="https://linked.art/ns/terms/Payment"/>
-    <rdfs:subClassOf rdf:resource="https://linked.art/ns/terms/PropertyInterest"/>
-    <rdfs:subClassOf rdf:resource="https://linked.art/ns/terms/Relationship"/>
-    <rdfs:subClassOf rdf:resource="https://linked.art/ns/terms/Name"/>
-    <rdfs:subClassOf rdf:resource="https://linked.art/ns/terms/EndingActivity"/>
-    <rdfs:subClassOf rdf:resource="https://linked.art/ns/terms/TransformingActivity"/>
-    <rdfs:subClassOf rdf:resource="E8_Acquisition"/>
-    <rdfs:subClassOf rdf:resource="E13_Attribute_Assignment"/>
-    <rdfs:subClassOf rdf:resource="E65_Creation"/>
-    <rdfs:subClassOf rdf:resource="E66_Formation"/>
-    <rdfs:subClassOf rdf:resource="E74_Group"/>
-    <rdfs:subClassOf rdf:resource="E42_Identifier"/>
-    <rdfs:subClassOf rdf:resource="E56_Language"/>
-    <rdfs:subClassOf rdf:resource="E22_Man-Made_Object"/>
-    <rdfs:subClassOf rdf:resource="E57_Material"/>
-    <rdfs:subClassOf rdf:resource="E97_Monetary_Amount"/>
-    <rdfs:subClassOf rdf:resource="E21_Person"/>
-    <rdfs:subClassOf rdf:resource="E53_Place"/>
-    <rdfs:subClassOf rdf:resource="E12_Production"/>
-    <rdfs:subClassOf rdf:resource="E10_Transfer_of_Custody"/>
-    <rdfs:subClassOf rdf:resource="http://www.openarchives.org/ore/terms/Aggregation"/>
--->
-
+    <rdfs:subClassOf rdf:resource="E71_Man-Made_Thing"/>
 </rdfs:Class>
 
 <rdf:Property rdf:about="http://www.openarchives.org/ore/terms/proxyIn">
@@ -159,6 +135,9 @@ Instances of SP6 Declarative Places may be used to approximate instances of E53
         <rdfs:range rdf:resource="E1_CRM_Entity"/>
 </rdf:Property>
 
+
+
+
 <!-- Similarity of resources -->
 <!-- E1: owl:sameAs, skos:exactMatch, skos:closeMatch, dct:relation -->
 

utils/data/cidoc.xml

@@ -0,0 +1,50 @@
+from lxml import etree
+import codecs
+
+NS = {'rdf':"http://www.w3.org/1999/02/22-rdf-syntax-ns#",
+	'xsd':"http://www.w3.org/2001/XMLSchema#",
+	'rdfs':"http://www.w3.org/2000/01/rdf-schema#",
+	'dcterms':"http://purl.org/dc/terms/",
+	'owl':"http://www.w3.org/2002/07/owl#",
+	'crm':"http://www.cidoc-crm.org/cidoc-crm/",
+	'xml': "http://www.w3.org/XML/1998/namespace"
+}
+
+fh = file('data/inverses.xml')
+data = fh.read()
+fh.close()
+dom = etree.XML(data)
+
+inverses = {}
+props = dom.xpath("//rdf:Property",namespaces=NS)
+for p in props:
+	name = p.xpath('@rdf:about', namespaces=NS)[0]
+	try:
+		inv = p.xpath('./owl:inverseOf/@rdf:resource', namespaces=NS)[0]
+		inverses[name] = inv
+	except:
+		pass
+
+fh = file('data/cidoc.xml')
+data = fh.read()
+fh.close()
+dom = etree.XML(data)
+
+# Now insert them into the right blocks
+
+for (n,i) in inverses.items():
+	try:
+		elem = dom.xpath('//rdf:Property[@rdf:about="%s"]' % n, namespaces=NS)[0]
+		if not elem.xpath('./owl:inverseOf', namespaces=NS):
+			inv = etree.SubElement(elem, "{http://www.w3.org/2002/07/owl#}inverseOf")
+			inv.set("{http://www.w3.org/1999/02/22-rdf-syntax-ns#}resource", i)
+			inv.tail = "\n"
+	except:
+		print "Could not find property %s" % n
+
+
+# And rewrite the file
+
+fh = file('data/cidoc_inversed.xml', 'w')
+fh.write(etree.tostring(dom, pretty_print=True))
+fh.close()

utils/data/linkedart_crm_enhancements.xml

@@ -44,11 +44,6 @@
 fh.close()
 profile_flags = json.loads(data)
 
-fh = open('data/inverses.xml')
-data = fh.read()
-fh.close()
-invdom = etree.XML(data)
-
 stuff = []
 propXHash = {}
 classXHash = {}
@@ -157,9 +152,7 @@ def process_props(dom):
 		else:
 			subProp = ""
 
-		inverse = dom.xpath('./owl:inverseOf/@rdf:resource', namespaces=NS)
-		if not inverse:
-			inverse = invdom.xpath('//rdf:Property[@rdf:about="%s"]/owl:inverseOf/@rdf:resource' % name, namespaces=NS)
+		inverse = p.xpath('./owl:inverseOf/@rdf:resource', namespaces=NS)
 		if inverse:
 			inverse = inverse[0]
 		else: