Author: damitha
Date: Sat Mar 7 08:06:42 2009
New Revision: 751218
URL: http://svn.apache.org/viewvc?rev=751218&view=rev
Log:
Now both xpath based content filtering and registry based topic filtering work
Modified:
webservices/savan/trunk/c/configure.ac
webservices/savan/trunk/c/samples/client/subscriber/subscriber.c
webservices/savan/trunk/c/src/client/Makefile.am
webservices/savan/trunk/c/src/client/savan_publishing_client.c
Modified: webservices/savan/trunk/c/configure.ac
URL:
http://svn.apache.org/viewvc/webservices/savan/trunk/c/configure.ac?rev=751218&r1=751217&r2=751218&view=diff
==============================================================================
--- webservices/savan/trunk/c/configure.ac (original)
+++ webservices/savan/trunk/c/configure.ac Sat Mar 7 08:06:42 2009
@@ -143,10 +143,12 @@
no)
AC_MSG_RESULT(no)
SAVAN_FILTER=""
+ SAVAN_FILTER_LIB=""
;;
*)
AC_MSG_RESULT(yes)
SAVAN_FILTER="xpath"
+ SAVAN_FILTER_LIB=xpath/libsavan_filter_mod.la
dnl Find libxml2 include dir in the path
if test -d $withval; then
xpathinc="-I$withval"
@@ -183,10 +185,12 @@
AC_SUBST(XMLSCHEMAINC)
AC_SUBST(SAVAN_STORAGE)
AC_SUBST(SAVAN_FILTER)
+AC_SUBST(SAVAN_FILTER_LIB)
AC_SUBST(SVC_DIR)
export SAVAN_STORAGE
export SAVAN_FILTER
+export SAVAN_FILTER_LIB
export SVC_DIR
AC_CONFIG_FILES([Makefile \
Modified: webservices/savan/trunk/c/samples/client/subscriber/subscriber.c
URL:
http://svn.apache.org/viewvc/webservices/savan/trunk/c/samples/client/subscriber/subscriber.c?rev=751218&r1=751217&r2=751218&view=diff
==============================================================================
--- webservices/savan/trunk/c/samples/client/subscriber/subscriber.c (original)
+++ webservices/savan/trunk/c/samples/client/subscriber/subscriber.c Sat Mar 7
08:06:42 2009
@@ -100,8 +100,6 @@
* Following commented lines show how to use filtering when savan server
side is
* built and running with filtering enabled.
*/
- /*axutil_hash_set(savan_options, SAVAN_OP_KEY_FILTER,
AXIS2_HASH_KEY_STRING,
- "//tes...@data='5']");*/
axutil_hash_set(savan_options, SAVAN_OP_KEY_FILTER, AXIS2_HASH_KEY_STRING,
"//weather_report");
@@ -111,7 +109,7 @@
/*axutil_hash_set(savan_options, SAVAN_OP_KEY_FILTER,
AXIS2_HASH_KEY_STRING, "weather/4");
axutil_hash_set(savan_options, SAVAN_OP_KEY_FILTER_DIALECT,
AXIS2_HASH_KEY_STRING,
- DEFAULT_FILTER_DIALECT);*/
+ SYNAPSE_FILTER_DIALECT);*/
/* Create a savan client */
savan_client = savan_client_create(env);
Modified: webservices/savan/trunk/c/src/client/Makefile.am
URL:
http://svn.apache.org/viewvc/webservices/savan/trunk/c/src/client/Makefile.am?rev=751218&r1=751217&r2=751218&view=diff
==============================================================================
--- webservices/savan/trunk/c/src/client/Makefile.am (original)
+++ webservices/savan/trunk/c/src/client/Makefile.am Sat Mar 7 08:06:42 2009
@@ -5,7 +5,7 @@
libsavan_client_la_LIBADD =
$(top_builddir)/src/subscribers/libsavan_subscribers.la \
$(top_builddir)/src/util/libsavan_util.la \
../storage/@SAVAN_STORAGE@/libsavan_storage.la \
-
../filters/@SAVAN_FILTER@/libsavan_filter_mod.la
+
../filters/@SAVAN_FILTER_LIB@
INCLUDES = -I$(top_builddir)/include \
@AXIS2INC@ \
Modified: webservices/savan/trunk/c/src/client/savan_publishing_client.c
URL:
http://svn.apache.org/viewvc/webservices/savan/trunk/c/src/client/savan_publishing_client.c?rev=751218&r1=751217&r2=751218&view=diff
==============================================================================
--- webservices/savan/trunk/c/src/client/savan_publishing_client.c (original)
+++ webservices/savan/trunk/c/src/client/savan_publishing_client.c Sat Mar 7
08:06:42 2009
@@ -215,6 +215,7 @@
return AXIS2_FAILURE;
}
+#ifdef SAVAN_FILTERING
/* If this is a filtering request and filter module is defined then filter
the request.
*/
if(filtermod && savan_subscriber_get_filter(subscriber, env))
@@ -230,6 +231,7 @@
}
}
}
+#endif
if(filtered_payload)
{
