- new filter API added and used

- Added assoicatiors and references actions instead of having them as options

1 files changed, 4 insertions, 5 deletions

diff --git a/src/wseventmgr.c b/src/wseventmgr.c
index 3822b91..eb6d920 100644
--- a/src/wseventmgr.c
+++ b/src/wseventmgr.c
@@ -414,7 +414,7 @@ int main(int argc, char **argv)
 	if (!wsman_parse_options(argc, argv)) {
 		exit(EXIT_FAILURE);
 	}
-	
+
 	initialize_logging();
 	//      wsmc_transport_init(NULL);
 	options = wsmc_options_init();
@@ -485,10 +485,7 @@ int main(int argc, char **argv)
 		wsmc_set_action_option(options, FLAG_DUMP_REQUEST);
 	}
 	if (wsm_filter) {
-		options->filter = wsm_filter;
-	}
-	if (wsm_dialect) {
-		options->dialect = wsm_dialect;
+		options->filter = filter_create_simple(wsm_dialect, wsm_filter );
 	}
 	options->cim_ns = cim_namespace;
 
@@ -523,8 +520,10 @@ int main(int argc, char **argv)
 			options->heartbeat_interval = event_heartbeat;
 		if(event_subscription_expire)
 			options->expires = event_subscription_expire;
+		/*
 		if(wsm_dialect)
 			options->dialect = wsm_dialect;
+			*/
 		if(event_reference_properties)
 			options->reference = event_reference_properties;
 		rqstDoc = wsmc_action_subscribe(cl, resource_uri, options);