corrected work with UIDs in PA module

db/schema/presentity.xml

@@ -29,6 +29,12 @@
 	<type>string</type>
 	<size>&uri_len;</size>
     </column>
+    
+	<column id="presentity.uid">
+	<name>uid</name>
+	<type>string</type>
+	<size>&id_len;</size>
+    </column>
 
     <column>
 	<name>pdomain</name>

lib/presence/xpidf.c

@@ -42,7 +42,7 @@ static void doc_add_tuple_note(dstring_t *buf, presence_note_t *n)
 	dstr_append_zt(buf, "</note>\r\n");
 }
 
-static void doc_add_note(dstring_t *buf, presentity_info_t *p, presence_note_t *n)
+/*static void doc_add_note(dstring_t *buf, presentity_info_t *p, presence_note_t *n)
 {
 	DEBUG_LOG("doc_add_note()\n");
 	
@@ -55,7 +55,7 @@ static void doc_add_note(dstring_t *buf, presentity_info_t *p, presence_note_t *
 	dstr_append_zt(buf, ">");
 	dstr_append_str(buf, &n->value);	
 	dstr_append_zt(buf, "</note>\r\n");
-}
+}*/
 
 static void doc_add_tuple(dstring_t *buf, presentity_info_t *p, presence_tuple_info_t *t)
 {

scripts/dbtext/ser_db/presentity

@@ -1 +1 @@
-presid(int,auto) uri(str) pdomain(str) 
+presid(int,auto) uri(str) uid(str) pdomain(str) 

scripts/mysql/my_create.sql

@@ -318,6 +318,7 @@ CREATE TABLE sd_attrs (
 CREATE TABLE presentity (
     presid INT(10) UNSIGNED AUTO_INCREMENT NOT NULL,
     uri VARCHAR(255) NOT NULL,
+    uid VARCHAR(64) NOT NULL,
     pdomain VARCHAR(128) NOT NULL,
     UNIQUE KEY presentity_key (presid),
     KEY presentity_key2 (uri)

scripts/oracle/or_create.sql

@@ -305,6 +305,7 @@ CREATE TABLE sd_attrs (
 CREATE TABLE presentity (
     presid int(10) NOT NULL,
     uri string(255) NOT NULL,
+    uid string(64) NOT NULL,
     pdomain string(128) NOT NULL,
     presentity_key UNIQUE (presid, ),
 

scripts/postgres/pg_create.sql

@@ -328,6 +328,7 @@ CREATE TABLE sd_attrs (
 CREATE TABLE presentity (
     presid SERIAL NOT NULL,
     uri VARCHAR(255) NOT NULL,
+    uid VARCHAR(64) NOT NULL,
     pdomain VARCHAR(128) NOT NULL,
     CONSTRAINT presentity_key UNIQUE (presid)
 );