GNOME.org
 

[tracker] NCO: Remove deprecated ontology classes and properties

commit ba2c647d739bc7118be83904e9440d55f81b5372
Author: Jürg Billeter <j bitron ch>
Date:   Tue Oct 12 16:48:52 2010 +0200

    NCO: Remove deprecated ontology classes and properties
    
    They were deprecated 11 months ago.

 data/ontologies/32-nco.ontology           |   88 +----------------------------
 tests/functional-tests/04-group-concat.py |   22 ++++----
 tests/functional-tests/05-coalesce.py     |   11 ++-
 3 files changed, 20 insertions(+), 101 deletions(-)
---
diff --git a/data/ontologies/32-nco.ontology b/data/ontologies/32-nco.ontology
index 7a80d0f..9b3440e 100644
--- a/data/ontologies/32-nco.ontology
+++ b/data/ontologies/32-nco.ontology
@@ -11,7 +11,7 @@
 
 nco: a tracker:Namespace, tracker:Ontology ;
 	tracker:prefix "nco" ;
-	nao:lastModified "2010-01-18T17:50:00Z" .
+	nao:lastModified "2011-01-25T13:30:00Z" .
 
 nco:Role a rdfs:Class ;
 	rdfs:label "Role" ;
@@ -59,13 +59,11 @@ nco:IMAddress a rdfs:Class ;
 	tracker:notify true ;
 	rdfs:subClassOf nco:ContactMedium .
 
-# switch to rdfs:subClassOf nie:InformationElement
-# after transition period
 nco:IMAccount a rdfs:Class ;
 	rdfs:label "IMAccount" ;
 	rdfs:comment "An account in an Instant Messaging system. This refers to IM accounts of the user 'me'." ;
 	tracker:notify true ;
-	rdfs:subClassOf nco:IMAddress .
+	rdfs:subClassOf nie:InformationElement .
 
 nco:OrganizationContact a rdfs:Class ;
 	rdfs:label "OrganizationContact" ;
@@ -81,18 +79,6 @@ nco:PersonContact a rdfs:Class ;
 nco:default-contact-me a nco:PersonContact.
 nco:default-contact-emergency a nco:PersonContact.
 
-nco:IMContact a rdfs:Class ;
-	rdfs:label "IM Contact" ;
-	rdfs:comment "Contact coming from an IM Account. This has been deprecated in favor of using nco:PersonContact with nco:hasIMAddress." ;
-	nao:deprecated true ;
-	rdfs:subClassOf nco:PersonContact .
-
-nco:MetaContact a rdfs:Class ;
-	rdfs:label "MetaContact" ;
-	rdfs:comment "A metacontact groups PersonContacts and IMContacts coming from different sources, indicating that are the same entity in the real world. This has been deprecated in favor of merged contacts. Linking multiple contacts to a single person without merging is the task of pimo:Person and pimo:groundingOccurrence." ;
-	nao:deprecated true ;
-	rdfs:subClassOf rdfs:Resource.
-
 nco:PhoneNumber a rdfs:Class ;
 	rdfs:label "PhoneNumber" ;
 	rdfs:comment "A telephone number." ;
@@ -213,14 +199,6 @@ nco:url a rdf:Property ;
 	rdfs:range rdfs:Resource ;
 	tracker:weight 4 .
 
-nco:metacontact a rdf:Property ;
-	rdfs:label "metacontact" ;
-	rdfs:comment "Link a single contact with a metacontact" ;
-	nrl:maxCardinality 1 ;
-	nao:deprecated true ;
-	rdfs:domain nco:PersonContact ;
-	rdfs:range nco:MetaContact .
-
 nco:contributor a rdf:Property ;
 	rdfs:label "contributor" ;
 	rdfs:comment "An entity responsible for making contributions to the content of the InformationElement." ;
@@ -325,21 +303,6 @@ nco:extendedAddress a rdf:Property ;
 	tracker:fulltextIndexed true ;
 	tracker:weight 6 .
 
