September 2005 - cl-soap-cvs@common-lisp.net

[cl-soap-cvs] CVS update: cl-soap/src/xsd.lisp
by scaekenberghe＠common-lisp.net 28 Sep '05

28 Sep '05

Update of /project/cl-soap/cvsroot/cl-soap/src In directory common-lisp.net:/tmp/cvs-serv21182/src Modified Files: xsd.lisp Log Message: fixed a typo Date: Wed Sep 28 11:00:54 2005 Author: scaekenberghe Index: cl-soap/src/xsd.lisp diff -u cl-soap/src/xsd.lisp:1.17 cl-soap/src/xsd.lisp:1.18 --- cl-soap/src/xsd.lisp:1.17 Tue Sep 27 20:22:53 2005 +++ cl-soap/src/xsd.lisp Wed Sep 28 11:00:51 2005 @@ -1,6 +1,6 @@ ;;;; -*- mode: lisp -*- ;;;; -;;;; $Id: xsd.lisp,v 1.17 2005/09/27 18:22:53 scaekenberghe Exp $ +;;;; $Id: xsd.lisp,v 1.18 2005/09/28 09:00:51 scaekenberghe Exp $ ;;;; ;;;; A partial implementation of the XML Schema Definition standard ;;;; @@ -529,7 +529,7 @@ (member-type (get-type member))) (indent level stream) (if (xsd-primitive-type-name-p member-type) - (format stream " Member ~s of primitive type ~s[ ~a]~@[ nillable~]~%" + (format stream " Member ~s of primitive type ~s [~a]~@[ nillable~]~%" member-name member-type (describe-multiplicity member) (get-nillable member)) (progn (format stream " Member ~s [~a]~@[ nillable~]~%" member-name

1 0

[cl-soap-cvs] CVS update: public_html/google-adwords-api.html
by scaekenberghe＠common-lisp.net 27 Sep '05

27 Sep '05

Update of /project/cl-soap/cvsroot/public_html In directory common-lisp.net:/tmp/cvs-serv1775 Modified Files: google-adwords-api.html Log Message: layout Date: Tue Sep 27 22:35:17 2005 Author: scaekenberghe Index: public_html/google-adwords-api.html diff -u public_html/google-adwords-api.html:1.1 public_html/google-adwords-api.html:1.2 --- public_html/google-adwords-api.html:1.1 Tue Sep 27 22:28:32 2005 +++ public_html/google-adwords-api.html Tue Sep 27 22:35:16 2005 @@ -36,10 +36,10 @@ Operation: getUnitCountForMethod Input: getUnitCountForMethodRequest Element "getUnitCountForMethod" [required] - Member "service" of primitive type "string"[ required] - Member "method" of primitive type "string"[ required] - Member "startDate" of primitive type "date"[ required] - Member "endDate" of primitive type "date"[ required] + Member "service" of primitive type "string" [required] + Member "method" of primitive type "string" [required] + Member "startDate" of primitive type "date" [required] + Member "endDate" of primitive type "date" [required] <getUnitCountForMethod> <service>string</service> <method>string</method> @@ -48,31 +48,31 @@ </getUnitCountForMethod> Output: getUnitCountForMethodResponse Element "getUnitCountForMethodResponse" [required] - Member "getUnitCountForMethodReturn" of primitive type "long"[ required] + Member "getUnitCountForMethodReturn" of primitive type "long" [required] <getUnitCountForMethodResponse> <getUnitCountForMethodReturn>long</getUnitCountForMethodReturn> </getUnitCountForMethodResponse> Operation: getUnitCount Input: getUnitCountRequest Element "getUnitCount" [required] - Member "startDate" of primitive type "date"[ required] - Member "endDate" of primitive type "date"[ required] + Member "startDate" of primitive type "date" [required] + Member "endDate" of primitive type "date" [required] <getUnitCount> <startDate>date</startDate> <endDate>date</endDate> </getUnitCount> Output: getUnitCountResponse Element "getUnitCountResponse" [required] - Member "getUnitCountReturn" of primitive type "long"[ required] + Member "getUnitCountReturn" of primitive type "long" [required] <getUnitCountResponse> <getUnitCountReturn>long</getUnitCountReturn> </getUnitCountResponse> Operation: getMethodCost Input: getMethodCostRequest Element "getMethodCost" [required] - Member "service" of primitive type "string"[ required] - Member "method" of primitive type "string"[ required] - Member "date" of primitive type "date"[ required] + Member "service" of primitive type "string" [required] + Member "method" of primitive type "string" [required] + Member "date" of primitive type "date" [required] <getMethodCost> <service>string</service> <method>string</method> @@ -80,7 +80,7 @@ </getMethodCost> Output: getMethodCostResponse Element "getMethodCostResponse" [required] - Member "getMethodCostReturn" of primitive type "int"[ required] + Member "getMethodCostReturn" of primitive type "int" [required] <getMethodCostResponse> <getMethodCostReturn>int</getMethodCostReturn> </getMethodCostResponse> @@ -91,7 +91,7 @@ </getUsageQuotaThisMonth> Output: getUsageQuotaThisMonthResponse Element "getUsageQuotaThisMonthResponse" [required] - Member "getUsageQuotaThisMonthReturn" of primitive type "long"[ required] + Member "getUsageQuotaThisMonthReturn" of primitive type "long" [required] <getUsageQuotaThisMonthResponse> <getUsageQuotaThisMonthReturn>long</getUsageQuotaThisMonthReturn> </getUsageQuotaThisMonthResponse> @@ -102,22 +102,22 @@ </getOperationsQuotaThisMonth> Output: getOperationsQuotaThisMonthResponse Element "getOperationsQuotaThisMonthResponse" [required] - Member "getOperationsQuotaThisMonthReturn" of primitive type "long"[ required] + Member "getOperationsQuotaThisMonthReturn" of primitive type "long" [required] <getOperationsQuotaThisMonthResponse> <getOperationsQuotaThisMonthReturn>long</getOperationsQuotaThisMonthReturn> </getOperationsQuotaThisMonthResponse> Operation: getOperationCount Input: getOperationCountRequest Element "getOperationCount" [required] - Member "startDate" of primitive type "date"[ required] - Member "endDate" of primitive type "date"[ required] + Member "startDate" of primitive type "date" [required] + Member "endDate" of primitive type "date" [required] <getOperationCount> <startDate>date</startDate> <endDate>date</endDate> </getOperationCount> Output: getOperationCountResponse Element "getOperationCountResponse" [required] - Member "getOperationCountReturn" of primitive type "long"[ required] + Member "getOperationCountReturn" of primitive type "long" [required] <getOperationCountResponse> <getOperationCountReturn>long</getOperationCountReturn> </getOperationCountResponse></pre> @@ -205,6 +205,6 @@ Note that two values are returned: the actual value and the headers. Stay tuned for more complicated examples later on. -$Id: google-adwords-api.html,v 1.1 2005/09/27 20:28:32 scaekenberghe Exp $ +$Id: google-adwords-api.html,v 1.2 2005/09/27 20:35:16 scaekenberghe Exp $ </body> </html>

1 0

[cl-soap-cvs] CVS update: public_html/google-adwords-api.html public_html/index.html
by scaekenberghe＠common-lisp.net 27 Sep '05

27 Sep '05

Update of /project/cl-soap/cvsroot/public_html In directory common-lisp.net:/tmp/cvs-serv766 Modified Files: index.html Added Files: google-adwords-api.html Log Message: more documentation Date: Tue Sep 27 22:28:33 2005 Author: scaekenberghe Index: public_html/index.html diff -u public_html/index.html:1.6 public_html/index.html:1.7 --- public_html/index.html:1.6 Thu Sep 22 22:40:44 2005 +++ public_html/index.html Tue Sep 27 22:28:32 2005 @@ -75,6 +75,8 @@ <h3>Status</h3> + Currently, phase 1 (and then some) has been implemented. + <ul> <li>S-XML was extended to support XML Namespaces</li> <li>Basic, manual SOAP calls are now possible, for example: @@ -120,7 +122,13 @@ "getRate" :input `("country1" ,country1 "country2" ,country2)))</pre> </li> - <li>Some partial support for XML Schema Defintion types definition in WSDL is being implemented.</li> + <li>Https support in http-client.lisp was added for LispWorks</li> + <li>The general function soap-call was extended to handle headers (input and output headers)</li> + <li>The function wsdl-soap-call now handles document based SOAP calls too</li> + <li>Partial support for XML Schema Defintion types definition in WSDL has been implemented</li> + <li>The target of being able to talk to the Google AdWords API has been reached! + A separate document, <a href="google-adwords-api.html">Google AdWords API</a> describes this in more detail + and with some verbose examples</li> <li>Lot's of work remains to be done! All help is welcome.</li> </ul> @@ -162,6 +170,6 @@ Initial developers and contributors will include Sven Van Caekenberghe (Beta Nine), Alain Picard (Memetrics), Ivan Melotte (Beta Nine) and Nicky Peeters (Beta Nine). -$Id: index.html,v 1.6 2005/09/22 20:40:44 scaekenberghe Exp $ +$Id: index.html,v 1.7 2005/09/27 20:28:32 scaekenberghe Exp $ </body> </html>

1 0

[cl-soap-cvs] CVS update: cl-soap/src/xsd.lisp
by scaekenberghe＠common-lisp.net 27 Sep '05

27 Sep '05

Update of /project/cl-soap/cvsroot/cl-soap/src In directory common-lisp.net:/tmp/cvs-serv24844/src Modified Files: xsd.lisp Log Message: some refactoring Date: Tue Sep 27 20:22:54 2005 Author: scaekenberghe Index: cl-soap/src/xsd.lisp diff -u cl-soap/src/xsd.lisp:1.16 cl-soap/src/xsd.lisp:1.17 --- cl-soap/src/xsd.lisp:1.16 Tue Sep 27 18:25:17 2005 +++ cl-soap/src/xsd.lisp Tue Sep 27 20:22:53 2005 @@ -1,6 +1,6 @@ ;;;; -*- mode: lisp -*- ;;;; -;;;; $Id: xsd.lisp,v 1.16 2005/09/27 16:25:17 scaekenberghe Exp $ +;;;; $Id: xsd.lisp,v 1.17 2005/09/27 18:22:53 scaekenberghe Exp $ ;;;; ;;;; A partial implementation of the XML Schema Definition standard ;;;; @@ -73,71 +73,60 @@ ;;; Parsing +(defun handle-lxml-schema-elements (children-mixin lxml) + (loop :for child :in (lxml-get-children lxml) + :do (push (lxml->schema-element child) + (get-children children-mixin))) + (setf (get-children children-mixin) (nreverse (get-children children-mixin)))) + (defun lxml->schema-element (lxml) - (case (lxml-get-tag lxml) - (xsd:|element| - (let* ((attributes (lxml-get-attributes lxml)) - (name (getf attributes :|name|)) - (type (getf attributes :|type|)) - (min-occurs (getf attributes :|minOccurs|)) - (max-occurs (getf attributes :|maxOccurs|)) - (nillable (getf attributes :|nillable|)) - (xml-schema-element (make-instance 'xml-schema-element - :name name - :type type - :min-occurs (if min-occurs (parse-integer min-occurs) 1) - :max-occurs (if max-occurs - (if (equal max-occurs "unbounded") - :unbounded - (parse-integer max-occurs)) - 1) - :nillable (equal nillable "true")))) - (loop :for child :in (lxml-get-children lxml) :do - (push (lxml->schema-element child) - (get-children xml-schema-element))) - xml-schema-element)) - (xsd:|simpleType| - (let* ((attributes (lxml-get-attributes lxml)) - (name (getf attributes :|name|)) - (xsd-type (make-instance 'xsd-simple-type :name name))) - (loop :for child :in (lxml-get-children lxml) :do - (push (lxml->schema-element child) - (get-children xsd-type))) - xsd-type)) - (xsd:|complexType| - (let* ((attributes (lxml-get-attributes lxml)) - (name (getf attributes :|name|)) - (xsd-type (make-instance 'xsd-complex-type :name name))) - (loop :for child :in (lxml-get-children lxml) :do - (push (lxml->schema-element child) - (get-children xsd-type))) - xsd-type)) - (xsd:|complexContent| - (let* ((xsd-complex-content (make-instance 'xsd-complex-content))) - (loop :for child :in (lxml-get-children lxml) :do - (push (lxml->schema-element child) - (get-children xsd-complex-content))) - xsd-complex-content)) - (xsd:|restriction| - (let* ((attributes (lxml-get-attributes lxml)) - (base (getf attributes :|base|)) - (xsd-restriction (make-instance 'xsd-restriction :base base))) - xsd-restriction)) - (xsd:|extension| - (let* ((attributes (lxml-get-attributes lxml)) - (base (getf attributes :|base|)) - (xsd-extension (make-instance 'xsd-extension :base base))) - (loop :for child :in (lxml-get-children lxml) :do - (push (lxml->schema-element child) - (get-children xsd-extension))) - xsd-extension)) - (xsd:|sequence| - (let ((xsd-sequence (make-instance 'xsd-sequence))) - (loop :for child :in (lxml-get-children lxml) :do - (push (lxml->schema-element child) - (get-children xsd-sequence))) - (setf (get-children xsd-sequence) (nreverse (get-children xsd-sequence))) - xsd-sequence)))) + (let ((attributes (lxml-get-attributes lxml))) + (case (lxml-get-tag lxml) + (xsd:|element| + (let* ((name (getf attributes :|name|)) + (type (getf attributes :|type|)) + (min-occurs (getf attributes :|minOccurs|)) + (max-occurs (getf attributes :|maxOccurs|)) + (nillable (getf attributes :|nillable|)) + (xml-schema-element (make-instance 'xml-schema-element + :name name + :type type + :min-occurs (if min-occurs (parse-integer min-occurs) 1) + :max-occurs (if max-occurs + (if (equal max-occurs "unbounded") + :unbounded + (parse-integer max-occurs)) + 1) + :nillable (equal nillable "true")))) + (handle-lxml-schema-elements xml-schema-element lxml) + xml-schema-element)) + (xsd:|simpleType| + (let* ((name (getf attributes :|name|)) + (xsd-type (make-instance 'xsd-simple-type :name name))) + (handle-lxml-schema-elements xsd-type lxml) + xsd-type)) + (xsd:|complexType| + (let* ((name (getf attributes :|name|)) + (xsd-type (make-instance 'xsd-complex-type :name name))) + (handle-lxml-schema-elements xsd-type lxml) + xsd-type)) + (xsd:|complexContent| + (let ((xsd-complex-content (make-instance 'xsd-complex-content))) + (handle-lxml-schema-elements xsd-complex-content lxml) + xsd-complex-content)) + (xsd:|restriction| + (let* ((base (getf attributes :|base|)) + (xsd-restriction (make-instance 'xsd-restriction :base base))) + xsd-restriction)) + (xsd:|extension| + (let* ((base (getf attributes :|base|)) + (xsd-extension (make-instance 'xsd-extension :base base))) + (handle-lxml-schema-elements xsd-extension lxml) + xsd-extension)) + (xsd:|sequence| + (let ((xsd-sequence (make-instance 'xsd-sequence))) + (handle-lxml-schema-elements xsd-sequence lxml) + xsd-sequence))))) (defun lxml->schema-definition (lxml) (if (eql (lxml-get-tag lxml) 'xsd:|schema|)

1 0

[cl-soap-cvs] CVS update: cl-soap/test/test-xsd.lisp cl-soap/test/test-google-adwords.lisp
by scaekenberghe＠common-lisp.net 27 Sep '05

27 Sep '05

Update of /project/cl-soap/cvsroot/cl-soap/test In directory common-lisp.net:/tmp/cvs-serv16612/test Modified Files: test-google-adwords.lisp Added Files: test-xsd.lisp Log Message: added basic support for XSD complexContent combined with an extension more test code Date: Tue Sep 27 18:25:18 2005 Author: scaekenberghe Index: cl-soap/test/test-google-adwords.lisp diff -u cl-soap/test/test-google-adwords.lisp:1.10 cl-soap/test/test-google-adwords.lisp:1.11 --- cl-soap/test/test-google-adwords.lisp:1.10 Tue Sep 27 07:39:34 2005 +++ cl-soap/test/test-google-adwords.lisp Tue Sep 27 18:25:18 2005 @@ -1,6 +1,6 @@ ;;;; -*- mode: lisp -*- ;;;; -;;;; $Id: test-google-adwords.lisp,v 1.10 2005/09/27 05:39:34 scaekenberghe Exp $ +;;;; $Id: test-google-adwords.lisp,v 1.11 2005/09/27 16:25:18 scaekenberghe Exp $ ;;;; ;;;; Some test on the Google AdWords API (not publically available) ;;;; @@ -166,7 +166,6 @@ (values result headers))) (defun get-all-adwords-campaigns (client-email) - ;; to be debugged !! (wsdl-soap-call (wsdl-cache-get "https://adwords.google.com:443/api/adwords/v2/CampaignService?wsdl") "getAllAdWordsCampaigns" :input '("dummy" 1) @@ -235,5 +234,29 @@ "useragent" ,*google-adwords-user-agent* "token" ,*google-adwords-token* "clientEmail" ,*google-client-email*))) + +(defun add-campaign (client-email daily-budget status &key name language-targeting geo-targeting) + ;; to be completed + (wsdl-soap-call (wsdl-cache-get "https://adwords.google.com:443/api/adwords/v2/CampaignService?wsdl") + "addCampaign" + ;; input placeholder !! + :input `(,daily-budget ,status name ,name ,language-targeting ,geo-targeting) + :headers `("email" ,*google-adwords-email* + "password" ,*google-adwords-password* + "useragent" ,*google-adwords-user-agent* + "token" ,*google-adwords-token* + "clientEmail" ,client-email))) + +(defun schedule-report-job (client-email report-job) + ;; to be completed + (wsdl-soap-call (wsdl-cache-get "https://adwords.google.com:443/api/adwords/v2/ReportService?") + "scheduleReportJob" + ;; input placeholder !! + :input `(,report-job) + :headers `("email" ,*google-adwords-email* + "password" ,*google-adwords-password* + "useragent" ,*google-adwords-user-agent* + "token" ,*google-adwords-token* + "clientEmail" ,client-email))) ;;;; eof

1 0

[cl-soap-cvs] CVS update: cl-soap/src/namespaces.lisp cl-soap/src/xsd.lisp
by scaekenberghe＠common-lisp.net 27 Sep '05

27 Sep '05

Update of /project/cl-soap/cvsroot/cl-soap/src In directory common-lisp.net:/tmp/cvs-serv16612/src Modified Files: namespaces.lisp xsd.lisp Log Message: added basic support for XSD complexContent combined with an extension more test code Date: Tue Sep 27 18:25:17 2005 Author: scaekenberghe Index: cl-soap/src/namespaces.lisp diff -u cl-soap/src/namespaces.lisp:1.7 cl-soap/src/namespaces.lisp:1.8 --- cl-soap/src/namespaces.lisp:1.7 Fri Sep 23 10:06:36 2005 +++ cl-soap/src/namespaces.lisp Tue Sep 27 18:25:17 2005 @@ -1,6 +1,6 @@ ;;;; -*- mode: lisp -*- ;;;; -;;;; $Id: namespaces.lisp,v 1.7 2005/09/23 08:06:36 scaekenberghe Exp $ +;;;; $Id: namespaces.lisp,v 1.8 2005/09/27 16:25:17 scaekenberghe Exp $ ;;;; ;;;; Definition of some standard XML namespaces commonly needed for SOAP ;;;; @@ -32,9 +32,9 @@ (defpackage :xsd (:nicknames "xsd") - (:export "schema" "element" "simpleType" "complexType" + (:export "schema" "element" "simpleType" "complexType" "complexContent" "sequence" "choice" "all" "attribute" - "restriction" "maxLength" "pattern" "list" "union" "enumeration") + "restriction" "extension" "maxLength" "pattern" "list" "union" "enumeration") (:documentation "Package for symbols in the XML Schema Definition XML Namespace")) (defparameter *xsd-ns* (s-xml:register-namespace +xsd-ns-uri+ "xsd" :xsd)) @@ -48,7 +48,7 @@ (defpackage :xsi (:nicknames "xsi") - (:export) + (:export "null") (:documentation "Package for symbols in the XML Schema Instance XML Namespace")) (defparameter *xsi-ns* (s-xml:register-namespace +xsi-ns-uri+ "xsi" :xsi)) Index: cl-soap/src/xsd.lisp diff -u cl-soap/src/xsd.lisp:1.15 cl-soap/src/xsd.lisp:1.16 --- cl-soap/src/xsd.lisp:1.15 Tue Sep 27 07:41:18 2005 +++ cl-soap/src/xsd.lisp Tue Sep 27 18:25:17 2005 @@ -1,6 +1,6 @@ ;;;; -*- mode: lisp -*- ;;;; -;;;; $Id: xsd.lisp,v 1.15 2005/09/27 05:41:18 scaekenberghe Exp $ +;;;; $Id: xsd.lisp,v 1.16 2005/09/27 16:25:17 scaekenberghe Exp $ ;;;; ;;;; A partial implementation of the XML Schema Definition standard ;;;; @@ -46,6 +46,9 @@ (defclass xsd-complex-type (xsd-type) ()) +(defclass xsd-complex-content (children-mixin) + ()) + (defclass xsd-compositor (children-mixin) ()) @@ -61,6 +64,9 @@ (defclass xsd-restriction () ((base :accessor get-base :initarg :base :initform nil))) +(defclass xsd-extension (children-mixin) + ((base :accessor get-base :initarg :base :initform nil))) + (defmethod print-object ((object xsd-restriction) out) (print-unreadable-object (object out :type t :identity t) (prin1 (or (get-base object) "unknown") out))) @@ -106,11 +112,25 @@ (push (lxml->schema-element child) (get-children xsd-type))) xsd-type)) + (xsd:|complexContent| + (let* ((xsd-complex-content (make-instance 'xsd-complex-content))) + (loop :for child :in (lxml-get-children lxml) :do + (push (lxml->schema-element child) + (get-children xsd-complex-content))) + xsd-complex-content)) (xsd:|restriction| (let* ((attributes (lxml-get-attributes lxml)) (base (getf attributes :|base|)) (xsd-restriction (make-instance 'xsd-restriction :base base))) xsd-restriction)) + (xsd:|extension| + (let* ((attributes (lxml-get-attributes lxml)) + (base (getf attributes :|base|)) + (xsd-extension (make-instance 'xsd-extension :base base))) + (loop :for child :in (lxml-get-children lxml) :do + (push (lxml->schema-element child) + (get-children xsd-extension))) + xsd-extension)) (xsd:|sequence| (let ((xsd-sequence (make-instance 'xsd-sequence))) (loop :for child :in (lxml-get-children lxml) :do @@ -183,11 +203,22 @@ (get-type-in-context element (get-elements xml-schema-definition))))) (defmethod get-members ((xsd-complex-type xsd-complex-type)) - "Return the list of members of xsd-complex-type, provided it is a sequence (for now)" + "Return the list of members of xsd-complex-type, provided it is a sequence or a complex-content (for now)" (let ((first-child (first (get-children xsd-complex-type)))) - (when (and first-child - (typep first-child 'xsd-sequence)) - (get-children first-child)))) + (cond ((and first-child (typep first-child 'xsd-sequence)) + (get-children first-child)) + ((and first-child (typep first-child 'xsd-complex-content)) + (get-members first-child))))) + +(defmethod get-members ((xsd-complex-content xsd-complex-content)) + "Return the list of members of xsd-complex-content, provided it is a base type sequence extension (for now)" + (let ((first-child (first (get-children xsd-complex-content)))) + (when (and first-child (typep first-child 'xsd-extension)) + (let ((base-members (get-members (get-base first-child))) + (first-child (first (get-children first-child)))) + (if (and first-child (typep first-child 'xsd-sequence)) + (append base-members (get-members first-child)) + base-members))))) (defmethod get-multiplicity ((xml-schema-element xml-schema-element)) (with-slots (min-occurs max-occurs)

1 0

[cl-soap-cvs] CVS update: cl-soap/src/xsd.lisp
by scaekenberghe＠common-lisp.net 27 Sep '05

27 Sep '05

Update of /project/cl-soap/cvsroot/cl-soap/src In directory common-lisp.net:/tmp/cvs-serv3537/src Modified Files: xsd.lisp Log Message: bugfix: solitary primitive tags, like <name/> or empty tags like <name></name> where not handles correctly as primitive; now using lxml-* accessors changed behavior of primitive string handling: NIL -> "" Date: Tue Sep 27 07:41:18 2005 Author: scaekenberghe Index: cl-soap/src/xsd.lisp diff -u cl-soap/src/xsd.lisp:1.14 cl-soap/src/xsd.lisp:1.15 --- cl-soap/src/xsd.lisp:1.14 Mon Sep 26 16:40:37 2005 +++ cl-soap/src/xsd.lisp Tue Sep 27 07:41:18 2005 @@ -1,6 +1,6 @@ ;;;; -*- mode: lisp -*- ;;;; -;;;; $Id: xsd.lisp,v 1.14 2005/09/26 14:40:37 scaekenberghe Exp $ +;;;; $Id: xsd.lisp,v 1.15 2005/09/27 05:41:18 scaekenberghe Exp $ ;;;; ;;;; A partial implementation of the XML Schema Definition standard ;;;; @@ -305,7 +305,7 @@ (defun lxml-primitive-value (name type lxml namespace) (let ((tag-name (intern name (s-xml:get-package namespace)))) (if (eql (lxml-get-tag lxml) tag-name) - (values (xsd-primitive->lisp (second lxml) (intern-xsd-type-name type)) t) + (values (xsd-primitive->lisp (first (lxml-get-children lxml)) (intern-xsd-type-name type)) t) (values nil nil)))) (defun resolve-primitive (element type-name lxml namespace) @@ -691,9 +691,9 @@ "Convert the XSD string value to a Common Lisp value, interpreting it as type" (ecase type ((:string :normalizedString :token) - value) + (if (null value) "" value)) ((:Name :QName :NCName :anyURI) - value) + (if (null value) "" value)) ((:integer :positiveInteger :negativeInteger :nonPositiveInteger :nonNegativeInteger :long :unsignedLong :int :unsignedInt :short :unsignedShort

1 0

[cl-soap-cvs] CVS update: cl-soap/test/test-google-adwords.lisp
by scaekenberghe＠common-lisp.net 27 Sep '05

27 Sep '05

Update of /project/cl-soap/cvsroot/cl-soap/test In directory common-lisp.net:/tmp/cvs-serv3520/test Modified Files: test-google-adwords.lisp Log Message: added get-all-adgroups Date: Tue Sep 27 07:39:34 2005 Author: scaekenberghe Index: cl-soap/test/test-google-adwords.lisp diff -u cl-soap/test/test-google-adwords.lisp:1.9 cl-soap/test/test-google-adwords.lisp:1.10 --- cl-soap/test/test-google-adwords.lisp:1.9 Mon Sep 26 13:14:56 2005 +++ cl-soap/test/test-google-adwords.lisp Tue Sep 27 07:39:34 2005 @@ -1,6 +1,6 @@ ;;;; -*- mode: lisp -*- ;;;; -;;;; $Id: test-google-adwords.lisp,v 1.9 2005/09/26 11:14:56 scaekenberghe Exp $ +;;;; $Id: test-google-adwords.lisp,v 1.10 2005/09/27 05:39:34 scaekenberghe Exp $ ;;;; ;;;; Some test on the Google AdWords API (not publically available) ;;;; @@ -223,6 +223,16 @@ :headers `("email" ,*google-adwords-email* "password" ,*google-adwords-password* "useragent" ,*google-adwords-user-agent* + "token" ,*google-adwords-token* + "clientEmail" ,*google-client-email*))) + +(defun get-all-adgroups (campaign-id) + (wsdl-soap-call (wsdl-cache-get "https://adwords.google.com:443/api/adwords/v2/AdGroupService?wsdl") + "getAllAdGroups" + :input `("campaignID" ,campaign-id) + :headers `("email" ,*google-adwords-email* + "password" ,*google-adwords-password* + "useragent" ,*google-adwords-user-agent* "token" ,*google-adwords-token* "clientEmail" ,*google-client-email*)))

1 0

[cl-soap-cvs] CVS update: cl-soap/src/xsd.lisp
by scaekenberghe＠common-lisp.net 26 Sep '05

26 Sep '05

Update of /project/cl-soap/cvsroot/cl-soap/src In directory common-lisp.net:/tmp/cvs-serv5816/src Modified Files: xsd.lisp Log Message: we now return repeatable elements as full lists Date: Mon Sep 26 16:40:38 2005 Author: scaekenberghe Index: cl-soap/src/xsd.lisp diff -u cl-soap/src/xsd.lisp:1.13 cl-soap/src/xsd.lisp:1.14 --- cl-soap/src/xsd.lisp:1.13 Mon Sep 26 12:41:50 2005 +++ cl-soap/src/xsd.lisp Mon Sep 26 16:40:37 2005 @@ -1,6 +1,6 @@ ;;;; -*- mode: lisp -*- ;;;; -;;;; $Id: xsd.lisp,v 1.13 2005/09/26 10:41:50 scaekenberghe Exp $ +;;;; $Id: xsd.lisp,v 1.14 2005/09/26 14:40:37 scaekenberghe Exp $ ;;;; ;;;; A partial implementation of the XML Schema Definition standard ;;;; @@ -335,15 +335,13 @@ (resolve-primitive member member-type item-lxml namespace) (when required (incf count) - (push member-name resolved-members) - (push member-value resolved-members))) + (push (list member-name member-value) resolved-members))) (multiple-value-bind (member-value required) (resolve-type member-type item-lxml member xml-schema-definition namespace) (when required (incf count) - (push member-name resolved-members) - (push member-value resolved-members))))) + (push (list member-name member-value) resolved-members))))) (if (zerop count) (unless (or (is-optional-p member) (get-nillable member)) (error "Required element <~a> not found" member-name)))) @@ -389,15 +387,13 @@ (resolve-primitive member member-type item-lxml namespace) (when required (incf count) - (push member-name resolved-members) - (push member-value resolved-members))) + (push (list member-name member-value) resolved-members))) (multiple-value-bind (member-value required) (resolve-type member-type item-lxml member xml-schema-definition namespace) (when required (incf count) - (push member-name resolved-members) - (push member-value resolved-members)))) + (push (list member-name member-value) resolved-members)))) (error "Expected a <~a> element" sub-tag-name))) (if (zerop count) (unless (or (is-optional-p member) (get-nillable member))

1 0

[cl-soap-cvs] CVS update: cl-soap/src/package.lisp
by scaekenberghe＠common-lisp.net 26 Sep '05

26 Sep '05

Update of /project/cl-soap/cvsroot/cl-soap/src In directory common-lisp.net:/tmp/cvs-serv24509/src Modified Files: package.lisp Log Message: some code cleanup, more exports Date: Mon Sep 26 13:17:43 2005 Author: scaekenberghe Index: cl-soap/src/package.lisp diff -u cl-soap/src/package.lisp:1.2 cl-soap/src/package.lisp:1.3 --- cl-soap/src/package.lisp:1.2 Thu Sep 15 15:31:11 2005 +++ cl-soap/src/package.lisp Mon Sep 26 13:17:42 2005 @@ -1,6 +1,6 @@ ;;;; -*- mode: lisp -*- ;;;; -;;;; $Id: package.lisp,v 1.2 2005/09/15 13:31:11 scaekenberghe Exp $ +;;;; $Id: package.lisp,v 1.3 2005/09/26 11:17:42 scaekenberghe Exp $ ;;;; ;;;; Definition of the CL-SOAP package ;;;; @@ -19,10 +19,11 @@ ;; standard soap #:make-soap-end-point #:soap-call standard-soap-fault #:fault-code #:fault-string #:fault-actor #:fault-detail - #:*debug-stream* *last-soap-call-xml* *last-soap-result-xml* + #:*debug-stream* *last-soap-call-xml* *last-soap-result-xml* #:report-soap-call +soap-enc-ns-uri+ ;; wsdl #:parse-wsdl #:parse-wsdl-file #:parse-wsdl-url #:describe-wsdl-soap + #:wsdl-cache-get #:wsdl-cache-clear #:wsdl-cache-clear-all #:wsdl-soal-call ;; xsd #:parse-xsd #:parse-xsd-file #:parse-xsd-url

1 0