s-xml-cvs

s-xml-cvs@common-lisp.net

61 discussions

[s-xml-cvs] CVS update: s-xml/src/xml.lisp
by scaekenberghe＠common-lisp.net 24 Jan '05

24 Jan '05

Update of /project/s-xml/cvsroot/s-xml/src In directory common-lisp.net:/tmp/cvs-serv27989/src Modified Files: xml.lisp Log Message: added :start and :end keywords to print-string-xml Date: Mon Jan 24 02:03:09 2005 Author: scaekenberghe Index: s-xml/src/xml.lisp diff -u s-xml/src/xml.lisp:1.5 s-xml/src/xml.lisp:1.6 --- s-xml/src/xml.lisp:1.5 Fri Oct 22 03:36:58 2004 +++ s-xml/src/xml.lisp Mon Jan 24 02:03:09 2005 @@ -1,6 +1,6 @@ ;;;; -*- mode: lisp -*- ;;;; -;;;; $Id: xml.lisp,v 1.5 2004/10/22 10:36:58 scaekenberghe Exp $ +;;;; $Id: xml.lisp,v 1.6 2005/01/24 10:03:09 scaekenberghe Exp $ ;;;; ;;;; This is a Common Lisp implementation of a very basic XML parser. ;;;; The parser is non-validating and not at all complete (no CDATA). @@ -80,9 +80,10 @@ :adjustable t :fill-pointer 0)) -(defun print-string-xml (string stream) +(defun print-string-xml (string stream &key (start 0) end) "Write the characters of string to stream using basic XML conventions" - (loop for char across string + (loop for offset upfrom start below (or end (length string)) + for char = (char string offset) do (case char (#\& (write-string "&" stream)) (#\< (write-string "<" stream))

1 0

[s-xml-cvs] CVS update: s-xml/test/test-xml.lisp
by Sven Van Caekenberghe 22 Oct '04

22 Oct '04

Update of /project/s-xml/cvsroot/s-xml/test In directory common-lisp.net:/tmp/cvs-serv28410/test Modified Files: test-xml.lisp Log Message: fixed a bug: in a tag containing whitespace, like <foo> </foo> the parser collapsed and ingnored all whitespace and considered the tag to be empty! this is now fixed and a unit test has been added cleaned up xml character escaping a bit: single quotes and all normal whitespace (newline, return and tab) is preserved a unit test for this has been added Date: Fri Oct 22 12:37:00 2004 Author: scaekenberghe Index: s-xml/test/test-xml.lisp diff -u s-xml/test/test-xml.lisp:1.1.1.1 s-xml/test/test-xml.lisp:1.2 --- s-xml/test/test-xml.lisp:1.1.1.1 Mon Jun 7 20:49:59 2004 +++ s-xml/test/test-xml.lisp Fri Oct 22 12:37:00 2004 @@ -1,6 +1,6 @@ ;;;; -*- mode: lisp -*- ;;;; -;;;; $Id: test-xml.lisp,v 1.1.1.1 2004/06/07 18:49:59 scaekenberghe Exp $ +;;;; $Id: test-xml.lisp,v 1.2 2004/10/22 10:37:00 scaekenberghe Exp $ ;;;; ;;;; Unit and functional tests for xml.lisp ;;;; @@ -51,8 +51,13 @@ "<foo>")) (assert - (string-equal (with-output-to-string (stream) (print-string-xml "' '" stream)) - "'	'")) + (string-equal (with-output-to-string (stream) (print-string-xml "' '" stream)) + "' '")) + +(assert + (let ((string (map 'string #'identity '(#\return #\tab #\newline)))) + (string-equal (with-output-to-string (stream) (print-string-xml string stream)) + string))) (defun simple-echo-xml (in out) (start-parse-xml @@ -71,12 +76,19 @@ (declare (ignore seed)) (princ string out))))) +(defun simple-echo-xml-string (string) + (with-input-from-string (in string) + (with-output-to-string (out) + (simple-echo-xml in out)))) + (assert (let ((xml "<FOO ATT1='1' ATT2='2'>Text<EMPTY></EMPTY>More text!</FOO>")) - (equal - (with-input-from-string (in xml) - (with-output-to-string (out) - (simple-echo-xml in out))) - xml))) + (equal (simple-echo-xml-string xml) + xml))) + +(assert + (let ((xml " ")) + (equal (simple-echo-xml-string xml) + xml))) ;;;; eof

1 0

[s-xml-cvs] CVS update: s-xml/src/xml.lisp
by Sven Van Caekenberghe 22 Oct '04

22 Oct '04

Update of /project/s-xml/cvsroot/s-xml/src In directory common-lisp.net:/tmp/cvs-serv28410/src Modified Files: xml.lisp Log Message: fixed a bug: in a tag containing whitespace, like <foo> </foo> the parser collapsed and ingnored all whitespace and considered the tag to be empty! this is now fixed and a unit test has been added cleaned up xml character escaping a bit: single quotes and all normal whitespace (newline, return and tab) is preserved a unit test for this has been added Date: Fri Oct 22 12:36:58 2004 Author: scaekenberghe Index: s-xml/src/xml.lisp diff -u s-xml/src/xml.lisp:1.4 s-xml/src/xml.lisp:1.5 --- s-xml/src/xml.lisp:1.4 Thu Aug 19 16:55:20 2004 +++ s-xml/src/xml.lisp Fri Oct 22 12:36:58 2004 @@ -1,6 +1,6 @@ ;;;; -*- mode: lisp -*- ;;;; -;;;; $Id: xml.lisp,v 1.4 2004/08/19 14:55:20 bmastenbrook Exp $ +;;;; $Id: xml.lisp,v 1.5 2004/10/22 10:36:58 scaekenberghe Exp $ ;;;; ;;;; This is a Common Lisp implementation of a very basic XML parser. ;;;; The parser is non-validating and not at all complete (no CDATA). @@ -88,9 +88,7 @@ (#\< (write-string "<" stream)) (#\> (write-string ">" stream)) (#\" (write-string """ stream)) - #+nil (#\' (write-string "'" stream)) - (#\' (write-string "'" stream)) - (#\Newline (write-string (string #\newline) stream)) + ((#\newline #\return #\tab) (write-char char stream)) (t (if (and (<= 32 (char-code char)) (<= (char-code char) 126)) (write-char char stream) @@ -355,7 +353,7 @@ (when (char= (peek-char nil stream nil nil) #\!) (skip-special-tag stream) (return-from parse-xml-element)) - (let (char buffer open-tag parent-seed) + (let (char buffer open-tag parent-seed has-children) (setf parent-seed (get-seed state)) ;; read tag name (no whitespace between < and name ?) (setf open-tag (intern (parse-identifier stream (get-mini-buffer state)) :keyword)) @@ -389,6 +387,10 @@ (if (char= (peek-char nil stream nil nil) #\/) (progn ;; handle the matching closing tag </tag> and done + ;; if we read whitespace as this (leaf) element's contents, it is significant + (when (and (not has-children) (plusp (length buffer))) + (setf (get-seed state) (funcall (get-text-hook state) + (copy-seq buffer) (get-seed state)))) (read-char stream) (let ((close-tag (intern (parse-identifier stream (get-mini-buffer state)) :keyword))) (unless (eq open-tag close-tag) @@ -400,7 +402,10 @@ open-tag attributes parent-seed (get-seed state)))) (return)) ;; handle child tag and loop, no hooks to call here - (parse-xml-element stream state))) + ;; whitespace between child elements is skipped + (progn + (setf has-children t) + (parse-xml-element stream state)))) (t ;; no child tag, concatenate text to whitespace in buffer ;; handle text content and loop

1 0

[s-xml-cvs] CVS update: s-xml/src/xml.lisp
by Brian Mastenbrook 19 Aug '04

19 Aug '04

Update of /project/s-xml/cvsroot/s-xml/src In directory common-lisp.net:/home/bmastenbrook/s-xml/src Modified Files: xml.lisp Log Message: Internet Explorer doesn't understand the ' XML entity, so I've commented that out for now. Also, using actual newlines for newlines is probably better than using #xA, which won't get any end of line conversion by the server or user agent. Date: Thu Aug 19 07:55:20 2004 Author: bmastenbrook Index: s-xml/src/xml.lisp diff -u s-xml/src/xml.lisp:1.3 s-xml/src/xml.lisp:1.4 --- s-xml/src/xml.lisp:1.3 Fri Jun 11 04:14:42 2004 +++ s-xml/src/xml.lisp Thu Aug 19 07:55:20 2004 @@ -1,6 +1,6 @@ ;;;; -*- mode: lisp -*- ;;;; -;;;; $Id: xml.lisp,v 1.3 2004/06/11 11:14:42 scaekenberghe Exp $ +;;;; $Id: xml.lisp,v 1.4 2004/08/19 14:55:20 bmastenbrook Exp $ ;;;; ;;;; This is a Common Lisp implementation of a very basic XML parser. ;;;; The parser is non-validating and not at all complete (no CDATA). @@ -88,7 +88,9 @@ (#\< (write-string "<" stream)) (#\> (write-string ">" stream)) (#\" (write-string """ stream)) - (#\' (write-string "'" stream)) + #+nil (#\' (write-string "'" stream)) + (#\' (write-string "'" stream)) + (#\Newline (write-string (string #\newline) stream)) (t (if (and (<= 32 (char-code char)) (<= (char-code char) 126)) (write-char char stream)

1 0

[s-xml-cvs] CVS update: public_html/index.html
by Sven Van Caekenberghe 31 Jul '04

31 Jul '04

Update of /project/s-xml/cvsroot/public_html In directory common-lisp.net:/tmp/cvs-serv30377 Modified Files: index.html Log Message: added anonymous cvs access instructions Date: Sat Jul 31 03:07:34 2004 Author: scaekenberghe Index: public_html/index.html diff -u public_html/index.html:1.8 public_html/index.html:1.9 --- public_html/index.html:1.8 Fri Jul 9 04:06:46 2004 +++ public_html/index.html Sat Jul 31 03:07:34 2004 @@ -49,7 +49,14 @@ (signature: <a href="s-xml.tgz.asc">s-xml.tgz.asc</a> for which the public key can be found in the <a href="http://common-lisp.net/keyring.asc">common-lisp.net keyring</a>) (build and/or install with ASDF). - There is also <a href="http://common-lisp.net/cgi-bin/viewcvs.cgi/?cvsroot=s-xml">CVS</a> access. + + + You can view the <a href="http://common-lisp.net/cgi-bin/viewcvs.cgi/?cvsroot=s-xml">CVS Repository</a> or + get anonymous CVS access as follows: + <pre>$ cvs -d:pserver:anonymous@common-lisp.net:/project/s-xml/cvsroot login +(Logging in to anonymous(a)common-lisp.net) +CVS password: anonymous +$ cvs -d:pserver:anonymous@common-lisp.net:/project/s-xml/cvsroot co s-xml</pre> <h3>API</h3> @@ -287,7 +294,7 @@ <li><a href="http://common-lisp.net/mailman/listinfo/s-xml-announce">S-XML-ANNOUNCE mailing list info</a></li> </ul> - CVS version $Id: index.html,v 1.8 2004/07/09 11:06:46 scaekenberghe Exp $ + CVS version $Id: index.html,v 1.9 2004/07/31 10:07:34 scaekenberghe Exp $ <div class="footer"> Back to <a href="http://common-lisp.net/">Common-lisp.net</a>.

1 0

[s-xml-cvs] CVS update: public_html/index.html
by Sven Van Caekenberghe 09 Jul '04

09 Jul '04

Update of /project/s-xml/cvsroot/public_html In directory common-lisp.net:/tmp/cvs-serv15908 Modified Files: index.html Log Message: fixed a typo and added a todo list Date: Fri Jul 9 04:06:46 2004 Author: scaekenberghe Index: public_html/index.html diff -u public_html/index.html:1.7 public_html/index.html:1.8 --- public_html/index.html:1.7 Thu Jul 8 12:28:56 2004 +++ public_html/index.html Fri Jul 9 04:06:46 2004 @@ -232,8 +232,8 @@ There is a generic API that is identical for each type of DOM, with an extra parameter <tt>input-type</tt> or <tt>output-type</tt> used to specify the type of DOM. The default DOM type is <tt>:lxml</tt>. Here are some examples: -<pre>? (in-package :xml) -#<Package "XML"> +<pre>? (in-package :s-xml) +#<Package "S-XML"> ? (setf xml-string "<foo id='top'><bar>text</bar>&lt/foo>") "<foo id='top'><bar>text</bar></foo>" @@ -273,6 +273,12 @@ <li>release 0, end of 2002: as part of an XML-RPC implementation</li> </ul> +<h3>Todo</h3> + +<ul> + <li>Some should find some time to add CDATA support (both in the parser and as a print function) - this shouldn't be too hard, and it would be really useful!</li> +</ul> + <h3>Mailing Lists</h3> <ul> @@ -281,7 +287,7 @@ <li><a href="http://common-lisp.net/mailman/listinfo/s-xml-announce">S-XML-ANNOUNCE mailing list info</a></li> </ul> - CVS version $Id: index.html,v 1.7 2004/07/08 19:28:56 scaekenberghe Exp $ + CVS version $Id: index.html,v 1.8 2004/07/09 11:06:46 scaekenberghe Exp $ <div class="footer"> Back to <a href="http://common-lisp.net/">Common-lisp.net</a>.

1 0

[s-xml-cvs] CVS update: s-xml/Makefile
by Sven Van Caekenberghe 08 Jul '04

08 Jul '04

Update of /project/s-xml/cvsroot/s-xml In directory common-lisp.net:/tmp/cvs-serv26814 Modified Files: Makefile Log Message: updated to newer version of release target Date: Thu Jul 8 12:31:22 2004 Author: scaekenberghe Index: s-xml/Makefile diff -u s-xml/Makefile:1.2 s-xml/Makefile:1.3 --- s-xml/Makefile:1.2 Fri Jun 11 06:46:48 2004 +++ s-xml/Makefile Thu Jul 8 12:31:22 2004 @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.2 2004/06/11 13:46:48 scaekenberghe Exp $ +# $Id: Makefile,v 1.3 2004/07/08 19:31:22 scaekenberghe Exp $ default: @echo Possible targets: @@ -22,10 +22,14 @@ # This can obviously only be done by a specific person in a very specific context ;-) # +PRJ=s-xml +ACCOUNT=scaekenberghe +CVSRT=:ext:$(ACCOUNT)@common-lisp.net:/project/$(PRJ)/cvsroot + release: - rm -rf /tmp/s-xml /tmp/public_html /tmp/s-xml.tgz /tmp/s-xml.tgz.asc - cd /tmp; cvs export -r HEAD s-xml; cvs export -r HEAD public_html - mv /tmp/public_html /tmp/s-xml/doc - cd /tmp; gnutar cvfz s-xml.tgz s-xml; gpg -a -b s-xml.tgz - scp /tmp/s-xml.tgz scaekenberghe@common-lisp.net:/project/s-xml/public_html - scp /tmp/s-xml.tgz.asc scaekenberghe@common-lisp.net:/project/s-xml/public_html + rm -rf /tmp/$(PRJ) /tmp/public_html /tmp/$(PRJ).tgz /tmp/$(PRJ).tgz.asc + cd /tmp; cvs -d$(CVSRT) export -r HEAD $(PRJ); cvs -d$(CVSRT) export -r HEAD public_html + mv /tmp/public_html /tmp/$(PRJ)/doc + cd /tmp; gnutar cvfz $(PRJ).tgz $(PRJ); gpg -a -b $(PRJ).tgz + scp /tmp/$(PRJ).tgz $(ACCOUNT)@common-lisp.net:/project/$(PRJ)/public_html + scp /tmp/$(PRJ).tgz.asc $(ACCOUNT)@common-lisp.net:/project/$(PRJ)/public_html

1 0

[s-xml-cvs] CVS update: public_html/index.html
by Sven Van Caekenberghe 08 Jul '04

08 Jul '04

Update of /project/s-xml/cvsroot/public_html In directory common-lisp.net:/tmp/cvs-serv1192 Modified Files: index.html Log Message: updated with some personal info Date: Thu Jul 8 12:28:56 2004 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 Wed Jun 30 12:12:23 2004 +++ public_html/index.html Thu Jul 8 12:28:56 2004 @@ -13,7 +13,14 @@ <h1>S-XML</h1> </div> - S-XML is a simple XML parser implemented in Common Lisp. + + S-XML is a simple XML parser implemented in Common Lisp. + Originally it was written by <a href="http://homepage.mac.com/svc">Sven Van Caekenberghe</a>. + It is now being maintained by <a href="http://homepage.mac.com/svc">Sven Van Caekenberghe</a>, + <a href="http://constantly.at">Rudi Schlatte</a> and <a href="http://www.cs.indiana.edu/~bmastenb">Brian Mastenbrook</a>. + S-XML is used by <a href="http://common-lisp.net/project/s-xml-rpc">S-XML-RPC</a> and + <a href="http://common-lisp.net/project/cl-prevalence">CL-PREVALENCE</a>. + This XML parser implementation has the following features: @@ -274,7 +281,7 @@ <li><a href="http://common-lisp.net/mailman/listinfo/s-xml-announce">S-XML-ANNOUNCE mailing list info</a></li> </ul> - CVS version $Id: index.html,v 1.6 2004/06/30 19:12:23 scaekenberghe Exp $ + CVS version $Id: index.html,v 1.7 2004/07/08 19:28:56 scaekenberghe Exp $ <div class="footer"> Back to <a href="http://common-lisp.net/">Common-lisp.net</a>.

1 0

[s-xml-cvs] CVS update: public_html/index.html
by Sven Van Caekenberghe 30 Jun '04

30 Jun '04

Update of /project/s-xml/cvsroot/public_html In directory common-lisp.net:/tmp/cvs-serv24480 Modified Files: index.html Log Message: added reference to common-lisp.net keyring Date: Wed Jun 30 12:12:23 2004 Author: scaekenberghe Index: public_html/index.html diff -u public_html/index.html:1.5 public_html/index.html:1.6 --- public_html/index.html:1.5 Fri Jun 11 06:25:04 2004 +++ public_html/index.html Wed Jun 30 12:12:23 2004 @@ -39,7 +39,8 @@ <h3>Download</h3> You can download the LLGPL source code and documentation as <a href="s-xml.tgz">s-xml.tgz</a> - (signature: <a href="s-xml.tgz.asc">s-xml.tgz.asc</a>) + (signature: <a href="s-xml.tgz.asc">s-xml.tgz.asc</a> for which the public key can be found + in the <a href="http://common-lisp.net/keyring.asc">common-lisp.net keyring</a>) (build and/or install with ASDF). There is also <a href="http://common-lisp.net/cgi-bin/viewcvs.cgi/?cvsroot=s-xml">CVS</a> access. @@ -273,7 +274,7 @@ <li><a href="http://common-lisp.net/mailman/listinfo/s-xml-announce">S-XML-ANNOUNCE mailing list info</a></li> </ul> - CVS version $Id: index.html,v 1.5 2004/06/11 13:25:04 scaekenberghe Exp $ + CVS version $Id: index.html,v 1.6 2004/06/30 19:12:23 scaekenberghe Exp $ <div class="footer"> Back to <a href="http://common-lisp.net/">Common-lisp.net</a>.

1 0

[s-xml-cvs] CVS update: public_html/S-XML.html
by Sven Van Caekenberghe 30 Jun '04

30 Jun '04

Update of /project/s-xml/cvsroot/public_html In directory common-lisp.net:/tmp/cvs-serv14647 Modified Files: S-XML.html Log Message: updated API to new exports Date: Wed Jun 30 12:09:43 2004 Author: scaekenberghe Index: public_html/S-XML.html diff -u public_html/S-XML.html:1.1 public_html/S-XML.html:1.2 --- public_html/S-XML.html:1.1 Fri Jun 11 06:25:04 2004 +++ public_html/S-XML.html Wed Jun 30 12:09:43 2004 @@ -46,6 +46,15 @@ <blockquote>Generate XML output to a string from a DOM of input-type (:lxml by default), optionally pretty printing (off by default)</blockquote> (start-parse-xml stream &optional (state (make-instance (quote xml-parser-state))))   function <blockquote>Parse and return a toplevel XML element from stream, using parser state</blockquote> +(xml-element-attribute xml-element key)   function +<blockquote>Return the string value of the attribute with name the keyword :key + of xml-element if any, return null if not found</blockquote> +(setf (xml-element-attribute xml-element key) value)   function +<blockquote>Set the string value of the attribute with name the keyword :key of + xml-element, creating a new attribute if necessary or overwriting an + existing one, returning the value</blockquote> +(xml-element-attributes object)   function +<blockquote>Return the alist of attribute names and values dotted pairs from an xml-element struct</blockquote> (xml-element-children object)   function <blockquote>Return the list of children from an xml-element struct</blockquote> (xml-element-name object)   function

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

s-xml-cvs