March 2009 - bknr-cvs@common-lisp.net - mailman3.common-lisp.net

[bknr-cvs] hans changed deployed/bos/projects/bos/web/kml-handlers.lisp
by BKNR Commits 05 Mar '09

05 Mar '09

Revision: 4331 Author: hans URL: http://bknr.net/trac/changeset/4331 fix namespace url replacement, add correction function for existing data U deployed/bos/projects/bos/web/kml-handlers.lisp Modified: deployed/bos/projects/bos/web/kml-handlers.lisp =================================================================== --- deployed/bos/projects/bos/web/kml-handlers.lisp 2009-03-03 22:37:01 UTC (rev 4330) +++ deployed/bos/projects/bos/web/kml-handlers.lisp 2009-03-05 10:04:28 UTC (rev 4331) @@ -89,7 +89,7 @@ (defun replace-all-url-hosts (string new-host) "Replaces all hostnames in STRING by NEW-HOST." - (ppcre:regex-replace-all #?r"((?:https?|ftp)://)\w+(?:\.\w+)*(?::\d+)?" string #?r"\1${new-host}")) + (ppcre:regex-replace-all #?r"(?<!xmlns=[\"'])((?:https?|ftp)://)\w+(?:\.\w+)*(?::\d+)?" string #?r"\1${new-host}")) (defun replace-lang-query-params (string new-lang) (ppcre:regex-replace-all #?r"(?i)(lang=)[a-z]{2,2}" string #?r"\1${new-lang}")) @@ -267,9 +267,9 @@ (with-element "longitude" (text "8.297592139883164")) (with-element "latitude" (text "49.89989439494514")) (with-element "altitude" (text "0")) - (with-element "range" (text "5400715.913126094")) + (with-element "heading" (text "0")) (with-element "tilt" (text "0")) - (with-element "heading" (text "0")))))))))) + (with-element "range" (text "5400715.913126094")))))))))) (defmethod handle-object ((handler kml-root-dynamic-handler) (object sponsor)) (write-root-kml handler object)) @@ -353,3 +353,11 @@ (with-element "name" (text (format nil "allocation-area ~D" (store-object-id area)))) (kml-region (make-rectangle2 (allocation-area-bounding-box2 area)) nil)))) + +(defun fix-xmlns () + (with-transaction (:update-kml) + (dolist (kml-root (class-instances 'kml-root-data)) + (with-slots (kml-string) kml-root + (setf kml-string (cl-ppcre:regex-replace-all "http://earth.google.com/kml/2.2" + kml-string + "http://www.opengis.net/kml/2.2")))))) \ No newline at end of file

1 0

[bknr-cvs] hans changed deployed/bos/
by BKNR Commits 03 Mar '09

03 Mar '09

