[bknr-cvs] r1841 - in branches/xml-class-rework: . projects/bos projects/bos/m2 projects/bos/payment-website/infosystem projects/bos/payment-website/infosystem/de projects/bos/payment-website/infosystem/en projects/eboy/eboy-static projects/eboy/eboy-templates projects/eboy/src projects/lisp-ecoop/website/templates projects/quickhoney/src projects/raw-data/mcp tools
bknr at bknr.net
bknr at bknr.net
Fri Feb 17 21:12:12 UTC 2006
Author: hhubner
Date: 2006-02-17 15:12:10 -0600 (Fri, 17 Feb 2006)
New Revision: 1841
Removed:
branches/xml-class-rework/thirdparty/
Modified:
branches/xml-class-rework/projects/bos/build.lisp
branches/xml-class-rework/projects/bos/m2/allocation.lisp
branches/xml-class-rework/projects/bos/m2/m2.lisp
branches/xml-class-rework/projects/bos/payment-website/infosystem/de/satellitenkarte.htm
branches/xml-class-rework/projects/bos/payment-website/infosystem/en/satellitenkarte.htm
branches/xml-class-rework/projects/bos/payment-website/infosystem/javascript.js
branches/xml-class-rework/projects/eboy/eboy-static/catalog.css
branches/xml-class-rework/projects/eboy/eboy-static/catalog.html
branches/xml-class-rework/projects/eboy/eboy-static/catalog.js
branches/xml-class-rework/projects/eboy/eboy-templates/toplevel.bknr
branches/xml-class-rework/projects/eboy/src/breadcrumb.lisp
branches/xml-class-rework/projects/eboy/src/dynasite-tags.lisp
branches/xml-class-rework/projects/eboy/src/eboy-web.lisp
branches/xml-class-rework/projects/eboy/src/item-handlers.lisp
branches/xml-class-rework/projects/eboy/src/item.lisp
branches/xml-class-rework/projects/eboy/src/jerks.lisp
branches/xml-class-rework/projects/eboy/src/layout.lisp
branches/xml-class-rework/projects/eboy/src/load.lisp
branches/xml-class-rework/projects/eboy/src/navi.lisp
branches/xml-class-rework/projects/eboy/src/packages.lisp
branches/xml-class-rework/projects/lisp-ecoop/website/templates/contact.xml
branches/xml-class-rework/projects/lisp-ecoop/website/templates/edit-profile.xml
branches/xml-class-rework/projects/lisp-ecoop/website/templates/edit-submission.xml
branches/xml-class-rework/projects/lisp-ecoop/website/templates/home.xml
branches/xml-class-rework/projects/lisp-ecoop/website/templates/lisp-ecoop.xsl
branches/xml-class-rework/projects/lisp-ecoop/website/templates/profile.xml
branches/xml-class-rework/projects/lisp-ecoop/website/templates/submission.xml
branches/xml-class-rework/projects/lisp-ecoop/website/templates/submissions.xml
branches/xml-class-rework/projects/lisp-ecoop/website/templates/toplevel.xml
branches/xml-class-rework/projects/lisp-ecoop/website/templates/user-error.xml
branches/xml-class-rework/projects/quickhoney/src/handlers.lisp
branches/xml-class-rework/projects/raw-data/mcp/hameg-server.pl
branches/xml-class-rework/tools/make-core.lisp
Log:
Get rid of the thirdparty tree. We'll try to use whatever packages
the user installed. make-core.lisp now assumes home:central-repository/
as additional search path for asdf packages.
Modified: branches/xml-class-rework/projects/bos/build.lisp
===================================================================
--- branches/xml-class-rework/projects/bos/build.lisp 2006-02-17 21:05:51 UTC (rev 1840)
+++ branches/xml-class-rework/projects/bos/build.lisp 2006-02-17 21:12:10 UTC (rev 1841)
@@ -1,6 +1,7 @@
(in-package :bos.build)
(handler-bind ((style-warning #'muffle-warning))
+ (asdf:operate 'asdf:load-op :aserve)
(asdf:operate 'asdf:load-op :bos.web))
;;;
Modified: branches/xml-class-rework/projects/bos/m2/allocation.lisp
===================================================================
--- branches/xml-class-rework/projects/bos/m2/allocation.lisp 2006-02-17 21:05:51 UTC (rev 1840)
+++ branches/xml-class-rework/projects/bos/m2/allocation.lisp 2006-02-17 21:12:10 UTC (rev 1841)
@@ -473,6 +473,7 @@
(right (+ left width))
(bottom (+ top height))
(vertices (allocation-area-vertices (stripe-area stripe))))
+ (format t "right ~A bottom ~A~%" right bottom)
(when (stripe-full-p stripe)
;; Gleich NIL liefern, und den Stripe beseitigen, damit wir ihn nicht
;; wieder antreffen in Zukunft.
Modified: branches/xml-class-rework/projects/bos/m2/m2.lisp
===================================================================
--- branches/xml-class-rework/projects/bos/m2/m2.lisp 2006-02-17 21:05:51 UTC (rev 1840)
+++ branches/xml-class-rework/projects/bos/m2/m2.lisp 2006-02-17 21:12:10 UTC (rev 1841)
@@ -279,8 +279,19 @@
(unless (and (integerp m2-count)
(plusp m2-count))
(error "number of square meters must be a positive integer"))
- (do-make-contract sponsor m2-count :date date :paidp paidp :expires expires))
+ (let ((contract (do-make-contract sponsor m2-count :date date :paidp paidp :expires expires)))
+ (unless contract
+ (send-system-mail :subject "Contact creation failed - Allocation areas exhaused"
+ :text (format nil "A contract for ~A square meters could not be created, presumably because no
+suitable allocation area was found. Please check the free allocation
+areas and add more space.
+Sponsor-ID: ~A
+"
+ m2-count (store-object-id sponsor)))
+ (error "could not create contract, allocation areas exhausted?"))
+ contract))
+
(defun number-of-sold-sqm ()
(let ((retval 0))
(dolist (contract (remove-if-not #'contract-paidp (class-instances 'contract)))
Modified: branches/xml-class-rework/projects/bos/payment-website/infosystem/de/satellitenkarte.htm
===================================================================
--- branches/xml-class-rework/projects/bos/payment-website/infosystem/de/satellitenkarte.htm 2006-02-17 21:05:51 UTC (rev 1840)
+++ branches/xml-class-rework/projects/bos/payment-website/infosystem/de/satellitenkarte.htm 2006-02-17 21:12:10 UTC (rev 1841)
@@ -30,6 +30,7 @@
}
-->
</style>
+ <meta http-equiv="imagetoolbar" content="no"/>
</head>
<body>
<table width="740" height="500" border="0" cellpadding="0" cellspacing="0">
@@ -309,7 +310,7 @@
</div>
<div id="qmDetail" style="position:absolute; width:1px; height:1; z-index:4; left: 0px; top: 0px; visibility: hidden;">
<div id="qmDetailKarte" style="position:absolute; width:360px; height:390px; z-index:1; left: 169px; top: 100px; visibility: inherit;" class="KarteRahmen">
- <div id="qmLupe" style="position:absolute; width:36px; height:24px; z-index:11; visibility: inherit;"><img src="../bilder/lupe.gif" width="36" height="24"/></div>
+ <div id="qmLupe" style="position:absolute; width:36px; height:24px; z-index:11; visibility: inherit; cursor: pointer;"><img src="../bilder/lupe.gif" width="36" height="24"/></div>
<div id="LayersMenu" class="KarteRahmen" style="position: absolute; bottom: 31px; right: 1px; z-index: 15; visibility: inherit;">
<table width="90" border="0" cellspacing="0" cellpadding="0">
<tr>
Modified: branches/xml-class-rework/projects/bos/payment-website/infosystem/en/satellitenkarte.htm
===================================================================
--- branches/xml-class-rework/projects/bos/payment-website/infosystem/en/satellitenkarte.htm 2006-02-17 21:05:51 UTC (rev 1840)
+++ branches/xml-class-rework/projects/bos/payment-website/infosystem/en/satellitenkarte.htm 2006-02-17 21:12:10 UTC (rev 1841)
@@ -30,6 +30,7 @@
}
-->
</style>
+ <meta http-equiv="imagetoolbar" content="no"/>
</head>
<body>
<table width="740" height="500" border="0" cellpadding="0" cellspacing="0">
Modified: branches/xml-class-rework/projects/bos/payment-website/infosystem/javascript.js
===================================================================
--- branches/xml-class-rework/projects/bos/payment-website/infosystem/javascript.js 2006-02-17 21:05:51 UTC (rev 1840)
+++ branches/xml-class-rework/projects/bos/payment-website/infosystem/javascript.js 2006-02-17 21:12:10 UTC (rev 1841)
@@ -336,6 +336,7 @@
// der Datensatz wird vorher auf Nullwerte gesetzt damit fals keine Daten in der URL enthalten sind der Quadratmeter als unverkauft angezeigt wird
m2complete = false;
+ document.body.style.cursor = 'wait';
timer=0;
n_profil = [];
n_profil['name'] = msg("noch nicht verkauft");
@@ -397,13 +398,14 @@
}
document.getElementById("qmInfoText").innerHTML = text;
n_qm_erzeugen();
+ document.body.style.cursor = 'auto';
} else {
// wenn der Datensatz noch nicht komplett geladen ist wird der timer eroeht und die Funktion nochmal gestartet
timer++;
if (timer < 100) {
setTimeout("n_qm_warten()", 100);
} else {
- document.getElementById("qmLaden").style.visibility = "hidden"; schreibe_debugger("<br/> -> <b>Nachbar-Quadratmeter konnten nicht geladen werden</b>");
+ document.getElementById("qmLaden").style."hidden"; schreibe_debugger("<br/> -> <b>Nachbar-Quadratmeter konnten nicht geladen werden</b>");
}
}
return true;
Modified: branches/xml-class-rework/projects/eboy/eboy-static/catalog.css
===================================================================
--- branches/xml-class-rework/projects/eboy/eboy-static/catalog.css 2006-02-17 21:05:51 UTC (rev 1840)
+++ branches/xml-class-rework/projects/eboy/eboy-static/catalog.css 2006-02-17 21:12:10 UTC (rev 1841)
@@ -138,3 +138,9 @@
.selected-keyword {
background-color: #88f;
}
+
+iframe#execute-frame {
+ width: 0px;
+ height: 0px;
+ visibilty: hidden;
+}
\ No newline at end of file
Modified: branches/xml-class-rework/projects/eboy/eboy-static/catalog.html
===================================================================
--- branches/xml-class-rework/projects/eboy/eboy-static/catalog.html 2006-02-17 21:05:51 UTC (rev 1840)
+++ branches/xml-class-rework/projects/eboy/eboy-static/catalog.html 2006-02-17 21:12:10 UTC (rev 1841)
@@ -68,6 +68,6 @@
</div>
<div id="debugger">
</div>
- <iframe src="about:blank" name="execute" id="execute"></iframe>
+ <iframe src="about:blank" name="execute-frame" id="execute-frame"></iframe>
</body>
</html>
\ No newline at end of file
Modified: branches/xml-class-rework/projects/eboy/eboy-static/catalog.js
===================================================================
--- branches/xml-class-rework/projects/eboy/eboy-static/catalog.js 2006-02-17 21:05:51 UTC (rev 1840)
+++ branches/xml-class-rework/projects/eboy/eboy-static/catalog.js 2006-02-17 21:12:10 UTC (rev 1841)
@@ -19,7 +19,7 @@
function init()
{
- document.debug = true;
+ document.debug = false;
var url = document.location.href;
@@ -230,7 +230,7 @@
debug(operation + ' keyword "' + keyword + '" for image ' + image_description.id);
- document.frames['execute'].window.location.replace('/edit-image/' + image_description.id + '?image-id=' + image_description.id + '&action=edit&' + operation + '=' + keyword);
+ document.getElementById('execute-frame').window.location.replace('/edit-image/' + image_description.id + '?batch=1&image-id=' + image_description.id + '&action=edit&' + operation + '=' + keyword);
refresh_image_info();
Modified: branches/xml-class-rework/projects/eboy/eboy-templates/toplevel.bknr
===================================================================
--- branches/xml-class-rework/projects/eboy/eboy-templates/toplevel.bknr 2006-02-17 21:05:51 UTC (rev 1840)
+++ branches/xml-class-rework/projects/eboy/eboy-templates/toplevel.bknr 2006-02-17 21:12:10 UTC (rev 1841)
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html lang="en" xml:lang="en">
+<html
+ lang="en" xml:lang="en"
+ xmlns:bknr="http://bknr.net/"
+ xmlns:eboy="http://eboy.com/">
<head>
<link rel="SHORTCUT ICON" href="/image/favicon" />
<link rel="stylesheet" href="/adm/$(mycolor).css" />
Modified: branches/xml-class-rework/projects/eboy/src/breadcrumb.lisp
===================================================================
--- branches/xml-class-rework/projects/eboy/src/breadcrumb.lisp 2006-02-17 21:05:51 UTC (rev 1840)
+++ branches/xml-class-rework/projects/eboy/src/breadcrumb.lisp 2006-02-17 21:12:10 UTC (rev 1841)
@@ -43,6 +43,6 @@
(in-package :eboy-commands)
-(define-bknr-tag breadcrumb (&key (depth 2))
+(define-bknr-tag breadcrumb ()
(html ((:div :class "breadcrumb")
(:princ (caar (form-urlencoded-to-query (uri-path (request-uri *req*))))))))
\ No newline at end of file
Modified: branches/xml-class-rework/projects/eboy/src/dynasite-tags.lisp
===================================================================
--- branches/xml-class-rework/projects/eboy/src/dynasite-tags.lisp 2006-02-17 21:05:51 UTC (rev 1840)
+++ branches/xml-class-rework/projects/eboy/src/dynasite-tags.lisp 2006-02-17 21:12:10 UTC (rev 1841)
@@ -37,7 +37,7 @@
(let ((host (http-session-host *session*)))
(make-object 'mail
:subject (format nil "feedback from ~A (~A)"
- (user-login *user*)
+ (bknr.user:user-login *user*)
(when host
(host-name host)))
:body feedback)))
Modified: branches/xml-class-rework/projects/eboy/src/eboy-web.lisp
===================================================================
--- branches/xml-class-rework/projects/eboy/src/eboy-web.lisp 2006-02-17 21:05:51 UTC (rev 1840)
+++ branches/xml-class-rework/projects/eboy/src/eboy-web.lisp 2006-02-17 21:12:10 UTC (rev 1841)
@@ -29,7 +29,7 @@
(:template-/ template-handler
:prefix "/"
:command-packages
- ((:bknr . :bknr.web.commands)
+ ((:bknr . :bknr.web)
(:eboy . :eboy-commands))
:destination ,+templates-directory+))
:modules '(user mailinglist mailinglist-registration images stats)))
Modified: branches/xml-class-rework/projects/eboy/src/item-handlers.lisp
===================================================================
--- branches/xml-class-rework/projects/eboy/src/item-handlers.lisp 2006-02-17 21:05:51 UTC (rev 1840)
+++ branches/xml-class-rework/projects/eboy/src/item-handlers.lisp 2006-02-17 21:12:10 UTC (rev 1841)
@@ -4,10 +4,10 @@
;;; links
(defmethod edit-object-url ((item item))
- (format nil "~a/~a" (handler-url :edit-item) (store-object-id item)))
+ (format nil "/edit-item/~a" (store-object-id item)))
(defmethod object-url ((item item))
- (format nil "~a/~a" (handler-url :item) (store-object-id item)))
+ (format nil "/item/~a" (store-object-id item)))
(defmethod html-link ((item item))
(html
@@ -27,7 +27,7 @@
(if item
(html (:h1 "editing item " (:princ-safe (article-subject item))))
(html (:h1 "edit existing item:")
- (:ul (dolist (item (store-objects (current-store) 'item))
+ (:ul (dolist (item (class-instances 'item))
(html (:li ((:a :href (edit-object-url item))
(:princ-safe (string-downcase (item-name item)))
": "
@@ -74,7 +74,7 @@
(image-collection (item-images item :include-poster nil) :url "/edit-image/"))))
(:p (submit-button "save" "save")
(when item (submit-button "delete" "delete"
- :onClick "javascript:return confirm('Really delete item?');")))))))
+ :confirm "Really delete item?")))))))
(defmethod authorized-p ((handler edit-item-handler) req)
(admin-p (bknr-request-user req)))
@@ -106,6 +106,6 @@
(defmethod handle-object-form ((handler edit-item-handler)
(action (eql :delete)) item req)
- (delete-store-object item)
+ (delete-object item)
(with-bknr-page (req :title "item has been deleted")
(html "item has been deleted")))
\ No newline at end of file
Modified: branches/xml-class-rework/projects/eboy/src/item.lisp
===================================================================
--- branches/xml-class-rework/projects/eboy/src/item.lisp 2006-02-17 21:05:51 UTC (rev 1840)
+++ branches/xml-class-rework/projects/eboy/src/item.lisp 2006-02-17 21:12:10 UTC (rev 1841)
@@ -25,11 +25,11 @@
(random-elt (item-images item)))))
(defun item-with-name (keyword)
- (find keyword (store-objects (current-store) 'item) :key #'item-name))
+ (find keyword (class-instances 'item) :key #'item-name))
(defun all-items ()
"return all items which have matching images"
- (remove nil (store-objects (current-store) 'item) :key #'item-images))
+ (remove nil (class-instances 'item) :key #'item-images))
(defun find-item-keywords ()
(reduce #'union (all-items) :key #'item-keywords))
Modified: branches/xml-class-rework/projects/eboy/src/jerks.lisp
===================================================================
--- branches/xml-class-rework/projects/eboy/src/jerks.lisp 2006-02-17 21:05:51 UTC (rev 1840)
+++ branches/xml-class-rework/projects/eboy/src/jerks.lisp 2006-02-17 21:12:10 UTC (rev 1841)
@@ -54,8 +54,7 @@
(pop bottom)) res))))
(defun autojerk-img-url (autojerk &key (proc ""))
- (format nil "~a/~a,~a,~a~a"
- (handler-url :autojerk-image)
+ (format nil "/autojerk-image/~a,~a,~a~a"
(store-object-id (first autojerk))
(store-object-id (second autojerk))
(store-object-id (third autojerk))
Modified: branches/xml-class-rework/projects/eboy/src/layout.lisp
===================================================================
--- branches/xml-class-rework/projects/eboy/src/layout.lisp 2006-02-17 21:05:51 UTC (rev 1840)
+++ branches/xml-class-rework/projects/eboy/src/layout.lisp 2006-02-17 21:12:10 UTC (rev 1841)
@@ -76,23 +76,22 @@
(store-image-name (cell-image cell)))
(defmethod cell-as-html ((cell image-cell) &key background type detail-url)
- (let ((image (cell-image cell)))
- (html ((:div :class "item_box" :style (format nil "height: ~apx; width: ~apx" (cell-height cell) (cell-width cell)))
- ((:a :href (format nil "~a/~a" detail-url (cell-name cell)))
- ((:img :src (format nil "/image/~a/cell,~a,~a,~a,~a"
- (store-image-name (cell-image cell))
- background
- (cell-width cell)
- (cell-image-height cell)
- type)
- :width (format nil "~a" (cell-width cell))
- :height (format nil "~a" (cell-image-height cell))
- :alt (or (cell-caption cell) (cell-name cell)))))
- (when (and (image-layout-captions (cell-layout cell))
- (cell-caption cell))
- (html ((:div :class "item_text")
- ((:a :href (format nil "~a/~a" detail-url (cell-name cell)))
- (:princ (cell-caption cell))))))))))
+ (html ((:div :class "item_box" :style (format nil "height: ~apx; width: ~apx" (cell-height cell) (cell-width cell)))
+ ((:a :href (format nil "~a/~a" detail-url (cell-name cell)))
+ ((:img :src (format nil "/image/~a/cell,~a,~a,~a,~a"
+ (store-image-name (cell-image cell))
+ background
+ (cell-width cell)
+ (cell-image-height cell)
+ type)
+ :width (format nil "~a" (cell-width cell))
+ :height (format nil "~a" (cell-image-height cell))
+ :alt (or (cell-caption cell) (cell-name cell)))))
+ (when (and (image-layout-captions (cell-layout cell))
+ (cell-caption cell))
+ (html ((:div :class "item_text")
+ ((:a :href (format nil "~a/~a" detail-url (cell-name cell)))
+ (:princ (cell-caption cell)))))))))
(defmethod cell-object ((cell image-cell))
(cell-image cell))
Modified: branches/xml-class-rework/projects/eboy/src/load.lisp
===================================================================
--- branches/xml-class-rework/projects/eboy/src/load.lisp 2006-02-17 21:05:51 UTC (rev 1840)
+++ branches/xml-class-rework/projects/eboy/src/load.lisp 2006-02-17 21:12:10 UTC (rev 1841)
@@ -2,6 +2,6 @@
(asdf:oos 'asdf:load-op :swank)
-(swank::create-swank-server 4005 :spawn #'swank::simple-announce-function t)
+(swank::create-swank-server 4008 :spawn #'swank::simple-announce-function t)
(mp::startup-idle-and-top-level-loops)
Modified: branches/xml-class-rework/projects/eboy/src/navi.lisp
===================================================================
--- branches/xml-class-rework/projects/eboy/src/navi.lisp 2006-02-17 21:05:51 UTC (rev 1840)
+++ branches/xml-class-rework/projects/eboy/src/navi.lisp 2006-02-17 21:12:10 UTC (rev 1841)
@@ -41,7 +41,7 @@
(define-bknr-tag secondlevelmenu ()
"Erzeugt das Second-Level-Menü"
(destructuring-bind
- (empty first-level &optional second-level &rest rest)
+ (empty first-level &rest rest)
(split "/" (uri-path (request-uri *req*)))
(declare (ignore empty rest))
(dolist (choice (website-menu *current-website*))
Modified: branches/xml-class-rework/projects/eboy/src/packages.lisp
===================================================================
--- branches/xml-class-rework/projects/eboy/src/packages.lisp 2006-02-17 21:05:51 UTC (rev 1840)
+++ branches/xml-class-rework/projects/eboy/src/packages.lisp 2006-02-17 21:12:10 UTC (rev 1841)
@@ -17,7 +17,13 @@
:bknr.images
:bknr.user
:puri)
- (:shadowing-import-from :cl-interpol quote-meta-chars))
+ (:shadowing-import-from :cl-interpol quote-meta-chars)
+ (:export #:find-item
+ #:item-images
+ #:item-poster-image
+ #:all-items
+ #:item-image-keywords
+ #:item-keywords))
(defpackage :eboy.tests
(:use :cl :eboy :unit-test))
@@ -33,7 +39,11 @@
:bknr.web
:bknr.datastore
:bknr.utils
- :bknr.rss)
+ :bknr.rss
+ :bknr.images
+ :bknr.mail
+ :bknr.sysparams
+ :bknr.text)
(:shadowing-import-from :cl-interpol quote-meta-chars)
(:export
;; tags
Modified: branches/xml-class-rework/projects/lisp-ecoop/website/templates/contact.xml
===================================================================
--- branches/xml-class-rework/projects/lisp-ecoop/website/templates/contact.xml 2006-02-17 21:05:51 UTC (rev 1840)
+++ branches/xml-class-rework/projects/lisp-ecoop/website/templates/contact.xml 2006-02-17 21:12:10 UTC (rev 1841)
@@ -4,6 +4,6 @@
<h1>Contact</h1>
<p>Workshop related: <a href="mailto:pc at p-cos.net">Pascal Costanza</a></p>
- <p>Website related: <a href="mailto:hans at bknr.net">Hans Hüber</a></p>
+ <p>Website related: <a href="mailto:hans at bknr.net">Hans Hübner</a></p>
</page>
Modified: branches/xml-class-rework/projects/lisp-ecoop/website/templates/edit-profile.xml
===================================================================
--- branches/xml-class-rework/projects/lisp-ecoop/website/templates/edit-profile.xml 2006-02-17 21:05:51 UTC (rev 1840)
+++ branches/xml-class-rework/projects/lisp-ecoop/website/templates/edit-profile.xml 2006-02-17 21:12:10 UTC (rev 1841)
@@ -6,7 +6,7 @@
title="Edit Profile"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:bknr="http://bknr.net"
- xmlns:lisp-ecoop06="http://lisp-ecoop06.bknr.net"
+ xmlns:lisp-ecoop="http://lisp-ecoop06.bknr.net"
>
<h1>Participant Profile Editor</h1>
Modified: branches/xml-class-rework/projects/lisp-ecoop/website/templates/edit-submission.xml
===================================================================
--- branches/xml-class-rework/projects/lisp-ecoop/website/templates/edit-submission.xml 2006-02-17 21:05:51 UTC (rev 1840)
+++ branches/xml-class-rework/projects/lisp-ecoop/website/templates/edit-submission.xml 2006-02-17 21:12:10 UTC (rev 1841)
@@ -6,7 +6,7 @@
title="Edit Submission"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:bknr="http://bknr.net"
- xmlns:lisp-ecoop06="http://lisp-ecoop06.bknr.net"
+ xmlns:lisp-ecoop="http://lisp-ecoop06.bknr.net"
>
<h1>Submission Editor</h1>
Modified: branches/xml-class-rework/projects/lisp-ecoop/website/templates/home.xml
===================================================================
--- branches/xml-class-rework/projects/lisp-ecoop/website/templates/home.xml 2006-02-17 21:05:51 UTC (rev 1840)
+++ branches/xml-class-rework/projects/lisp-ecoop/website/templates/home.xml 2006-02-17 21:12:10 UTC (rev 1841)
@@ -16,16 +16,21 @@
<h1>Information for Attendees</h1>
-<p>Registration of workshop participants has to be done in three <b>mandatory</b> steps:</p>
-<ol>
-<li><b>Contact the organizers of the workshop</b> (in order to ensure that the participant limit has not been exceeded).</li>
-<li>Advance registration to the workshop is handled through the primary
-contact person of the workshop, Pascal Costanza (<a
+<p>Registration of workshop participants has to be done in three
+<b>mandatory</b> steps:</p>
+
+<ol> <li><b>Contact the organizers of the workshop</b> (in order to
+ensure that the participant limit has not been exceeded).</li>
+<li>Advance registration to the workshop is handled through the
+primary contact person of the workshop, Pascal Costanza (<a
href="mailto:pc at p-cos.net">pc at p-cos.net</a>). Please contact him by
regular email with your submission or input to the workshop in order
to receive your login to the workshop website. Include your preferred
login name for the workshop website with your application.</li>
-<li>Register on the <a href="http://2006.ecoop.rg">ECOOP 2006 web site</a> either as a <i>worskhop-only attendee</i> or as a <i>regular attendee</i>. The latter includes access to workshops and to the main conference.</li>
+<li>Register on the <a href="http://2006.ecoop.org">ECOOP 2006 web
+site</a> either as a
+<i>worskhop-only attendee</i> or as a <i>regular attendee</i>. The
+latter includes access to workshops and to the main conference.</li>
</ol>
<!--
Modified: branches/xml-class-rework/projects/lisp-ecoop/website/templates/lisp-ecoop.xsl
===================================================================
--- branches/xml-class-rework/projects/lisp-ecoop/website/templates/lisp-ecoop.xsl 2006-02-17 21:05:51 UTC (rev 1840)
+++ branches/xml-class-rework/projects/lisp-ecoop/website/templates/lisp-ecoop.xsl 2006-02-17 21:12:10 UTC (rev 1841)
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1" ?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
+ xmlns:lisp-ecoop="http://lisp-ecoop06.bknr.net">
<xsl:param name="mode">xml</xsl:param>
@@ -8,7 +9,7 @@
omit-xml-declaration="yes"
doctype-public="-//W3C//DTD HTML 4.0 Strict//EN" />
- <xsl:template match="/page">
+ <xsl:template match="/lisp-ecoop:page">
<html
xmlns="http://www.w3.org/1999/xhtml">
Modified: branches/xml-class-rework/projects/lisp-ecoop/website/templates/profile.xml
===================================================================
--- branches/xml-class-rework/projects/lisp-ecoop/website/templates/profile.xml 2006-02-17 21:05:51 UTC (rev 1840)
+++ branches/xml-class-rework/projects/lisp-ecoop/website/templates/profile.xml 2006-02-17 21:12:10 UTC (rev 1841)
@@ -6,7 +6,7 @@
title="Edit Profile"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:bknr="http://bknr.net"
- xmlns:lisp-ecoop06="http://lisp-ecoop06.bknr.net"
+ xmlns:lisp-ecoop="http://lisp-ecoop06.bknr.net"
>
<lisp-ecoop:profile>
Modified: branches/xml-class-rework/projects/lisp-ecoop/website/templates/submission.xml
===================================================================
--- branches/xml-class-rework/projects/lisp-ecoop/website/templates/submission.xml 2006-02-17 21:05:51 UTC (rev 1840)
+++ branches/xml-class-rework/projects/lisp-ecoop/website/templates/submission.xml 2006-02-17 21:12:10 UTC (rev 1841)
@@ -6,7 +6,7 @@
title="Edit Submission"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:bknr="http://bknr.net"
- xmlns:lisp-ecoop06="http://lisp-ecoop06.bknr.net"
+ xmlns:lisp-ecoop="http://lisp-ecoop06.bknr.net"
>
<lisp-ecoop:load-argument-object>
Modified: branches/xml-class-rework/projects/lisp-ecoop/website/templates/submissions.xml
===================================================================
--- branches/xml-class-rework/projects/lisp-ecoop/website/templates/submissions.xml 2006-02-17 21:05:51 UTC (rev 1840)
+++ branches/xml-class-rework/projects/lisp-ecoop/website/templates/submissions.xml 2006-02-17 21:12:10 UTC (rev 1841)
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?xml-stylesheet type="text/xsl" href="lisp-ecoop.xsl" ?>
-<page name="submissions">
+<lisp-ecoop:page name="submissions"
+ xmlns:lisp-ecoop="http://lisp-ecoop06.bknr.net">
<h1>Submissions</h1>
@@ -12,4 +13,4 @@
<h2>Breakout group proposals</h2>
<lisp-ecoop:submission-list type="breakout-group-proposal"/>
-</page>
+</lisp-ecoop:page>
Modified: branches/xml-class-rework/projects/lisp-ecoop/website/templates/toplevel.xml
===================================================================
--- branches/xml-class-rework/projects/lisp-ecoop/website/templates/toplevel.xml 2006-02-17 21:05:51 UTC (rev 1840)
+++ branches/xml-class-rework/projects/lisp-ecoop/website/templates/toplevel.xml 2006-02-17 21:12:10 UTC (rev 1841)
@@ -3,7 +3,7 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html
xmlns="http://www.w3.org/1999/xhtml"
- xmlns:lisp-ecoop06="http://lisp-ecoop06.bknr.net"
+ xmlns:lisp-ecoop="http://lisp-ecoop06.bknr.net"
xmlns:bknr="http://bknr.net"
xmlns:menu="http://bknr.net/menu"
>
Modified: branches/xml-class-rework/projects/lisp-ecoop/website/templates/user-error.xml
===================================================================
--- branches/xml-class-rework/projects/lisp-ecoop/website/templates/user-error.xml 2006-02-17 21:05:51 UTC (rev 1840)
+++ branches/xml-class-rework/projects/lisp-ecoop/website/templates/user-error.xml 2006-02-17 21:12:10 UTC (rev 1841)
@@ -4,7 +4,7 @@
<html
xmlns="http://www.w3.org/1999/xhtml"
xmlns:bknr="http://bknr.net"
- xmlns:lisp-ecoop06="http://lisp-ecoop06.bknr.net"
+ xmlns:lisp-ecoop="http://lisp-ecoop06.bknr.net"
xmlns:menu="http://bknr.net/menu"
>
Your request could not be processed because an error occured:
Modified: branches/xml-class-rework/projects/quickhoney/src/handlers.lisp
===================================================================
--- branches/xml-class-rework/projects/quickhoney/src/handlers.lisp 2006-02-17 21:05:51 UTC (rev 1840)
+++ branches/xml-class-rework/projects/quickhoney/src/handlers.lisp 2006-02-17 21:12:10 UTC (rev 1841)
@@ -44,7 +44,7 @@
(format nil " new parent.ServerImage(~S, ~D, ~S, ~D, ~D, ~S)"
(store-image-name image)
(store-object-id image)
- (image-content-type (blob-type image))
+ (image-content-type (blob-mime-type image))
(store-image-width image)
(store-image-height image)
(or (quickhoney-image-client image) "")))
Modified: branches/xml-class-rework/projects/raw-data/mcp/hameg-server.pl
===================================================================
--- branches/xml-class-rework/projects/raw-data/mcp/hameg-server.pl 2006-02-17 21:05:51 UTC (rev 1840)
+++ branches/xml-class-rework/projects/raw-data/mcp/hameg-server.pl 2006-02-17 21:12:10 UTC (rev 1841)
@@ -13,6 +13,8 @@
die "can't open hameg port $comPort: $!\n" unless ($hameg);
$hameg->autoflush(1);
+system("stty 38400 icanon cread cs8 -parenb < $comPort");
+
while (1) {
my $mcp = IO::Socket::INET->new($mcpAddress);
Modified: branches/xml-class-rework/tools/make-core.lisp
===================================================================
--- branches/xml-class-rework/tools/make-core.lisp 2006-02-17 21:05:51 UTC (rev 1840)
+++ branches/xml-class-rework/tools/make-core.lisp 2006-02-17 21:12:10 UTC (rev 1841)
@@ -6,6 +6,7 @@
(defparameter *src-directory* (make-pathname :directory (pathname-directory *load-truename*)))
(defparameter *bknr-directory* (merge-pathnames #p"bknr-svn/" (user-homedir-pathname)))
+(defparameter *central-repository* (merge-pathnames #p"central-repository/" (user-homedir-pathname)))
#+cmu #-cmu19b
(load (merge-pathnames "bknr/patches/patch-around-mop-cmucl19a.lisp" *bknr-directory*))
More information about the Bknr-cvs
mailing list