[tracker] NFO: Remove deprecated nfo:device

[Jürg Billeter <juergbi src gnome org>]

commit 7386dd61122c4986d7c9bec4f05ab2572746b0dd
Author: Jürg Billeter <j bitron ch>
Date:   Wed Jan 26 15:24:38 2011 +0100

    NFO: Remove deprecated nfo:device
    
    The property was deprecated 4 months ago.

 data/ontologies/33-nfo.ontology                    |    9 ---------
 tests/functional-tests/performance-tc.py           |   12 ++++++------
 utils/data-generators/deprecated/generate_Image.py |    2 +-
 utils/services/file-class.cache.test               |    1 -
 4 files changed, 7 insertions(+), 17 deletions(-)
---
diff --git a/data/ontologies/33-nfo.ontology b/data/ontologies/33-nfo.ontology
index cdb53ac..fc09bad 100644
--- a/data/ontologies/33-nfo.ontology
+++ b/data/ontologies/33-nfo.ontology
@@ -303,15 +303,6 @@ nfo:duration a rdf:Property ;
 	rdfs:domain nfo:Media ;
 	rdfs:range xsd:integer .
 
-# 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 ;
-	nao:deprecated true ;
-	rdfs:range xsd:string .
-
 nfo:wordCount a rdf:Property ;
 	rdfs:label "wordCount" ;
 	rdfs:comment "The amount of words in a text document." ;
diff --git a/tests/functional-tests/performance-tc.py b/tests/functional-tests/performance-tc.py
index 72b4140..460e226 100644
--- a/tests/functional-tests/performance-tc.py
+++ b/tests/functional-tests/performance-tc.py
@@ -865,7 +865,7 @@ class gallery(TestUpdate):
 
 		query = "SELECT ?media WHERE { \
                      	?media a nfo:Visual; \
-                        nfo:device 'NOKIA' }"
+                        nfo:equipment [ a nfo:Equipment; nfo:make 'NOKIA' ] }"
 
 		start=time.time()
 
@@ -882,7 +882,7 @@ class gallery(TestUpdate):
 
 		query = "SELECT ?media WHERE { \
                      	?media a nfo:Visual; \
-                        nfo:device 'NOKIA' } LIMIT 500"
+                        nfo:equipment [ a nfo:Equipment; nfo:make 'NOKIA' ] } LIMIT 500"
 
 		start=time.time()
 
@@ -903,7 +903,7 @@ class gallery(TestUpdate):
 			nie:mimeType ?mime. \
 			OPTIONAL { ?image nfo:height ?height .}\
 			OPTIONAL { ?image nfo:width  ?width .}\
-			OPTIONAL { ?image nfo:device ?camera .}\
+			OPTIONAL { ?image nfo:equipment [ nfo:model ?camera ] .}\
 			OPTIONAL { ?image nmm:exposureTime ?exposuretime .}\
 			OPTIONAL { ?image nmm:fnumber ?fnumber .}\
 			OPTIONAL { ?image nmm:focalLength ?focallength .}} LIMIT 10000"
@@ -930,7 +930,7 @@ class gallery(TestUpdate):
 			nie:mimeType ?mime. \
 			OPTIONAL { ?image nfo:height ?height .}\
 			OPTIONAL { ?image nfo:width  ?width .}\
-			OPTIONAL { ?image nfo:device ?camera .}\
+			OPTIONAL { ?image nfo:equipment [ nfo:model ?camera ] .}\
 			OPTIONAL { ?image nmm:exposureTime ?exposuretime .}\
 			OPTIONAL { ?image nmm:fnumber ?fnumber .}\
 			OPTIONAL { ?image nmm:focalLength ?focallength .}} LIMIT 500"
@@ -971,7 +971,7 @@ class gallery(TestUpdate):
 		"""Querying all images """
 		"""simplified version of test_gallery_09 """
 
-		query = "SELECT nie:url(?image) nfo:height(?image) nfo:width(?image) nie:mimeType(?image) nfo:device(?image) nmm:exposureTime(?image) nmm:fnumber(?image) nmm:focalLength(?image) WHERE { ?image a nmm:Photo . } limit 10000"
+		query = "SELECT nie:url(?image) nfo:height(?image) nfo:width(?image) nie:mimeType(?image) nfo:model (nfo:equipment (?image)) nmm:exposureTime(?image) nmm:fnumber(?image) nmm:focalLength(?image) WHERE { ?image a nmm:Photo . } limit 10000"
 
 
 		start=time.time()
@@ -987,7 +987,7 @@ class gallery(TestUpdate):
 		"""Querying 500 images """
 		"""simplified version of test_gallery_10 """
 
-		query = "SELECT nie:url(?image) nfo:height(?image) nfo:width(?image) nie:mimeType(?image) nfo:device(?image) nmm:exposureTime(?image) nmm:fnumber(?image) nmm:focalLength(?image) WHERE { ?image a nmm:Photo . } limit 500"
+		query = "SELECT nie:url(?image) nfo:height(?image) nfo:width(?image) nie:mimeType(?image) nfo:model (nfo:equipment (?image)) nmm:exposureTime(?image) nmm:fnumber(?image) nmm:focalLength(?image) WHERE { ?image a nmm:Photo . } limit 500"
 
 
 		start=time.time()
diff --git a/utils/data-generators/deprecated/generate_Image.py b/utils/data-generators/deprecated/generate_Image.py
index 60b8131..4bb8b3b 100644
--- a/utils/data-generators/deprecated/generate_Image.py
+++ b/utils/data-generators/deprecated/generate_Image.py
@@ -59,7 +59,7 @@ for index in range(start_id, start_id + count1):
    f.write('\tnfo:fileName          "photo'+`index`+'.jpg";\n')
    if ((index-start_id)<(count1/2)):
 	 f.write ('\tnao:hasTag [a nao:Tag ; nao:prefLabel  "TEST"];\n')
-	 f.write('\tnfo:device            "NOKIA";\n')
+	 f.write('\tnfo:equipment [ a nfo:Equipment ; nfo:make "NOKIA" ];\n')
    f.write('\tnmm:exposureTime      "'+`index`+'";\n') 
    f.write('\tnmm:fnumber           "'+`(1 + (index % 20))`+'";\n')
    f.write('\tnmm:focalLength       "'+` (1 + (index % 500))`+'".\n')
diff --git a/utils/services/file-class.cache.test b/utils/services/file-class.cache.test
index 17729e0..b6de533 100644
--- a/utils/services/file-class.cache.test
+++ b/utils/services/file-class.cache.test
@@ -312,7 +312,6 @@ nmm nmm:isContentEncrypted
 nmm nmm:skipCounter
 nmm nmm:ImageList
 nmm nmm:Photo
-nmm nfo:device
 nmm nmm:exposureTime
 nmm nmm:Flash
 nmm nmm:flash-on