r5036: *** empty log message ***

[kmrcl.git] / xml-utils.lisp

diff --git a/xml-utils.lisp b/xml-utils.lisp
index bf3b4de63370bffeb9f2f23898df5e0a017abf93..be7952bfedad0f612311db2d5f4553771301447b 100644 (file)
--- a/xml-utils.lisp
+++ b/xml-utils.lisp
@@ -7,17 +7,17 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: xml-utils.lisp,v 1.1 2002/10/06 13:21:47 kevin Exp $
+;;;; $Id: xml-utils.lisp,v 1.7 2003/05/26 21:43:05 kevin Exp $
 ;;;;
-;;;; This file, part of Webutils, is Copyright (c) 2002 by Kevin M. Rosenberg
+;;;; This file, part of KMRCL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
-;;;; Webutils users are granted the rights to distribute and use this software
-;;;; as governed by the terms of the GNU General Public License.
+;;;; KMRCL users are granted the rights to distribute and use this software
+;;;; as governed by the terms of the Lisp Lesser GNU Public License
+;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL.
 ;;;; *************************************************************************
 
-(in-package :webutils)
-
-(declaim (optimize (speed 3) (safety 1)))
+(in-package :kmrcl)
+(declaim (optimize (speed 3) (safety 2) (compilation-speed 0) (debug 3)))
 
 
 (defun wrap-with-xml (str entity)
@@ -28,10 +28,13 @@
 
 ;;; XML Extraction Functions
 
+#|
+#+allegro (require :pxml)
 #+allegro
 (defun parse-xml-no-ws (str)
   "Return list structure of XML string with removing whitespace strings"
   (remove-tree-if #'string-ws? (parse-xml str)))
+|#
 
 (defun positions-xml-tag-contents (tag xmlstr &optional (start-xmlstr 0) (end-xmlstr nil))
   "Returns three values: the start and end positions of contents between
@@ -49,7 +52,8 @@
             (if bracketpos
                 (let* ((starttag (1+ bracketpos))
                        (endtag (+ starttag taglen)))
-                  (if (string= tag xmlstr :start2 starttag :end2 endtag)
+                  (if (and (< endtag end-xmlstr)
+                           (string= tag xmlstr :start2 starttag :end2 endtag))
                       (let* ((char-after-tag (char xmlstr endtag)))
                         (declare (character char-after-tag))
                         (if (or (char= #\> char-after-tag) (char= #\space char-after-tag))
@@ -84,3 +88,18 @@ and position of character following end tag."
        (values (subseq xmlstr startpos endpos) nextpos)
       (values nil nil))))
 
+(defun xml-cdata (str)
+  (concatenate 'string "<![CDATA[" str "]]>"))
+
+(defun write-xml-cdata (str s)
+  (declare (simple-string str) (optimize (speed 3) (safety 0)))
+  (do* ((len (length str))
+       (i 0 (1+ i)))
+       ((= i len) str)
+    (declare (fixnum i len))
+    (let ((c (schar str i)))
+      (case c
+       (#\< (write-string "&lt;" s))
+       (#\& (write-string "&amp;" s))
+       (t   (write-char c s))))))
+