[tracker/harmattan-pre-signal-updates: 1250/1380] NFO: Added nfo:Equipment ontology

[Martyn James Russell <mr src gnome org>]

commit b6bb26e669287b135ff4604a0e92211480eb2df8
Author: Philip Van Hoof <philip codeminded be>
Date:   Tue Sep 7 11:51:21 2010 +0200

    NFO: Added nfo:Equipment ontology

 data/ontologies/33-nfo.ontology     |   51 ++++++++++++++++++++++++++++++-----
 data/ontologies/38-nmm.ontology     |    1 +
 docs/ontologies/nie/explanation.xml |   16 +++++-----
 3 files changed, 53 insertions(+), 15 deletions(-)
---
diff --git a/data/ontologies/33-nfo.ontology b/data/ontologies/33-nfo.ontology
index a1cc054..cc86144 100644
--- a/data/ontologies/33-nfo.ontology
+++ b/data/ontologies/33-nfo.ontology
@@ -12,7 +12,7 @@
 
 nfo: a tracker:Namespace, tracker:Ontology ;
 	tracker:prefix "nfo" ;
-	nao:lastModified "2010-08-12T21:30:00Z" .
+	nao:lastModified "2010-09-07T13:00:00Z" .
 
 nfo:Document a rdfs:Class ;
 	rdfs:label "Document" ;
@@ -302,13 +302,14 @@ nfo:duration a rdf:Property ;
 	rdfs:domain nfo:Media ;
 	rdfs:range xsd:integer .
 
-# This property needs to be submitted to NEPOMUK
+# Deprecated, use nfo:Equipment
 nfo:device a rdf:Property ;
-         rdfs:label "Device" ;
-         rdfs:comment "Device (maker/model) used to capture the image/video" ;
-         nrl:maxCardinality 1 ;
-         rdfs:domain nfo:Media ;
-         rdfs:range xsd:string .
+	rdfs:label "Device" ;
+	rdfs:comment "Device (maker/model) used to capture the image/video" ;
+	nrl:maxCardinality 1 ;
+	rdfs:domain nfo:Media ;
+	nao:deprecated true ;
+	rdfs:range xsd:string .
 
 nfo:wordCount a rdf:Property ;
 	rdfs:label "wordCount" ;
@@ -941,3 +942,39 @@ nfo:isContentEncrypted a rdf:Property ;
 	nrl:maxCardinality 1 ;
 	rdfs:domain nie:InformationElement ;
 	rdfs:range xsd:boolean .
+
+
+# Ontology request by Alexander Bokovoy, replaces nfo:device
+# These classes and properties need to be submitted to NEPOMUK
+nfo:Equipment a rdfs:Class ;
+	rdfs:label "Equipment" ;
+	rdfs:comment "The equipment used to create media" ;
+	rdfs:subClassOf nie:InformationElement .
+
+nfo:equipment a rdf:Property ;
+	rdfs:label "Device" ;
+	rdfs:comment "Equipment used to create the media" ;
+	nrl:maxCardinality 1 ;
+	rdfs:domain nfo:Media ;
+	rdfs:range nfo:Equipment .
+
+nfo:make a rdf:Property ;
+	rdfs:label "Make" ;
+	rdfs:comment "The make of the equipment" ;
+	nrl:maxCardinality 1 ;
+	rdfs:domain nfo:Equipment ;
+	rdfs:range xsd:string .
+
+nfo:model a rdf:Property ;
+	rdfs:label "Model" ;
+	rdfs:comment "The model of the equipment" ;
+	nrl:maxCardinality 1 ;
+	rdfs:domain nfo:Equipment ;
+	rdfs:range xsd:string .
+
+nfo:equipmentSoftware a rdf:Property ;
+	rdfs:label "Equipment software" ;
+	rdfs:comment "The software of the equipment" ;
+	nrl:maxCardinality 1 ;
+	rdfs:domain nfo:Equipment ;
+	rdfs:range xsd:string .
diff --git a/data/ontologies/38-nmm.ontology b/data/ontologies/38-nmm.ontology
index 1e026cc..cc4bb5a 100644
--- a/data/ontologies/38-nmm.ontology
+++ b/data/ontologies/38-nmm.ontology
@@ -321,6 +321,7 @@ nmm:Photo a rdfs:Class ;
 # Properties
 # Photo location is waiting for the Location ontology
 
+# Deprecated, use nfo:Equipment
 nmm:camera a rdf:Property ;
 	rdfs:label "Camera" ;
 	rdfs:comment "The maker and model of the camera used to take the photograph. DEPRECATED (check nfo:device)" ;
diff --git a/docs/ontologies/nie/explanation.xml b/docs/ontologies/nie/explanation.xml
index 2eaa050..1ee15fd 100644
--- a/docs/ontologies/nie/explanation.xml
+++ b/docs/ontologies/nie/explanation.xml
@@ -131,18 +131,18 @@ its album).
 
 <programlisting>
 &lt;urn:uuid:10293801928301293&gt; a nmm:Photo, nfo:FileDataObject ;
-         # Properties as nmm:Photo
+	# Properties as nmm:Photo
 	 nfo:width 49 ;
 	 nfo:height 36 ;
-         nmm:flash &lt;nmm:flash-off&gt;;
-         nmm:whiteBalance &lt;nmm:white-balance-automatic&gt; ;
-         nfo:device "Tracknon N900" ;
+	nmm:flash &lt;nmm:flash-off&gt;;
+	nmm:whiteBalance &lt;nmm:white-balance-automatic&gt; ;
+	nfo:equipment [ a nfo:Equipment ; nfo:make 'Nokia'; nfo:model 'N900'; nfo:equipmentSoftware 'Tracknon' ] ;
 
-         # Properties from nfo:FileDataObject
-         nfo:fileSize 12341234 ;
+	# Properties from nfo:FileDataObject
+	nfo:fileSize 12341234 ;
 
-         # Mandatory for any nfo:DataObject
-         nie:url &lt;file:///home/ivan/test/CC-test-big.png&gt; .
+	# Mandatory for any nfo:DataObject
+	nie:url &lt;file:///home/ivan/test/CC-test-big.png&gt; .
 
 </programlisting>