implemented discovery query

2 files changed, 25 insertions, 83 deletions

diff --git a/swig/Lasso-wsf2-disco.i b/swig/Lasso-wsf2-disco.i
deleted file mode 100644
index 5e6569d7..00000000
--- a/swig/Lasso-wsf2-disco.i
+++ /dev/null
@@ -1,82 +0,0 @@
-/* -*- Mode: c; c-basic-offset: 8 -*-
- *
- * $Id: Lasso-wsf-disco.i,v 1.7 2006/12/20 23:41:44 fpeters Exp $
- *
- * SWIG bindings for Lasso Library
- *
- * Copyright (C) 2004, 2005 Entr'ouvert
- * http://lasso.entrouvert.org
- *
- * Authors: See AUTHORS file in top-level directory.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-
-/* WSF prefix & href */
-#ifndef SWIGPHP4
-%rename(IDWSF2_DISCO_HREF) LASSO_IDWSF2_DISCO_HREF;
-%rename(IDWSF2_DISCO_PREFIX) LASSO_IDWSF2_DISCO_PREFIX;
-#endif
-#define LASSO_IDWSF2_DISCO_HREF   "urn:liberty:disco:2006-08"
-#define LASSO_IDWSF2_DISCO_PREFIX "disco"
-
-
-/***********************************************************************
- ***********************************************************************
- * XML Elements in Discovery Namespace
- ***********************************************************************
- ***********************************************************************/
-
-
-/***********************************************************************
- * disco:Query
- ***********************************************************************/
-
-
-#ifndef SWIGPHP4
-%rename(IdWsf2DiscoQuery) LassoIdWsf2DiscoQuery;
-#endif
-typedef struct {
-	/* Attributes */
-
-	char *id;
-} LassoIdWsf2DiscoQuery;
-%extend LassoIdWsf2DiscoQuery {
-
-	/* Constructor, Destructor & Static Methods */
-
-	LassoIdWsf2DiscoQuery();
-
-	~LassoIdWsf2DiscoQuery();
-
-	/* Methods inherited from LassoNode */
-
-	%newobject dump;
-	char *dump();
-}
-
-%{
-
-/* Constructors, destructors & static methods implementations */
-
-#define new_LassoIdWsf2DiscoQuery lasso_idwsf2_disco_query_new
-#define delete_LassoIdWsf2DiscoQuery(self) lasso_node_destroy(LASSO_NODE(self))
-
-/* Implementations of methods inherited from LassoNode */
-
-#define LassoIdWsf2DiscoQuery_dump(self) lasso_node_dump(LASSO_NODE(self))
-
-%}
diff --git a/swig/Lasso-wsf2.i b/swig/Lasso-wsf2.i
index 08de555f..9b4ae2a0 100644
--- a/swig/Lasso-wsf2.i
+++ b/swig/Lasso-wsf2.i
@@ -24,7 +24,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-%include Lasso-wsf2-disco.i
+/* %include Lasso-wsf2-disco.i */
 %include Lasso-wsf-soap.i
 
 %{
@@ -32,6 +32,15 @@
 %}
 
 
+/* WSF prefix & href */
+#ifndef SWIGPHP4
+%rename(IDWSF2_DISCO_HREF) LASSO_IDWSF2_DISCO_HREF;
+%rename(IDWSF2_DISCO_PREFIX) LASSO_IDWSF2_DISCO_PREFIX;
+#endif
+#define LASSO_IDWSF2_DISCO_HREF   "urn:liberty:disco:2006-08"
+#define LASSO_IDWSF2_DISCO_PREFIX "disco"
+
+
 /***********************************************************************
  ***********************************************************************
  * ID-WSF
@@ -147,6 +156,18 @@ typedef struct {
 	THROW_ERROR()
 	int initQuery(const char *security_mech_id = NULL);
 	END_THROW_ERROR()
+	
+	THROW_ERROR()
+	int addRequestedServiceType(const gchar *service_type);
+	END_THROW_ERROR()
+	
+	THROW_ERROR()
+	int processQueryMsg(const gchar *message);
+	END_THROW_ERROR()
+
+	THROW_ERROR()
+	int processQueryResponseMsg(const gchar *message);
+	END_THROW_ERROR()
 }
 
 %{
@@ -245,5 +266,8 @@ typedef struct {
 #define LassoIdWsf2Discovery_processMetadataAssociationAddMsg lasso_idwsf2_discovery_process_metadata_association_add_msg
 #define LassoIdWsf2Discovery_processMetadataAssociationAddResponseMsg lasso_idwsf2_discovery_process_metadata_association_add_response_msg
 #define LassoIdWsf2Discovery_initQuery lasso_idwsf2_discovery_init_query
+#define LassoIdWsf2Discovery_addRequestedServiceType lasso_idwsf2_discovery_add_requested_service_type
+#define LassoIdWsf2Discovery_processQueryMsg lasso_idwsf2_discovery_process_query_msg
+#define LassoIdWsf2Discovery_processQueryResponseMsg lasso_idwsf2_discovery_process_query_response_msg
 
 %}