-nco:hasIMAccount a rdf:Property ;
-	rdfs:label "hasIMAccount" ;
-	rdfs:comment "Indicates that an Instant Messaging account owned by an entity represented by this contact." ;
-	nao:deprecated true ;
-	rdfs:domain nco:PersonContact ;
-	rdfs:range nco:IMAccount ;
-	tracker:indexed true .
-
-nco:fromIMAccount a rdf:Property ;
-	rdfs:label "hasIMAccount" ;
-	rdfs:comment "Indicates that an Instant Messaging account owned by an entity represented by this contact. This has been replaced by nco:fromIMAccount." ;
-	nao:deprecated true ;
-	rdfs:domain nco:IMContact ;
-	rdfs:range nco:IMAccount .
-
 nco:hasIMContact a rdf:Property ;
 	rdfs:label "hasIMAccount" ;
 	rdfs:comment "Indicates that this Instant Messaging account has the specified Instant Messaging address in the contact list." ;
@@ -720,14 +683,6 @@ nco:imEnabled a rdf:Property ;
 	rdfs:domain nco:IMAccount ;
 	rdfs:range xsd:boolean .
 
-nco:imAccountAvatar a rdf:Property ;
-	rdfs:label "account avatar" ;
-	rdfs:comment "The picture the user wants to show to others in this account. This has been replaced by nco:imAvatar.";
-	nao:deprecated true ;
-	nrl:maxCardinality 1 ;
-	rdfs:domain nco:IMAccount ;
-	rdfs:range nie:DataObject .
-
 nco:gender a rdf:Property ;
 	rdfs:label "gender" ;
 	rdfs:comment "Gender of the given contact." ;
@@ -744,30 +699,6 @@ nco:hasAffiliation a rdf:Property ;
 #
 # IM related properties
 #
-nco:imContactId a rdf:Property ;
-	rdfs:label "imContactId" ;
-	rdfs:comment "ID of the contact in the service like my friend xmail com  This has been replaced by nco:imId." ;
-	nao:deprecated true ;
-	nrl:maxCardinality 1;
-	rdfs:domain nco:IMContact ;
-	rdfs:range xsd:string .
-
-nco:imContactNickname a rdf:Property ;
-	rdfs:label "imContactNickname" ;
-	rdfs:comment "Visible nickname of the user in a service. This has been replaced by nco:imNickname.";
-	nao:deprecated true ;
-	nrl:maxCardinality 1;
-	rdfs:domain nco:IMContact ;
-	rdfs:range xsd:string .
-
-nco:imContactStatusMessage a rdf:Property ;
-	rdfs:label "imContactStatusMessage" ;
-	rdfs:comment "Status message of the user in a service. This has been replaced by nco:imStatusMessage.";
-	nao:deprecated true ;
-	nrl:maxCardinality 1;
-	rdfs:domain nco:IMContact ;
-	rdfs:range xsd:string .
-
 nco:PresenceStatus a rdfs:Class ;
         rdfs:label "Presence statuses";
 	rdfs:comment "Predefined set of status level instances" ;
@@ -783,14 +714,6 @@ nco:presence-status-busy a nco:PresenceStatus .
 nco:presence-status-unknown a nco:PresenceStatus .
 nco:presence-status-error a nco:PresenceStatus .
 
-nco:imContactPresence a rdf:Property ;
-	rdfs:label "imContactPresence" ;
-	rdfs:comment "Online availability of the user in a service. This has been replaced by nco:imPresence.";
-	nao:deprecated true ;
-	nrl:maxCardinality 1;
-	rdfs:domain nco:IMContact ;
-	rdfs:range nco:PresenceStatus .
-
 nco:imPresence a rdf:Property ;
 	rdfs:label "imPresence" ;
 	nrl:maxCardinality 1 ;
@@ -819,13 +742,6 @@ nco:im-capability-stream-tubes a nco:IMCapability .
 nco:im-capability-dbus-tubes a nco:IMCapability .
 
 
-nco:imContactCapability a rdf:Property ;
-	rdfs:label "imContact Capability";
-	rdfs:comment "Capabilities of an IM Contact, what can we interact with him. This has been replaced by nco:imCapability.";
-	nao:deprecated true ;
-	rdfs:domain nco:IMContact ;
-	rdfs:range nco:IMCapability .
-
 nco:imCapability a rdf:Property ;
 	rdfs:label "imContact Capability";
 	rdfs:comment "Capabilities of an IM Contact, what can we interact with him";
