Added updated contacts-related performance queries.

Added queries and fixed some issues in the data-generators.

2 files changed, 58 insertions, 20 deletions

diff --git a/utils/data-generators/cc/generate b/utils/data-generators/cc/generate
index de87599b8..92ab7a4ee 100755
--- a/utils/data-generators/cc/generate
+++ b/utils/data-generators/cc/generate
@@ -37,7 +37,8 @@ except:
 tools.addType( 'nco#EmailAddress', 10 )
 tools.addType( 'nco#PostalAddress', 11 )
 tools.addType( 'nco#PhoneNumber', 12 )
-tools.addType( 'nco#PersonContact', 13 )
+tools.addType( 'nco#IMAddress', 13 )
+tools.addType( 'nco#PersonContact', 18 )
 tools.addType( 'nmm#Photo', 20 )
 tools.addType( 'nmm#Video', 21 )
 tools.addType( 'nmo#MailAccount', 30 )
@@ -73,6 +74,7 @@ for contact in xrange(1, count_contacts+1):
   nco.generateEmailAddress( contact )
   nco.generatePostalAddress( contact )
   nco.generatePhoneNumber( contact )
+  nco.generateIMAddress ( contact )
   nco.generatePersonContact( contact )
 print "Done"
 
diff --git a/utils/data-generators/cc/nco.py b/utils/data-generators/cc/nco.py
index 6e2cd290b..0a6b09f64 100644
--- a/utils/data-generators/cc/nco.py
+++ b/utils/data-generators/cc/nco.py
@@ -29,16 +29,19 @@ def generatePhoneNumber(index):
 ####################################################################################
 nco_PostalAddress = '''
 <%(postal_address_uri)s> a nco:PostalAddress;
-    nco:country "%(postal_address_country)s" ;
-    nco:region "%(postal_address_region)s" ;
-    nco:postalcode "%(postal_address_postal_code)s" ;
-    nco:locality "%(postal_address_city)s" ;
-    nco:streetAddress "%(postal_address_street)s" .
+    nco:country         "%(postal_address_country)s" ;
+    nco:pobox           "%(postal_address_pobox)s" ;
+    nco:region          "%(postal_address_region)s" ;
+    nco:postalcode      "%(postal_address_postal_code)s" ;
+    nco:locality        "%(postal_address_city)s" ;
+    nco:streetAddress   "%(postal_address_street)s" .
 '''
 def generatePostalAddress(index):
   me = 'nco#PostalAddress'
   postal_address_uri         = 'urn:pa:%d' % index
   postal_address_country     = 'Country %d' % (index % 1000)
+  postal_address_locality    = 'Locality %d' % (index % 1000)
+  postal_address_pobox       = str(index)
   postal_address_region      = 'Region %d' % (index % 1000)
   postal_address_postal_code = '%05d' % (index % 100000)
   postal_address_city        = 'City %d' % (index % 1000)
@@ -47,24 +50,57 @@ def generatePostalAddress(index):
   tools.addItem( me, postal_address_uri, nco_PostalAddress % locals() )
 
 ####################################################################################
