[Misc site-control cleanups clinton@unknownlamer.org**20090521221023 Ignore-this: 3be79d1f6a99da18217ab08ba915e91d ] { hunk ./src/site-control.lisp 3 -;; Copyright (C) 2008 Clinton Ebadi +;; Copyright (C) 2008,2009 Clinton Ebadi hunk ./src/site-control.lisp 37 -(defvar *control-dev-mode* t +(defvar *control-log-level* nil hunk ./src/site-control.lisp 40 +(defvar *control-dev-mode* nil) + hunk ./src/site-control.lisp 53 -(defclass ucw-site () - ((applications :accessor applications :initarg :applications) - (data-root :accessor data-root :initarg :data-root))) +(defclass basic-ucw-site () + ((applications :accessor applications :initarg :applications))) + +(defclass ucw-site-data-root-mixin () + ((data-root :accessor data-root :initarg :data-root))) + +(defclass ucw-site (ucw-site-data-root-mixin basic-ucw-site) + ()) hunk ./src/site-control.lisp 96 -(defmethod data-root-path ((site ucw-site) path) - (format nil "~A~A" (data-root site) path)) +(defmethod data-root-path ((site ucw-site-data-root-mixin) + path) + (merge-pathnames path (data-root site))) hunk ./src/site-control.lisp 148 - :log-level (if *control-dev-mode* ucw-core::+debug+ ucw-core::+warn+) + :log-level (or *control-log-level* ucw.system:*ucw-log-level*) }