Browse code

- presence related modules uses a proper default DB URL instead of NULL like the other modules in the trunk - update module documentation

git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4449 689a6050-402a-0410-94f2-e92a70836424

Henning Westerholt authored on 04/07/2008 11:11:16
Showing 12 changed files
... ...
@@ -84,12 +84,12 @@ Chapter 1. Admin Guide
84 84
 
85 85
    The database url.
86 86
 
87
-   Default value is "NULL".
87
+   Default value is "mysql://openser:openserrw@localhost/openser".
88 88
 
89 89
    Example 1.1. Set db_url parameter
90 90
 ...
91
-modparam("presence_xml", "db_url",
92
-        "mysql://openser:openserrw@192.168.2.132/openser")
91
+modparam("presence_xml", "db_url", "dbdriver://username:password@dbhost/
92
+dbname")
93 93
 ...
94 94
 
95 95
 1.3.2. xcap_table(str)
... ...
@@ -79,15 +79,14 @@
79 79
 		The database url.
80 80
 		</para>
81 81
 		<para>
82
-		<emphasis>	Default value is <quote>NULL</quote>.	
82
+		<emphasis>	Default value is <quote>&defaultdb;</quote>.	
83 83
 		</emphasis>
84 84
 		</para>
85 85
 		<example>
86 86
 		<title>Set <varname>db_url</varname> parameter</title>
87 87
 		<programlisting format="linespecific">
88 88
 ...
89
-modparam("presence_xml", "db_url", 
90
-	"mysql://openser:openserrw@192.168.2.132/openser")
89
+modparam("presence_xml", "db_url", "&exampledb;")
91 90
 ...
92 91
 </programlisting>
93 92
 		</example>
... ...
@@ -70,7 +70,7 @@ pres_get_sphere_t pres_get_sphere;
70 70
 
71 71
 
72 72
 str xcap_table= str_init("xcap");
73
-str db_url = {0, 0};
73
+str db_url = str_init(DEFAULT_DB_URL);
74 74
 int force_active= 0;
75 75
 int pidf_manipulation= 0;
76 76
 int integrated_xcap_server= 0;
... ...
@@ -10,8 +10,8 @@ Anca-Maria Vamanu
10 10
 
11 11
    Copyright � 2006 voice-system.ro
12 12
    Revision History
13
-   Revision $Revision$ $Date: 2008-03-19 21:31:30 +0200
14
-                              (Wed, 19 Mar 2008) $
13
+   Revision $Revision$ $Date: 2008-03-19 20:31:30 +0100
14
+                              (Mi, 19 Mär 2008) $
15 15
      __________________________________________________________
16 16
 
17 17
    Table of Contents
... ...
@@ -119,12 +119,12 @@ modparam("pua", "hash_size", 11)
119 119
 
120 120
    Database url.
121 121
 
122
-   Default value is "NULL".
122
+   Default value is
123
+   ">mysql://openser:openserrw@localhost/openser".
123 124
 
124 125
    Example 1.2. Set db_url parameter
125 126
 ...
126
-modparam("pua", "db_url"
127
-                "mysql://openser:openserrw@192.168.2.132/openser")
127
+modparam("pua", "db_url" "dbdriver://username:password@dbhost/dbname")
128 128
 ...
129 129
 
130 130
 1.3.3. db_table (str)
... ...
@@ -90,15 +90,14 @@ modparam("pua", "hash_size", 11)
90 90
 		Database url.
91 91
 		</para>
92 92
 		<para>
93
-		<emphasis>Default value is <quote>NULL</quote>.
93
+		<emphasis>Default value is <quote>>&defaultdb;</quote>.
94 94
 		</emphasis>
95 95
 		</para>
96 96
 		<example>
97 97
 		<title>Set <varname>db_url</varname> parameter</title>
98 98
 		<programlisting format="linespecific">
99 99
 ...
100
-modparam("pua", "db_url" 
101
-		"mysql://openser:openserrw@192.168.2.132/openser")
100
+modparam("pua", "db_url" "&exampledb;")
102 101
 ...
103 102
 </programlisting>
104 103
 		</example>
... ...
@@ -61,7 +61,7 @@ int HASH_SIZE= -1;
61 61
 extern int bind_pua(pua_api_t* api);
62 62
 int min_expires= 0;
63 63
 int default_expires=3600;
64
-static str db_url = {0, 0};
64
+static str db_url = str_init(DEFAULT_DB_URL);
65 65
 static str db_table= str_init("pua");
66 66
 int update_period= 100;
67 67
 str outbound_proxy = {0, 0};
... ...
@@ -120,12 +120,11 @@ Chapter 1. Admin Guide
120 120
 
121 121
    The database url.
122 122
 
123
-   Default value is "NULL".
123
+   Default value is "mysql://openser:openserrw@localhost/openser".
124 124
 
125 125
    Example 1.1. Set db_url parameter
126 126
 ...
127
-modparam("rls", "db_url",
128
-        "mysql://openser:openserrw@192.168.2.132/openser")
127
+modparam("rls", "db_url", "dbdriver://username:password@dbhost/dbname")
129 128
 ...
130 129
 
131 130
 1.3.2. xcap_table(str)
... ...
@@ -97,15 +97,14 @@
97 97
 		The database url.
98 98
 		</para>
99 99
 		<para>
100
-		<emphasis>	Default value is <quote>NULL</quote>.	
100
+		<emphasis>	Default value is <quote>&defaultdb;</quote>.	
101 101
 		</emphasis>
102 102
 		</para>
103 103
 		<example>
104 104
 		<title>Set <varname>db_url</varname> parameter</title>
105 105
 		<programlisting format="linespecific">
106 106
 ...
107
-modparam("rls", "db_url", 
108
-	"mysql://openser:openserrw@192.168.2.132/openser")
107
+modparam("rls", "db_url", "&exampledb;")
109 108
 ...
110 109
 </programlisting>
111 110
 		</example>
... ...
@@ -70,7 +70,7 @@ str rlsubs_table= str_init("rls_watchers");
70 70
 str rlpres_table= str_init("rls_presentity");
71 71
 str rls_xcap_table= str_init("xcap");
72 72
 
73
-str db_url= {0, 0};
73
+str db_url= str_init(DEFAULT_DB_URL);
74 74
 int hash_size= 512;
75 75
 shtable_t rls_table;
76 76
 int pid;
... ...
@@ -96,12 +96,12 @@ Chapter 1. Admin Guide
96 96
 
97 97
    The database url.
98 98
 
99
-   Default value is "NULL".
99
+   Default value is "mysql://openser:openserrw@localhost/openser".
100 100
 
101 101
    Example 1.1. Set db_url parameter
102 102
 ...
103
-modparam("xcap_client", "db_url",
104
-        "mysql://openser:openserrw@192.168.2.132/openser")
103
+modparam("xcap_client", "db_url", "dbdriver://username:password@dbhost/d
104
+bname")
105 105
 ...
106 106
 
107 107
 1.3.2. xcap_table(str)
... ...
@@ -72,15 +72,14 @@
72 72
 		The database url.
73 73
 		</para>
74 74
 		<para>
75
-		<emphasis>	Default value is <quote>NULL</quote>.	
75
+		<emphasis>	Default value is <quote>&defaultdb;</quote>.	
76 76
 		</emphasis>
77 77
 		</para>
78 78
 		<example>
79 79
 		<title>Set <varname>db_url</varname> parameter</title>
80 80
 		<programlisting format="linespecific">
81 81
 ...
82
-modparam("xcap_client", "db_url", 
83
-	"mysql://openser:openserrw@192.168.2.132/openser")
82
+modparam("xcap_client", "db_url", "&exampledb;")
84 83
 ...
85 84
 </programlisting>
86 85
 		</example>
... ...
@@ -58,7 +58,7 @@ void destroy(void);
58 58
 struct mi_root* refreshXcapDoc(struct mi_root* cmd, void* param);
59 59
 int get_auid_flag(str auid);
60 60
 str xcap_db_table = str_init("xcap");
61
-str xcap_db_url = {0, 0};
61
+str xcap_db_url = str_init(DEFAULT_DB_URL);
62 62
 xcap_callback_t* xcapcb_list= NULL;
63 63
 int periodical_query= 1;
64 64
 unsigned int query_period= 100;