Revision: 4330 Author: hans URL: http://bknr.net/trac/changeset/4330 merge kml changes U deployed/bos/bknr/web/src/web/web-macros.lisp U deployed/bos/projects/bos/web/kml-handlers.lisp U deployed/bos/projects/bos/web/kml-utils.lisp Modified: deployed/bos/bknr/web/src/web/web-macros.lisp =================================================================== --- deployed/bos/bknr/web/src/web/web-macros.lisp 2009-03-03 22:27:55 UTC (rev 4329) +++ deployed/bos/bknr/web/src/web/web-macros.lisp 2009-03-03 22:37:01 UTC (rev 4330) @@ -104,7 +104,7 @@ (defvar *xml-sink*) -(defmacro with-xml-response ((&key (content-type "text/xml; charset=utf-8") root-element xsl-stylesheet-name) +(defmacro with-xml-response ((&key (content-type "text/xml; charset=utf-8") root-element xsl-stylesheet-name xmlns) &body body) `(with-http-response (:content-type ,content-type) (with-query-params (download) @@ -114,10 +114,12 @@ (with-output-to-string (s) (let ((*xml-sink* (cxml:make-character-stream-sink s :canonical nil))) (cxml:with-xml-output *xml-sink* - ,(when xsl-stylesheet-name - `(sax:processing-instruction *xml-sink* "xml-stylesheet" - ,(format nil "type=\"text/xsl\" href=\"~A\"" xsl-stylesheet-name))) + ,@(when xsl-stylesheet-name + `((sax:processing-instruction *xml-sink* "xml-stylesheet" + ,(format nil "type=\"text/xsl\" href=\"~A\"" xsl-stylesheet-name)))) ,(if root-element `(cxml:with-element ,root-element + ,@(when xmlns + `((cxml:attribute "xmlns" ,xmlns))) ,@body) `(progn ,@body))))))) \ No newline at end of file Modified: deployed/bos/projects/bos/web/kml-handlers.lisp =================================================================== --- deployed/bos/projects/bos/web/kml-handlers.lisp 2009-03-03 22:27:55 UTC (rev 4329) +++ deployed/bos/projects/bos/web/kml-handlers.lisp 2009-03-03 22:37:01 UTC (rev 4330) @@ -218,7 +218,7 @@ (contract (when sponsor (first (sponsor-contracts sponsor))))) ;; only the first contract of SPONSOR will be shown (with-xml-response (:content-type #+nil "text/xml" "application/vnd.google-earth.kml+xml; charset=utf-8" - :root-element "kml") + :root-element "kml" :xmlns "http://www.opengis.net/kml/2.2") (with-query-params ((lang "en")) (with-element "Document" (with-element "name" (text "BOS")) @@ -229,12 +229,12 @@ (with-element "longitude" (text "116.975859")) (with-element "latitude" (text "-1.044691")) (with-element "altitude" (text "0")) - (with-element "range" (text "11000")) + (with-element "heading" (text "0")) (with-element "tilt" (text "0")) - (with-element "heading" (text "0"))) + (with-element "range" (text "11000"))) (with-element "Folder" - (attribute "name" (dictionary-entry "Sat-Images" lang)) - (attribute "open" "1") + (with-element "name" (text (dictionary-entry "Sat-Images" lang))) + (with-element "open" (text "1")) (dolist (sat-layer (sort (copy-list (class-instances 'sat-layer)) #'< :key #'year)) (kml-network-link (format nil "http://~a/sat-root-kml?name=~A" (website-host) (name sat-layer)) @@ -293,7 +293,7 @@ (setf (hunchentoot:header-out :last-modified) (hunchentoot:rfc-1123-date timestamp)) (with-xml-response (:content-type "application/vnd.google-earth.kml+xml; charset=utf-8" - :root-element "kml") + :root-element "kml" :xmlns "http://www.opengis.net/kml/2.2") (with-query-params ((lang "en")) (with-element "Document" (with-element "name" (text "Country-Stats")) @@ -348,7 +348,7 @@ (defmethod handle-object ((handler look-at-allocation-area-handler) (area allocation-area)) (with-xml-response (:content-type "application/vnd.google-earth.kml+xml; charset=utf-8" - :root-element "kml") + :root-element "kml" :xmlns "http://www.opengis.net/kml/2.2") (with-element "Document" (with-element "name" (text (format nil "allocation-area ~D" (store-object-id area)))) (kml-region (make-rectangle2 (allocation-area-bounding-box2 area)) Modified: deployed/bos/projects/bos/web/kml-utils.lisp =================================================================== --- deployed/bos/projects/bos/web/kml-utils.lisp 2009-03-03 22:27:55 UTC (rev 4329) +++ deployed/bos/projects/bos/web/kml-utils.lisp 2009-03-03 22:37:01 UTC (rev 4330) @@ -281,10 +281,10 @@ ;; http-query could be added to &key args (with-element "NetworkLink" (when name (with-element "name" (text name))) + (when hide-children + (kml-hide-children-style)) (when rect (kml-region rect lod)) (when look-at (funcall look-at)) - (when hide-children - (kml-hide-children-style)) (when fly-to-view (with-element "flyToView" (text "1"))) (kml-link href :refresh-on-region (and rect t))))

1 0

[bknr-cvs] hans changed trunk/bknr/web/src/web/web-macros.lisp
by BKNR Commits 03 Mar '09

03 Mar '09

Revision: 4329 Author: hans URL: http://bknr.net/trac/changeset/4329 Add namespace qualifier. U trunk/bknr/web/src/web/web-macros.lisp Modified: trunk/bknr/web/src/web/web-macros.lisp =================================================================== --- trunk/bknr/web/src/web/web-macros.lisp 2009-03-03 22:22:50 UTC (rev 4328) +++ trunk/bknr/web/src/web/web-macros.lisp 2009-03-03 22:27:55 UTC (rev 4329) @@ -120,6 +120,6 @@ ,(if root-element `(cxml:with-element ,root-element ,@(when xmlns - `((attribute "xmlns" ,xmlns))) + `((cxml:attribute "xmlns" ,xmlns))) ,@body) `(progn ,@body))))))) \ No newline at end of file

