Changeset 96c1461 in nscp for include/nscapi/targets.hpp

Timestamp:

11/27/11 22:04:35 (18 months ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2

Children:

9853bc3

Parents:

16198e3

Message:

• Major refactoring in the command line interface
• Added support for alias to many common module (command line) so: nscp eventlog (is the same as nscp client --module CheckEventLog)
• Fixed issue with CheckEventLog message rendering and eventid
• Refactored all Client modules to all support command line, commands and submissions.
• Added uniform handling of "everything" to all Client plugins
• Fixed SyslogClient to work "as advertised" (ie. all hardcoded stuff is removed)
• Fixed utf8 issue with text strings (now have a working concept which needs to be implementd "all over the place")
• Many issues and fixes related to clients.
• Fixed so CheckEvent? log (insert) works much better (added new options)

File:

• include/nscapi/targets.hpp (modified) (6 diffs)

include/nscapi/targets.hpp

@@ -11 +11 @@
 #include <nscapi/settings_proxy.hpp>
 
+#include <net/net.hpp>
+
 namespace nscapi {
   struct target_handler {
@@ -17 +19 @@
       std::wstring host;
       std::wstring alias;
-      std::wstring protocol;
+      //std::wstring protocol;
+      std::wstring address;
       std::wstring parent;
       typedef std::map<std::wstring,std::wstring> options_type;
@@ -26 +29 @@
         ss << _T("Target: ") << alias;
         ss << _T(", host: ") << host;
-        ss << _T(", protocol: ") << protocol;
+//        ss << _T(", protocol: ") << protocol;
+        ss << _T(", address: ") << address;
         ss << _T(", parent: ") << parent;
         BOOST_FOREACH(options_type::value_type o, options) {
@@ -32 +36 @@
         }
         return ss.str();
+      }
+
+      bool has_protocol() {
+        return !address.empty();
+      }
+      std::wstring get_protocol() {
+        net::wurl url = net::parse(address);
+        return url.protocol;
+      }
+      bool has_option(std::wstring key) {
+        return options.find(key) != options.end();
+      }
+      bool has_option(std::string key) {
+        return has_option(utf8::cvt<std::wstring>(key));
       }
 
@@ -40 +58 @@
     target_list_type target_list;
     target_list_type template_list;
-    void add(boost::shared_ptr<nscapi::settings_proxy> proxy, std::wstring path, std::wstring key, std::wstring value) {
-      add(read_target(proxy, path, key, value));
+    target add(boost::shared_ptr<nscapi::settings_proxy> proxy, std::wstring path, std::wstring key, std::wstring value) {
+      target t = read_target(proxy, path, key, value);
+      add(t);
+      return t;
     }
     void add(target t) {
@@ -50 +70 @@
     }
     target read_target(boost::shared_ptr<nscapi::settings_proxy> proxy, std::wstring path, std::wstring alias, std::wstring host);
+    void rebuild();
 
     optarget find_target(std::wstring alias);
+    bool has_target(std::wstring alias);
     static void apply_parent(target &t, target &p);
     std::wstring to_wstring();