* { 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:3412
Author:victor
Date:2007-09-23 17:25:04 +0300 (Sun, 23 Sep 2007)
Comment:implemented map rename
Changes
U trunk/include/netxms_maps.h
U trunk/include/nms_cscp.h
U trunk/include/nxclapi.h
U trunk/src/console/win32/MapManager.cpp
U trunk/src/console/win32/MapManager.h
U trunk/src/libnetxms/nxcp.cpp
U trunk/src/libnxcl/map.cpp
U trunk/src/nxmibc/parser.y
U trunk/src/server/core/session.cpp
U trunk/src/server/include/nms_core.h
Diff
Modified: trunk/include/netxms_maps.h
===================================================================
--- trunk/include/netxms_maps.h 2008-08-18 19:59:08 UTC (rev 3411)
+++ trunk/include/netxms_maps.h 2007-09-23 14:25:04 UTC (rev 3412)
@@ -330,6 +330,8 @@
void Lock(void) { MutexLock(m_mutex, INFINITE); }
void Unlock(void) { MutexUnlock(m_mutex); }
+ void SetName(const TCHAR *name) { safe_free(m_pszName); m_pszName = _tcsdup(name); }
+
DWORD MapId(void) { return m_dwMapId; }
DWORD ObjectId(void) { return m_dwObjectId; }
TCHAR *Name(void) { return CHECK_NULL(m_pszName); }
Modified: trunk/include/nms_cscp.h
===================================================================
--- trunk/include/nms_cscp.h 2008-08-18 19:59:08 UTC (rev 3411)
+++ trunk/include/nms_cscp.h 2007-09-23 14:25:04 UTC (rev 3412)
@@ -468,6 +468,7 @@
#define CMD_WEBMAP_GET_LIST 0x00E0
#define CMD_CONFIG_SET_CLOB 0x00E1
#define CMD_CONFIG_GET_CLOB 0x00E2
+#define CMD_RENAME_MAP 0x00E3
//
Modified: trunk/include/nxclapi.h
===================================================================
--- trunk/include/nxclapi.h 2008-08-18 19:59:08 UTC (rev 3411)
+++ trunk/include/nxclapi.h 2007-09-23 14:25:04 UTC (rev 3412)
@@ -2063,6 +2063,7 @@
DWORD LIBNXCL_EXPORTABLE NXCCreateMap(NXC_SESSION hSession, DWORD dwRootObj,
TCHAR *pszName, DWORD *pdwMapId);
DWORD LIBNXCL_EXPORTABLE NXCDeleteMap(NXC_SESSION hSession, DWORD dwMapId);
+DWORD LIBNXCL_EXPORTABLE NXCRenameMap(NXC_SESSION hSession, DWORD dwMapId, const TCHAR *pszName);
DWORD LIBNXCL_EXPORTABLE NXCGetAddrList(NXC_SESSION hSession, DWORD dwListType,
DWORD *pdwAddrCount, NXC_ADDR_ENTRY **ppAddrList);
Modified: trunk/src/console/win32/MapManager.cpp
===================================================================
--- trunk/src/console/win32/MapManager.cpp 2008-08-18 19:59:08 UTC (rev 3411)
+++ trunk/src/console/win32/MapManager.cpp 2007-09-23 14:25:04 UTC (rev 3412)
@@ -40,6 +40,7 @@
ON_COMMAND(ID_MAP_RENAME, OnMapRename)
ON_UPDATE_COMMAND_UI(ID_MAP_RENAME, OnUpdateMapRename)
//}}AFX_MSG_MAP
+ ON_NOTIFY(LVN_ENDLABELEDIT, ID_LIST_VIEW, OnListViewEndLabelEdit)
END_MESSAGE_MAP()
@@ -68,8 +69,8 @@
GetClientRect(&rect);
m_wndListCtrl.Create(WS_CHILD | WS_VISIBLE | LVS_REPORT | LVS_EDITLABELS, rect, this, ID_LIST_VIEW);
- m_wndListCtrl.InsertColumn(0, _T("ID"), LVCFMT_LEFT, 60);
- m_wndListCtrl.InsertColumn(1, _T("Name"), LVCFMT_LEFT, 150);
+ m_wndListCtrl.InsertColumn(0, _T("Name"), LVCFMT_LEFT, 150);
+ m_wndListCtrl.InsertColumn(1, _T("ID"), LVCFMT_LEFT, 60);
m_wndListCtrl.InsertColumn(2, _T("Root object"), LVCFMT_LEFT, 150);
m_wndListCtrl.SetExtendedStyle(LVS_EX_GRIDLINES | LVS_EX_FULLROWSELECT);
LoadListCtrlColumns(m_wndListCtrl, _T("MapManager"), _T("ListCtrl"));
@@ -135,12 +136,12 @@
{
for(i = 0; i < numMaps; i++)
{
- _stprintf(buffer, _T("%d"), mapList[i].dwMapId);
- item = m_wndListCtrl.InsertItem(i, buffer);
+ item = m_wndListCtrl.InsertItem(i, mapList[i].szName);
if (item != -1)
{
m_wndListCtrl.SetItemData(item, mapList[i].dwMapId);
- m_wndListCtrl.SetItemText(item, 1, mapList[i].szName);
+ _stprintf(buffer, _T("%d"), mapList[i].dwMapId);
+ m_wndListCtrl.SetItemText(item, 1, buffer);
object = NXCFindObjectById(g_hSession, mapList[i].dwObjectId);
m_wndListCtrl.SetItemText(item, 2, (object != NULL) ? object->szName : _T("<unknown>"));
}
@@ -172,12 +173,12 @@
&mapId, _T("Creating new network map..."));
if (rcc == RCC_SUCCESS)
{
- _stprintf(buffer, _T("%d"), mapId);
- item = m_wndListCtrl.InsertItem(0x7FFFFFFF, buffer);
+ item = m_wndListCtrl.InsertItem(0x7FFFFFFF, dlg.m_strName);
if (item != -1)
{
m_wndListCtrl.SetItemData(item, mapId);
- m_wndListCtrl.SetItemText(item, 1, dlg.m_strName);
+ _stprintf(buffer, _T("%d"), mapId);
+ m_wndListCtrl.SetItemText(item, 1, buffer);
object = NXCFindObjectById(g_hSession, dlg.m_dwRootObj);
m_wndListCtrl.SetItemText(item, 2, (object != NULL) ? object->szName : _T("<unknown>"));
}
@@ -241,10 +242,20 @@
if (m_wndListCtrl.GetSelectedCount() != 1)
return;
-// m_wndListCtrl.EditLabel(m_wndListCtrl.GetSelectionMark());
+ m_wndListCtrl.EditLabel(m_wndListCtrl.GetSelectionMark());
}
void CMapManager::OnUpdateMapRename(CCmdUI* pCmdUI)
{
pCmdUI->Enable(m_wndListCtrl.GetSelectedCount() == 1);
}
+
+
+//
+// Handler for end label edit
+//
+
+void CMapManager::OnListViewEndLabelEdit(LPNMLISTVIEW pNMHDR, LRESULT *pResult)
+{
+ *pResult = 0;
+}
Modified: trunk/src/console/win32/MapManager.h
===================================================================
--- trunk/src/console/win32/MapManager.h 2008-08-18 19:59:08 UTC (rev 3411)
+++ trunk/src/console/win32/MapManager.h 2007-09-23 14:25:04 UTC (rev 3412)
@@ -48,6 +48,7 @@
afx_msg void OnMapRename();
afx_msg void OnUpdateMapRename(CCmdUI* pCmdUI);
//}}AFX_MSG
+ afx_msg void OnListViewEndLabelEdit(LPNMLISTVIEW pNMHDR, LRESULT *pResult);
DECLARE_MESSAGE_MAP()
};
Modified: trunk/src/libnetxms/nxcp.cpp
===================================================================
--- trunk/src/libnetxms/nxcp.cpp 2008-08-18 19:59:08 UTC (rev 3411)
+++ trunk/src/libnetxms/nxcp.cpp 2007-09-23 14:25:04 UTC (rev 3412)
@@ -265,10 +265,11 @@
_T("CMD_WEBMAP_GET_DATA"),
_T("CMD_WEBMAP_GET_LIST"),
_T("CMD_CONFIG_SET_CLOB"),
- _T("CMD_CONFIG_GET_CLOB")
+ _T("CMD_CONFIG_GET_CLOB"),
+ _T("CMD_RENAME_MAP")
};
- if ((wCode >= CMD_LOGIN) && (wCode <= CMD_CONFIG_GET_CLOB))
+ if ((wCode >= CMD_LOGIN) && (wCode <= CMD_RENAME_MAP))
_tcscpy(pszBuffer, pszMsgNames[wCode - CMD_LOGIN]);
else
_sntprintf(pszBuffer, 64, _T("CMD_UNKNOWN(%d)"), wCode);
Modified: trunk/src/libnxcl/map.cpp
===================================================================
--- trunk/src/libnxcl/map.cpp 2008-08-18 19:59:08 UTC (rev 3411)
+++ trunk/src/libnxcl/map.cpp 2007-09-23 14:25:04 UTC (rev 3412)
@@ -205,6 +205,27 @@
//
+// Rename map
+//
+
+DWORD LIBNXCL_EXPORTABLE NXCRenameMap(NXC_SESSION hSession, DWORD dwMapId, const TCHAR *pszName)
+{
+ CSCPMessage msg;
+ DWORD dwRqId;
+
+ dwRqId = ((NXCL_Session *)hSession)->CreateRqId();
+
+ msg.SetCode(CMD_RENAME_MAP);
+ msg.SetId(dwRqId);
+ msg.SetVariable(VID_MAP_ID, dwMapId);
+ msg.SetVariable(VID_NAME, pszName);
+ ((NXCL_Session *)hSession)->SendMsg(&msg);
+
+ return ((NXCL_Session *)hSession)->WaitForRCC(dwRqId);
+}
+
+
+//
// Resolve map name to id
//
Modified: trunk/src/nxmibc/parser.y
===================================================================
--- trunk/src/nxmibc/parser.y 2008-08-18 19:59:08 UTC (rev 3411)
+++ trunk/src/nxmibc/parser.y 2007-09-23 14:25:04 UTC (rev 3412)
@@ -1131,6 +1131,7 @@
DefValListElement:
LEFT_BRACE_SYM SymbolList RIGHT_BRACE_SYM
+| LEFT_BRACE_SYM RIGHT_BRACE_SYM
;
BinaryString:
Modified: trunk/src/server/core/session.cpp
===================================================================
--- trunk/src/server/core/session.cpp 2008-08-18 19:59:08 UTC (rev 3411)
+++ trunk/src/server/core/session.cpp 2007-09-23 14:25:04 UTC (rev 3412)
@@ -1072,6 +1072,9 @@
case CMD_CREATE_MAP:
CreateMap(pMsg);
break;
+ case CMD_RENAME_MAP:
+ RenameMap(pMsg);
+ break;
case CMD_SAVE_MAP:
SaveMap(pMsg);
break;
@@ -7412,6 +7415,47 @@
//
+// Rename map
+//
+
+void ClientSession::RenameMap(CSCPMessage *pRequest)
+{
+ CSCPMessage msg;
+ DWORD dwMapId;
+ nxMapSrv *pMap;
+ TCHAR szName[MAX_DB_STRING];
+
+ msg.SetCode(CMD_REQUEST_COMPLETED);
+ msg.SetId(pRequest->GetId());
+
+ if (m_dwSystemAccess & SYSTEM_ACCESS_MANAGE_MAPS)
+ {
+ dwMapId = pRequest->GetVariableLong(VID_MAP_ID);
+ LockMaps();
+ pMap = FindMapByID(dwMapId);
+ if (pMap != NULL)
+ {
+ pRequest->GetVariableStr(VID_NAME, szName, MAX_DB_STRING);
+ pMap->SetName(szName);
+ pMap->SaveToDB();
+ msg.SetVariable(VID_RCC, RCC_SUCCESS);
+ }
+ else
+ {
+ msg.SetVariable(VID_RCC, RCC_INVALID_MAP_ID);
+ }
+ UnlockMaps();
+ }
+ else
+ {
+ msg.SetVariable(VID_RCC, RCC_ACCESS_DENIED);
+ }
+
+ SendMessage(&msg);
+}
+
+
+//
// Load map
//
Modified: trunk/src/server/include/nms_core.h
===================================================================
--- trunk/src/server/include/nms_core.h 2008-08-18 19:59:08 UTC (rev 3411)
+++ trunk/src/server/include/nms_core.h 2007-09-23 14:25:04 UTC (rev 3412)
@@ -496,6 +496,7 @@
void SaveMap(CSCPMessage *pRequest);
void ProcessSubmapData(CSCPMessage *pRequest);
void CreateMap(CSCPMessage *pRequest);
+ void RenameMap(CSCPMessage *pRequest);
void LoadMap(CSCPMessage *pRequest);
void SendSubmapBkImage(CSCPMessage *pRequest);
void RecvSubmapBkImage(CSCPMessage *pRequest);
Received on Sun Sep 23 2007 - 17:25:05 EEST
This archive was generated by hypermail 2.2.0 : Sun Sep 23 2007 - 15:25:18 EEST