[SVN-NetXMS] revision 3365

* { font-family: Consolas, Lucida Console, Courier New; font-size: 100%; }
h1 { font-size: 150%; }
td.linenos { background-color: #f0f0f0; padding-right: 10px; }
span.lineno { background-color: #f0f0f0; padding: 0 5px 0 5px; }
pre { line-height: 100%; width: 100%; }
.highlight span { width: 100%; display:-moz-inline-stack; display:inline-block; zoom:1; *display:inline; }
body { background: #ffffff; }
body .c { color: #999988; font-style: italic } /* Comment */
body .err { color: #a61717; background-color: #e3d2d2 } /* Error */
body .k { font-weight: bold } /* Keyword */
body .o { font-weight: bold } /* Operator */
body .cm { color: #999988; font-style: italic } /* Comment.Multiline */
body .cp { color: #999999; font-weight: bold } /* Comment.Preproc */
body .c1 { color: #999988; font-style: italic } /* Comment.Single */
body .cs { color: #999999; font-weight: bold; font-style: italic } /* Comment.Special */
body .gd { color: #000000; background-color: #ffdddd } /* Generic.Deleted */
body .ge { font-style: italic } /* Generic.Emph */
body .gr { color: #aa0000 } /* Generic.Error */
body .gh { color: #999999 } /* Generic.Heading */
body .gi { color: #000000; background-color: #ddffdd } /* Generic.Inserted */
body .go { color: #888888 } /* Generic.Output */
body .gp { color: #555555 } /* Generic.Prompt */
body .gs { font-weight: bold } /* Generic.Strong */
body .gu { color: #aaaaaa } /* Generic.Subheading */
body .gt { color: #aa0000 } /* Generic.Traceback */
body .kc { font-weight: bold } /* Keyword.Constant */
body .kd { font-weight: bold } /* Keyword.Declaration */
body .kp { font-weight: bold } /* Keyword.Pseudo */
body .kr { font-weight: bold } /* Keyword.Reserved */
body .kt { color: #445588; font-weight: bold } /* Keyword.Type */
body .m { color: #009999 } /* Literal.Number */
body .s { color: #bb8844 } /* Literal.String */
body .na { color: #008080 } /* Name.Attribute */
body .nb { color: #999999 } /* Name.Builtin */
body .nc { color: #445588; font-weight: bold } /* Name.Class */
body .no { color: #008080 } /* Name.Constant */
body .ni { color: #800080 } /* Name.Entity */
body .ne { color: #990000; font-weight: bold } /* Name.Exception */
body .nf { color: #990000; font-weight: bold } /* Name.Function */
body .nn { color: #555555 } /* Name.Namespace */
body .nt { color: #000080 } /* Name.Tag */
body .nv { color: #008080 } /* Name.Variable */
body .ow { font-weight: bold } /* Operator.Word */
body .w { color: #bbbbbb } /* Text.Whitespace */
body .mf { color: #009999 } /* Literal.Number.Float */
body .mh { color: #009999 } /* Literal.Number.Hex */
body .mi { color: #009999 } /* Literal.Number.Integer */
body .mo { color: #009999 } /* Literal.Number.Oct */
body .sb { color: #bb8844 } /* Literal.String.Backtick */
body .sc { color: #bb8844 } /* Literal.String.Char */
body .sd { color: #bb8844 } /* Literal.String.Doc */
body .s2 { color: #bb8844 } /* Literal.String.Double */
body .se { color: #bb8844 } /* Literal.String.Escape */
body .sh { color: #bb8844 } /* Literal.String.Heredoc */
body .si { color: #bb8844 } /* Literal.String.Interpol */
body .sx { color: #bb8844 } /* Literal.String.Other */
body .sr { color: #808000 } /* Literal.String.Regex */
body .s1 { color: #bb8844 } /* Literal.String.Single */
body .ss { color: #bb8844 } /* Literal.String.Symbol */
body .bp { color: #999999 } /* Name.Builtin.Pseudo */
body .vc { color: #008080 } /* Name.Variable.Class */
body .vg { color: #008080 } /* Name.Variable.Global */
body .vi { color: #008080 } /* Name.Variable.Instance */
body .il { color: #009999 } /* Literal.Number.Integer.Long */

Info

Revision:3365
Author:victor

Date:2008-07-04 10:27:33 +0300 (Fri, 04 Jul 2008)

Comment:new NXCP commands added; table config_clob added

Changes
U trunk/doc/internal/db_format_change.txt
U trunk/include/netxms-version.h
U trunk/include/netxmsdb.h
U trunk/include/nms_cscp.h
U trunk/sql/schema.in
U trunk/src/libnetxms/nxcp.cpp
U trunk/src/server/tools/nxdbmgr/upgrade.cpp

Diff
Modified: trunk/doc/internal/db_format_change.txt
===================================================================
--- trunk/doc/internal/db_format_change.txt 2008-07-02 12:50:24 UTC (rev 3364)
+++ trunk/doc/internal/db_format_change.txt 2008-07-04 07:27:33 UTC (rev 3365)
@@ -1,4 +1,17 @@
 *************
+* 81 ==> 82 *
+*************
+
+- New table added:
+ CREATE TABLE config_clob
+ (
+ var_name varchar(63) not null,
+ var_value SQL_TEXT not null,
+ PRIMARY KEY(var_name)
+ ) TABLE_TYPE;
+
+
+*************
 * 80 ==> 81 *
 *************
 
@@ -11,10 +24,10 @@
 - New tables added:
         CREATE TABLE object_custom_attributes
         (
- object_id integer not null,
- attr_name varchar(127) not null,
- attr_value SQL_TEXT not null,
- PRIMARY KEY(object_id,attr_name)
+ object_id integer not null,
+ attr_name varchar(127) not null,
+ attr_value SQL_TEXT not null,
+ PRIMARY KEY(object_id,attr_name)
         ) TABLE_TYPE;
         CREATE TABLE web_maps
         (

Modified: trunk/include/netxms-version.h
===================================================================
--- trunk/include/netxms-version.h 2008-07-02 12:50:24 UTC (rev 3364)
+++ trunk/include/netxms-version.h 2008-07-04 07:27:33 UTC (rev 3365)
@@ -33,7 +33,7 @@
 #define NETXMS_VERSION_MINOR 2
 #define NETXMS_VERSION_BUILD 22
 #define NETXMS_VERSION_HOTFIX 0
-#define NETXMS_VERSION_STRING _T("0.2.22")
+#define NETXMS_VERSION_STRING _T("0.2.22-rc1")
 
 
 //

Modified: trunk/include/netxmsdb.h
===================================================================
--- trunk/include/netxmsdb.h 2008-07-02 12:50:24 UTC (rev 3364)
+++ trunk/include/netxmsdb.h 2008-07-04 07:27:33 UTC (rev 3365)
@@ -24,6 +24,6 @@
 #ifndef _netxmsdb_h
 #define _netxmsdb_h
 
-#define DB_FORMAT_VERSION 81
+#define DB_FORMAT_VERSION 82
 
 #endif

Modified: trunk/include/nms_cscp.h
===================================================================
--- trunk/include/nms_cscp.h 2008-07-02 12:50:24 UTC (rev 3364)
+++ trunk/include/nms_cscp.h 2008-07-04 07:27:33 UTC (rev 3365)
@@ -460,6 +460,14 @@
 #define CMD_SITUATION_DATA 0x00D8
 #define CMD_SITUATION_CHANGE 0x00D9
 #define CMD_CREATE_MAP 0x00DA
+#define CMD_WEBMAP_ADD 0x00DB
+#define CMD_WEBMAP_UPDATE_PROPS 0x00DC
+#define CMD_WEBMAP_UPDATE_DATA 0x00DD
+#define CMD_WEBMAP_DELETE 0x00DE
+#define CMD_WEBMAP_GET_DATA 0x00DF
+#define CMD_WEBMAP_GET_LIST 0x00E0
+#define CMD_CONFIG_SET_CLOB 0x00E1
+#define CMD_CONFIG_GET_CLOB 0x00E2
 
 
 //

Modified: trunk/sql/schema.in
===================================================================
--- trunk/sql/schema.in 2008-07-02 12:50:24 UTC (rev 3364)
+++ trunk/sql/schema.in 2008-07-04 07:27:33 UTC (rev 3365)
@@ -25,6 +25,18 @@
 
 
 /*
+** System configuration data (for large data)
+*/
+
+CREATE TABLE config_clob
+(
+ var_name varchar(63) not null,
+ var_value SQL_TEXT not null,
+ PRIMARY KEY(var_name)
+) TABLE_TYPE;
+
+
+/*
 ** Users
 */
 

Modified: trunk/src/libnetxms/nxcp.cpp
===================================================================
--- trunk/src/libnetxms/nxcp.cpp 2008-07-02 12:50:24 UTC (rev 3364)
+++ trunk/src/libnetxms/nxcp.cpp 2008-07-04 07:27:33 UTC (rev 3365)
@@ -257,10 +257,18 @@
                 _T("CMD_UPDATE_SITUATION"),
                 _T("CMD_SITUATION_DATA"),
                 _T("CMD_SITUATION_CHANGE"),
- _T("CMD_CREATE_MAP")
+ _T("CMD_CREATE_MAP"),
+ _T("CMD_WEBMAP_ADD"),
+ _T("CMD_WEBMAP_UPDATE_PROPS"),
+ _T("CMD_WEBMAP_UPDATE_DATA"),
+ _T("CMD_WEBMAP_DELETE"),
+ _T("CMD_WEBMAP_GET_DATA"),
+ _T("CMD_WEBMAP_GET_LIST"),
+ _T("CMD_CONFIG_SET_CLOB"),
+ _T("CMD_CONFIG_GET_CLOB")
    };
 
- if ((wCode >= CMD_LOGIN) && (wCode <= CMD_CREATE_MAP))
+ if ((wCode >= CMD_LOGIN) && (wCode <= CMD_CONFIG_GET_CLOB))
       _tcscpy(pszBuffer, pszMsgNames[wCode - CMD_LOGIN]);
    else
       _sntprintf(pszBuffer, 64, _T("CMD_UNKNOWN(%d)"), wCode);

Modified: trunk/src/server/tools/nxdbmgr/upgrade.cpp
===================================================================
--- trunk/src/server/tools/nxdbmgr/upgrade.cpp 2008-07-02 12:50:24 UTC (rev 3364)
+++ trunk/src/server/tools/nxdbmgr/upgrade.cpp 2008-07-04 07:27:33 UTC (rev 3365)
@@ -103,6 +103,27 @@
 
 
 //
+// Upgrade from V81 to V82
+//
+
+static BOOL H_UpgradeFromV81(void)
+{
+ if (!CreateTable(_T("CREATE TABLE config_clob (")
+ _T("var_name varchar(63) not null,")
+ _T("var_value $SQL:TEXT not null,")
+ _T("PRIMARY KEY(var_name))")))
+ if (!g_bIgnoreErrors)
+ return FALSE;
+
+ if (!SQLQuery(_T("UPDATE config SET var_value='82' WHERE var_name='DBFormatVersion'")))
+ if (!g_bIgnoreErrors)
+ return FALSE;
+
+ return TRUE;
+}
+
+
+//
 // Upgrade from V80 to V81
 //
 
@@ -3626,6 +3647,7 @@
    { 78, H_UpgradeFromV78 },
    { 79, H_UpgradeFromV79 },
    { 80, H_UpgradeFromV80 },
+ { 81, H_UpgradeFromV81 },
    { 0, NULL }
 };
 
Received on Fri Jul 04 2008 - 10:27:35 EEST