X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=xml-utils.lisp;h=be7952bfedad0f612311db2d5f4553771301447b;hb=45326a2fd9e7761899d593d7f528abf455453b0b;hp=2b06f9c55386918ba9dc7c497ff293ffa372cb76;hpb=30b4f8d91af2bb031e8d4ef7d5a38492739de2bf;p=kmrcl.git

diff --git a/xml-utils.lisp b/xml-utils.lisp
index 2b06f9c..be7952b 100644
--- a/xml-utils.lisp
+++ b/xml-utils.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: xml-utils.lisp,v 1.4 2002/10/10 16:23:48 kevin Exp $
+;;;; $Id: xml-utils.lisp,v 1.7 2003/05/26 21:43:05 kevin Exp $
 ;;;;
 ;;;; This file, part of KMRCL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -17,7 +17,7 @@
 ;;;; *************************************************************************
 
 (in-package :kmrcl)
-(declaim (optimize (speed 3) (safety 1) (compilation-speed 0) (debug 3)))
+(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))
@@ -87,3 +91,15 @@ and position of character following end tag."
 (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))))))
+