X-Git-Url: http://git.kpe.io/?p=kmrcl.git;a=blobdiff_plain;f=xml-utils.lisp;h=20029fe109a29b449736cffb0955099790c73e1e;hp=3214d06d0d17d05bc8573b3c61f3d6448ca65a97;hb=ba354a40a203103a4cf16cd3d21f89f707ba5205;hpb=0e5343fda28c559f11e003805727f4c625d178f3

diff --git a/xml-utils.lisp b/xml-utils.lisp
index 3214d06..20029fe 100644
--- 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.2 2002/10/06 13:30:17 kevin Exp $
+;;;; $Id: xml-utils.lisp,v 1.6 2002/12/04 16:49:23 kevin Exp $
 ;;;;
 ;;;; This file, part of KMRCL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
-;;;; Kmrcl 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 :kmrcl)
-
-(declaim (optimize (speed 3) (safety 1)))
+(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,6 @@ and position of character following end tag."
 	(values (subseq xmlstr startpos endpos) nextpos)
       (values nil nil))))
 
+(defun xml-cdata (str)
+  (concatenate 'string "<![CDATA[" str "]]>"))
+