[SVN-NetXMS] revision 3321

* { 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:3321
Author:victor

Date:2008-06-19 01:09:08 +0300 (Thu, 19 Jun 2008)

Comment:added new command: batch

Changes
U trunk/src/server/tools/nxdbmgr/init.cpp
U trunk/src/server/tools/nxdbmgr/nxdbmgr.cpp
U trunk/src/server/tools/nxdbmgr/nxdbmgr.h

Diff
Modified: trunk/src/server/tools/nxdbmgr/init.cpp
===================================================================
--- trunk/src/server/tools/nxdbmgr/init.cpp 2008-06-18 21:47:18 UTC (rev 3320)
+++ trunk/src/server/tools/nxdbmgr/init.cpp 2008-06-18 22:09:08 UTC (rev 3321)
@@ -73,7 +73,7 @@
 // Execute SQL batch file
 //
 
-static BOOL ExecSQLBatch(const TCHAR *pszFile)
+BOOL ExecSQLBatch(const TCHAR *pszFile)
 {
    BYTE *pBatch, *pQuery, *pNext;
    DWORD dwSize;

Modified: trunk/src/server/tools/nxdbmgr/nxdbmgr.cpp
===================================================================
--- trunk/src/server/tools/nxdbmgr/nxdbmgr.cpp 2008-06-18 21:47:18 UTC (rev 3320)
+++ trunk/src/server/tools/nxdbmgr/nxdbmgr.cpp 2008-06-18 22:09:08 UTC (rev 3321)
@@ -343,6 +343,7 @@
          case 'h': // Display help and exit
             _tprintf(_T("Usage: nxdbmgr [<options>] <command>\n"
                         "Valid commands are:\n"
+ " batch <file> : Run SQL batch file\n"
                         " check : Check database for errors\n"
                         " init <file> : Initialize database\n"
                                                                 " reindex : Reindex database\n"
@@ -398,7 +399,8 @@
       _tprintf(_T("Command missing. Type nxdbmgr -h for command line syntax.\n"));
       return 1;
    }
- if (strcmp(argv[optind], "check") &&
+ if (strcmp(argv[optind], "batch") &&
+ strcmp(argv[optind], "check") &&
        strcmp(argv[optind], "reindex") &&
        strcmp(argv[optind], "upgrade") &&
        strcmp(argv[optind], "unlock") &&
@@ -407,7 +409,7 @@
       _tprintf(_T("Invalid command \"%s\". Type nxdbmgr -h for command line syntax.\n"), argv[optind]);
       return 1;
    }
- if ((!strcmp(argv[optind], "init")) && (argc - optind < 2))
+ if ((!strcmp(argv[optind], "init") || !strcmp(argv[optind], "batch")) && (argc - optind < 2))
    {
       _tprintf("Required command argument missing\n");
       return 1;
@@ -515,7 +517,9 @@
       }
 
       // Do requested operation
- if (!strcmp(argv[optind], "check"))
+ if (!strcmp(argv[optind], "batch"))
+ ExecSQLBatch(argv[optind + 1]);
+ else if (!strcmp(argv[optind], "check"))
          CheckDatabase();
       else if (!strcmp(argv[optind], "upgrade"))
          UpgradeDatabase();

Modified: trunk/src/server/tools/nxdbmgr/nxdbmgr.h
===================================================================
--- trunk/src/server/tools/nxdbmgr/nxdbmgr.h 2008-06-18 21:47:18 UTC (rev 3320)
+++ trunk/src/server/tools/nxdbmgr/nxdbmgr.h 2008-06-18 22:09:08 UTC (rev 3321)
@@ -63,6 +63,7 @@
 BOOL SQLBatch(const TCHAR *pszBatch);
 BOOL GetYesNo(void);
 void ShowQuery(const TCHAR *pszQuery);
+BOOL ExecSQLBatch(const TCHAR *pszFile);
 
 BOOL ConfigReadStr(const TCHAR *pszVar, TCHAR *pszBuffer, int iBufSize, const TCHAR *pszDefault);
 int ConfigReadInt(const TCHAR *pszVar, int iDefault);
Received on Thu Jun 19 2008 - 01:09:08 EEST