1 0

[bknr-cvs] hans changed trunk/projects/bos/web/kml-handlers.lisp
by BKNR Commits 03 Mar '09

03 Mar '09

Revision: 4328 Author: hans URL: http://bknr.net/trac/changeset/4328 Add xmlns to generated kml U trunk/projects/bos/web/kml-handlers.lisp Modified: trunk/projects/bos/web/kml-handlers.lisp =================================================================== --- trunk/projects/bos/web/kml-handlers.lisp 2009-03-03 22:02:12 UTC (rev 4327) +++ trunk/projects/bos/web/kml-handlers.lisp 2009-03-03 22:22:50 UTC (rev 4328) @@ -218,7 +218,7 @@ (contract (when sponsor (first (sponsor-contracts sponsor))))) ;; only the first contract of SPONSOR will be shown (with-xml-response (:content-type #+nil "text/xml" "application/vnd.google-earth.kml+xml; charset=utf-8" - :root-element "kml") + :root-element "kml" :xmlns "http://www.opengis.net/kml/2.2") (with-query-params ((lang "en")) (with-element "Document" (with-element "name" (text "BOS")) @@ -293,7 +293,7 @@ (setf (hunchentoot:header-out :last-modified) (hunchentoot:rfc-1123-date timestamp)) (with-xml-response (:content-type "application/vnd.google-earth.kml+xml; charset=utf-8" - :root-element "kml") + :root-element "kml" :xmlns "http://www.opengis.net/kml/2.2") (with-query-params ((lang "en")) (with-element "Document" (with-element "name" (text "Country-Stats")) @@ -348,7 +348,7 @@ (defmethod handle-object ((handler look-at-allocation-area-handler) (area allocation-area)) (with-xml-response (:content-type "application/vnd.google-earth.kml+xml; charset=utf-8" - :root-element "kml") + :root-element "kml" :xmlns "http://www.opengis.net/kml/2.2") (with-element "Document" (with-element "name" (text (format nil "allocation-area ~D" (store-object-id area)))) (kml-region (make-rectangle2 (allocation-area-bounding-box2 area))

1 0

[bknr-cvs] hans changed trunk/projects/bos/web/kml-
by BKNR Commits 03 Mar '09

03 Mar '09

Revision: 4327 Author: hans URL: http://bknr.net/trac/changeset/4327 changes to make generated kml conform to the XML schema U trunk/projects/bos/web/kml-handlers.lisp U trunk/projects/bos/web/kml-utils.lisp Modified: trunk/projects/bos/web/kml-handlers.lisp =================================================================== --- trunk/projects/bos/web/kml-handlers.lisp 2009-03-03 21:36:05 UTC (rev 4326) +++ trunk/projects/bos/web/kml-handlers.lisp 2009-03-03 22:02:12 UTC (rev 4327) @@ -229,12 +229,12 @@ (with-element "longitude" (text "116.975859")) (with-element "latitude" (text "-1.044691")) (with-element "altitude" (text "0")) - (with-element "range" (text "11000")) + (with-element "heading" (text "0")) (with-element "tilt" (text "0")) - (with-element "heading" (text "0"))) + (with-element "range" (text "11000"))) (with-element "Folder" - (attribute "name" (dictionary-entry "Sat-Images" lang)) - (attribute "open" "1") + (with-element "name" (text (dictionary-entry "Sat-Images" lang))) + (with-element "open" (text "1")) (dolist (sat-layer (sort (copy-list (class-instances 'sat-layer)) #'< :key #'year)) (kml-network-link (format nil "http://~a/sat-root-kml?name=~A" (website-host) (name sat-layer)) Modified: trunk/projects/bos/web/kml-utils.lisp =================================================================== --- trunk/projects/bos/web/kml-utils.lisp 2009-03-03 21:36:05 UTC (rev 4326) +++ trunk/projects/bos/web/kml-utils.lisp 2009-03-03 22:02:12 UTC (rev 4327) @@ -281,10 +281,10 @@ ;; http-query could be added to &key args (with-element "NetworkLink" (when name (with-element "name" (text name))) + (when hide-children + (kml-hide-children-style)) (when rect (kml-region rect lod)) (when look-at (funcall look-at)) - (when hide-children - (kml-hide-children-style)) (when fly-to-view (with-element "flyToView" (text "1"))) (kml-link href :refresh-on-region (and rect t))))

