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

diff --git a/xml-utils.lisp b/xml-utils.lisp
index be7952b..acbf5b3 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.7 2003/05/26 21:43:05 kevin Exp $
+;;;; $Id: xml-utils.lisp,v 1.8 2003/06/06 21:59:30 kevin Exp $
 ;;;;
 ;;;; This file, part of KMRCL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -16,8 +16,7 @@
 ;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL.
 ;;;; *************************************************************************
 
-(in-package :kmrcl)
-(declaim (optimize (speed 3) (safety 2) (compilation-speed 0) (debug 3)))
+(in-package #:kmrcl)
 
 
 (defun wrap-with-xml (str entity)
@@ -36,7 +35,7 @@
   (remove-tree-if #'string-ws? (parse-xml str)))
 |#
 
-(defun positions-xml-tag-contents (tag xmlstr &optional (start-xmlstr 0) (end-xmlstr nil))
+(defun positions-xml-tag-contents-old (tag xmlstr &optional (start-xmlstr 0) (end-xmlstr nil))
   "Returns three values: the start and end positions of contents between
  the xml tags and the position following the close of the end tag."
   (let ((done nil)
@@ -77,6 +76,75 @@
 	       (setq done t))))
     (values startpos endpos nextpos)))
 
+(defun find-start-tag (tag taglen xmlstr start-pos end-xmlstr)
+  (let ((bracketpos (position-char #\< xmlstr start-pos end-xmlstr)))
+    (when bracketpos
+      (let* ((starttag (1+ bracketpos))
+	     (endtag (+ starttag taglen)))
+	(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))
+		  (progn
+		    (if (char= #\> char-after-tag) 
+			(setq startpos (1+ endtag))
+		      (setq startpos (1+ (position-char #\> xmlstr (1+ endtag) end-xmlstr))))
+		    ))))))))
+
+(defun positions-xml-tag-contents (tag xmlstr &optional (start-xmlstr 0)
+				       (end-xmlstr (length xmlstr)))
+  "Returns three values: the start and end positions of contents between
+ the xml tags and the position following the close of the end tag."
+  (let ((done nil)
+	(pos start-xmlstr)
+	(taglen (length tag))
+	(startpos nil)
+	(endpos nil)
+	(nextpos nil))
+    (while (not done)
+	   (let ((bracketpos (position-char #\< xmlstr pos end-xmlstr)))
+	     (unless bracketpos
+	       (return-from positions-xml-tag-contents
+		 (values nil nil nil)))
+	     (let* ((starttag (1+ bracketpos))
+		    (endtag (+ starttag taglen)))
+	       (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))
+			 (progn
+			   (if (char= #\> char-after-tag) 
+			       (setq startpos (1+ endtag))
+			     (setq startpos (1+ (position-char #\> xmlstr (1+ endtag) end-xmlstr))))
+			   (setq endpos (search (format nil "</~a>" tag) xmlstr
+						:start2 startpos :end2 end-xmlstr))
+			   (if (and startpos endpos)
+			       (progn
+				 (setq nextpos (+ endpos taglen 3))
+				 (setq pos nextpos))
+			     (setf startpos nil
+				   endpos nil))
+			   (setq done t))
+		       (setq pos (1+ endtag))))
+		 (setq pos (1+ starttag)))
+	       (when (> pos end-xmlstr)
+		 (setq done t))))))
+    (values startpos endpos nextpos)))
+
+
+(defun xml-tag-contents-old (tag xmlstr &optional (start-xmlstr 0) (end-xmlstr nil))
+  "Returns two values: the string between XML start and end tag 
+and position of character following end tag."
+  (multiple-value-bind 
+      (startpos endpos nextpos) 
+      (positions-xml-tag-contents-old tag xmlstr start-xmlstr end-xmlstr)
+    (if (and startpos endpos)
+	(values (subseq xmlstr startpos endpos) nextpos)
+      (values nil nil))))
 
 (defun xml-tag-contents (tag xmlstr &optional (start-xmlstr 0) (end-xmlstr nil))
   "Returns two values: the string between XML start and end tag 
@@ -92,10 +160,10 @@ and position of character following end tag."
   (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 (simple-string str) (optimize (speed 3) (safety 0) (space 0)))
+  (do ((len (length str))
+       (i 0 (1+ i)))
+      ((= i len) str)
     (declare (fixnum i len))
     (let ((c (schar str i)))
       (case c