+nco_IMAddress = '''
+<%(im_address_uri)s> a nco:IMAddress;
+    nco:imID         "%(im_address_imid)s" ;
+    nco:imCapability  %(im_address_capability)s .
+'''
+def generateIMAddress(index):
+  me = 'nco#IMAddress'
+  im_address_uri          = 'urn:ima:%d' % index
+  im_address_imid         = 'IM ID %d' % (index % 1000)
+  im_address_capability   = '<%s>' % ('nco:im-capability-text-chat', 'nco:im-capability-audio-calls') [ index %2 ]
+  tools.addItem( me, im_address_uri, nco_IMAddress % locals() )
+
+####################################################################################
 nco_PersonContact = '''
 <%(contact_uri)s> a nco:PersonContact;
-    nco:fullname         "%(contact_name_given)s %(contact_name_family)s";
-    nco:nameGiven        "%(contact_name_given)s";
-    nco:nameFamily       "%(contact_name_family)s";
-    nco:birthDate        "%(contact_birth_date)s";
-    nco:hasEmailAddress   %(email_address_uri)s;
-    nco:hasPhoneNumber    %(phonenumber_uri)s;
-    nco:hasPostalAddress  %(postal_address_uri)s .
+    nco:fullname            "%(contact_name_given)s %(contact_name_family)s";
+    nco:nameGiven           "%(contact_name_given)s";
+    nco:nameFamily          "%(contact_name_family)s";
+    nco:nameAdditional      "%(contact_name_additional)s" ;
+    nco:nickname            "%(contact_nickname)s" ;
+    nco:nameHonorificPrefix "%(contact_honorific_prefix)s" ;
+    nco:nameHonorificSuffix "%(contact_honorific_suffix)s" ;
+    nco:birthDate           "%(contact_birth_date)s" ;
+    nco:gender               %(contact_gender)s ;
+    nco:contactUID          "%(contact_uid)s" ;
+    nco:note                "%(contact_note)s" ;
+    nco:hasEmailAddress      %(email_address_uri)s ;
+    nco:hasPhoneNumber       %(phonenumber_uri)s ;
+    nco:hasPostalAddress     %(postal_address_uri)s ;
+    nco:hasIMAddress         %(im_address_uri)s ;
+    nie:contentCreated      "%(contact_created)s" ;
+    nie:contentLastModified "%(contact_modified)s"  .
 '''
 def generatePersonContact(index):
   me = 'nco#PersonContact'
-  contact_uri         = 'urn:uid:%d' % index
-  contact_name_given  = 'Given%d' % (index % 1000)
-  contact_name_family = 'Family%d' % (index % 1000)
-  contact_birth_date  = '%d-%02d-%02dT%02d:%02d:%02dZ' % (1900 + (index % 100), (index % 12) + 1, (index % 25) + 1, (index % 12) + 1, (index % 12) + 1, (index % 12) + 1)
-  email_address_uri   = '<%s>' % tools.getLastUri( 'nco#EmailAddress' )
-  phonenumber_uri     = '<%s>' % tools.getLastUri( 'nco#PhoneNumber' )
-  postal_address_uri  = '<%s>' % tools.getLastUri( 'nco#PostalAddress' )
+  contact_uri              = 'urn:uid:%d' % index
+  contact_name_given       = 'Given%d' % (index % 1000)
+  contact_name_family      = 'Family%d' % (index % 1000)
+  contact_name_additional  = 'Additional%d' % (index % 1000)
+  contact_nickname         = 'Nickname%d' % (index % 1000)
+  contact_honorific_prefix = ('Sir', 'Master') [index % 2]
+  contact_honorific_suffix = ('PhD', 'Deceased') [index % 2]
+  contact_birth_date       = '%d-%02d-%02dT%02d:%02d:%02dZ' % (1900 + (index % 100), (index % 12) + 1, (index % 25) + 1, (index % 12) + 1, (index % 12) + 1, (index % 12) + 1)
+  contact_gender           = '<%s>' % ('nco:gender-female', 'nco:gender-female') [index % 2]
+  contact_uid              = 'uid:contact:%d' % index
+  contact_note             = 'Note number %d' % index
+  email_address_uri        = '<%s>' % tools.getLastUri( 'nco#EmailAddress' )
+  phonenumber_uri          = '<%s>' % tools.getLastUri( 'nco#PhoneNumber' )
+  postal_address_uri       = '<%s>' % tools.getLastUri( 'nco#PostalAddress' )
+  im_address_uri           = '<%s>' % tools.getLastUri( 'nco#IMAddress' )
+  contact_created          = '%d-%02d-%02dT%02d:%02d:%02dZ' % (1950 + (index % 50), (index % 12) + 1, (index % 25) + 1, (index % 12) + 1, (index % 12) + 1, (index % 12) + 1)
+  contact_modified         = '%d-%02d-%02dT%02d:%02d:%02dZ' % (1960 + (index % 40), (index % 12) + 1, (index % 25) + 1, (index % 12) + 1, (index % 12) + 1, (index % 12) + 1)
 
   tools.addItem( me, contact_uri, nco_PersonContact % locals() )