1 0

[bknr-cvs] hans changed trunk/bknr/web/src/web/web-macros.lisp
by BKNR Commits 03 Mar '09

03 Mar '09

Revision: 4326 Author: hans URL: http://bknr.net/trac/changeset/4326 Add xmlns keyword argument to WITH-XML-RESPONSE macro U trunk/bknr/web/src/web/web-macros.lisp Modified: trunk/bknr/web/src/web/web-macros.lisp =================================================================== --- trunk/bknr/web/src/web/web-macros.lisp 2009-03-02 17:19:33 UTC (rev 4325) +++ trunk/bknr/web/src/web/web-macros.lisp 2009-03-03 21:36:05 UTC (rev 4326) @@ -104,7 +104,7 @@ (defvar *xml-sink*) -(defmacro with-xml-response ((&key (content-type "text/xml; charset=utf-8") root-element xsl-stylesheet-name) +(defmacro with-xml-response ((&key (content-type "text/xml; charset=utf-8") root-element xsl-stylesheet-name xmlns) &body body) `(with-http-response (:content-type ,content-type) (with-query-params (download) @@ -114,10 +114,12 @@ (with-output-to-string (s) (let ((*xml-sink* (cxml:make-character-stream-sink s :canonical nil))) (cxml:with-xml-output *xml-sink* - ,(when xsl-stylesheet-name - `(sax:processing-instruction *xml-sink* "xml-stylesheet" - ,(format nil "type=\"text/xsl\" href=\"~A\"" xsl-stylesheet-name))) + ,@(when xsl-stylesheet-name + `((sax:processing-instruction *xml-sink* "xml-stylesheet" + ,(format nil "type=\"text/xsl\" href=\"~A\"" xsl-stylesheet-name)))) ,(if root-element `(cxml:with-element ,root-element + ,@(when xmlns + `((attribute "xmlns" ,xmlns))) ,@body) `(progn ,@body))))))) \ No newline at end of file

1 0

[bknr-cvs] dverna changed trunk/projects/lisp-ecoop/website/templates/cfp.xml
by BKNR Commits 02 Mar '09

02 Mar '09

Revision: 4325 Author: dverna URL: http://bknr.net/trac/changeset/4325 CfP update U trunk/projects/lisp-ecoop/website/templates/cfp.xml Modified: trunk/projects/lisp-ecoop/website/templates/cfp.xml =================================================================== --- trunk/projects/lisp-ecoop/website/templates/cfp.xml 2009-03-02 09:59:50 UTC (rev 4324) +++ trunk/projects/lisp-ecoop/website/templates/cfp.xml 2009-03-02 17:19:33 UTC (rev 4325) @@ -107,6 +107,13 @@ pages) describing the involved library or application, and the subject of the session. +Papers (both long and short) should be formatted following the ACM +SIGS guidelines (see +http://www.acm.org/sigs/publications/proceedings-templates) and +include ACM classification categories and terms (see +http://www.acm.org/about/class/1998). Authors will later be required +to sign an ACM copyright form. + Submissions should be mailed as PDF to Didier Verna (didier(a)lrde.epita.fr) before the submission deadline.

1 0

[bknr-cvs] hans changed trunk/projects/lisp-ecoop/website/templates/toplevel.xml
by BKNR Commits 02 Mar '09

02 Mar '09

Revision: 4324 Author: hans URL: http://bknr.net/trac/changeset/4324 change BKNR logo URL to be valid U trunk/projects/lisp-ecoop/website/templates/toplevel.xml Modified: trunk/projects/lisp-ecoop/website/templates/toplevel.xml =================================================================== --- trunk/projects/lisp-ecoop/website/templates/toplevel.xml 2009-02-26 13:17:12 UTC (rev 4323) +++ trunk/projects/lisp-ecoop/website/templates/toplevel.xml 2009-03-02 09:59:50 UTC (rev 4324) @@ -19,7 +19,7 @@ target="_new">ECOOP 2009</a><br />July 06 - Genova, Italy</div> <div id="logo"> <a href="http://bknr.net/" target="_new"> - <img width="57" height="20" alt="BKNR Logo" src="$(base)image/bknr-logo/thumbnail,,57,20" border="0" /> + <img width="57" height="20" alt="BKNR Logo" src="http://elw.bknr.net/static/bknr-logo.png" border="0" /> </a> </div> </div>

1 0