diff --git a/tests/functional-tests/04-group-concat.py b/tests/functional-tests/04-group-concat.py
index 4a6b4ca..5fdfaf5 100755
--- a/tests/functional-tests/04-group-concat.py
+++ b/tests/functional-tests/04-group-concat.py
@@ -44,20 +44,20 @@ class TestGroupConcat (CommonTrackerStoreTest):
         uri = "contact://test_group_concat"
         
         insert = """
-        INSERT { <%s> a nco:IMContact;
-                      nco:fullname \"test_group_concat\";
-                      nco:imContactCapability nco:im-capability-text-chat ;
-                      nco:imContactCapability nco:im-capability-media-calls ;
-                      nco:imContactCapability nco:im-capability-file-transfers .
+        INSERT { <%s> a nco:IMAddress;
+                      nco:imID \"test_group_concat\";
+                      nco:imCapability nco:im-capability-text-chat ;
+                      nco:imCapability nco:im-capability-media-calls ;
+                      nco:imCapability nco:im-capability-file-transfers .
          }
         """ % (uri)
         self.tracker.update (insert)
 
         query = """
         SELECT ?c ?capability WHERE {
-           ?c a nco:IMContact ;
-              nco:fullname \"test_group_concat\";
-              nco:imContactCapability ?capability .
+           ?c a nco:IMAddress ;
+              nco:imID \"test_group_concat\";
+              nco:imCapability ?capability .
         }
         """ 
         results = self.tracker.query (query)
@@ -65,9 +65,9 @@ class TestGroupConcat (CommonTrackerStoreTest):
         assert len (results) == 3
         group_concat_query = """
         SELECT ?c GROUP_CONCAT (?capability, '|') AS ?cap WHERE {
-           ?c a nco:IMContact ;
-              nco:fullname \"test_group_concat\";
-              nco:imContactCapability ?capability .
+           ?c a nco:IMAddress ;
+              nco:imID \"test_group_concat\";
+              nco:imCapability ?capability .
         } GROUP BY (?c)
         """ 
         results = self.tracker.query (group_concat_query)
diff --git a/tests/functional-tests/05-coalesce.py b/tests/functional-tests/05-coalesce.py
index 10885ac..d574c27 100755
--- a/tests/functional-tests/05-coalesce.py
+++ b/tests/functional-tests/05-coalesce.py
@@ -43,7 +43,7 @@ class TestCoalesce (CommonTrackerStoreTest):
         # nco:nickname and nco:note are not set
         #
         insert = """
-        INSERT { <%s> a nco:IMContact;
+        INSERT { <%s> a nco:PersonContact;
                       nco:fullname \"full name\" ;
                       nco:nameFamily \"family name\" .
          }
@@ -67,11 +67,12 @@ class TestCoalesce (CommonTrackerStoreTest):
 
         query = """
         SELECT tracker:coalesce (?full, ?family, ?nickname, ?note, 'test_coalesce') WHERE {
-           ?c a nco:IMContact .
+           ?c a nco:PersonContact .
            OPTIONAL { ?c nco:fullname ?full }
            OPTIONAL { ?c nco:nameFamily ?family }
            OPTIONAL { ?c nco:nickname ?nickname }
            OPTIONAL { ?c nco:note ?note }
+           FILTER (?c != nco:default-contact-me && ?c != nco:default-contact-emergency)
         }
         """ 
         results = self.tracker.query (query)
@@ -88,11 +89,12 @@ class TestCoalesce (CommonTrackerStoreTest):
 
         query = """
         SELECT tracker:coalesce (?nickname, ?family, ?full, ?note, 'test_coalesce') WHERE {
-           ?c a nco:IMContact .
+           ?c a nco:PersonContact .
            OPTIONAL { ?c nco:fullname ?full }
            OPTIONAL { ?c nco:nameFamily ?family }
            OPTIONAL { ?c nco:nickname ?nickname }
            OPTIONAL { ?c nco:note ?note }
+           FILTER (?c != nco:default-contact-me && ?c != nco:default-contact-emergency)
         }
         """ 
         results = self.tracker.query (query)
@@ -109,11 +111,12 @@ class TestCoalesce (CommonTrackerStoreTest):
 
         query = """
         SELECT tracker:coalesce (?nickname, ?note, 'test_coalesce') WHERE {
-           ?c a nco:IMContact .
+           ?c a nco:PersonContact .
            OPTIONAL { ?c nco:fullname ?full }
            OPTIONAL { ?c nco:nameFamily ?family }
            OPTIONAL { ?c nco:nickname ?nickname }
            OPTIONAL { ?c nco:note ?note }
+           FILTER (?c != nco:default-contact-me && ?c != nco:default-contact-emergency)
         }
         """ 
         results = self.tracker.query (query)
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]