Changeset 3716

Timestamp:

08/01/08 08:57:30 (4 months ago)

Author:

hans

Message:

more news work.
make owned-object have only one instead of multiple owners.

Files:

• trunk/bknr/modules/album/album.lisp (modified) (1 diff)
• trunk/bknr/web/src/images/image.lisp (modified) (1 diff)
• trunk/bknr/web/src/packages.lisp (modified) (1 diff)
• trunk/bknr/web/src/rss/rss.lisp (modified) (1 diff)
• trunk/bknr/web/src/sysclasses/user.lisp (modified) (1 diff)
• trunk/projects/quickhoney/src/handlers.lisp (modified) (2 diffs)
• trunk/projects/quickhoney/src/quickhoney.asd (modified) (1 diff)
• trunk/projects/quickhoney/website/static/javascript.js (modified) (2 diffs)

trunk/bknr/modules/album/album.lisp

@@ -7 +7 @@
-         (images (when user
-                   (remove-if-not #'(lambda (image)
-member user (owned-object-owners
+eq user (owned-object-owner
-                                  (get-keyword-store-images
-                                   (make-keyword-from-string album))))))

trunk/bknr/web/src/images/image.lisp

@@ -124 +124 @@
-        (let ((store-image (apply #'make-object 
-                                  class-name
-s (list user)
+ user
-                                  :timestamp (get-universal-time)
-                                  :name name

trunk/bknr/web/src/packages.lisp

@@ -137 +137 @@
-
-           #:owned-object
-s
+
-           #:store-objects-owned-by
-           #:store-object-owners

trunk/bknr/web/src/rss/rss.lisp

@@ -180 +180 @@
-transaction context.")
-  (:method ((channel rss-channel) item)
-setf (slot-value channel 'items) (cons item (rss-channel-items channel)
+push item (slot-value channel 'items
-  (:method ((channel string) item)
-    (aif (find-rss-channel channel)

trunk/bknr/web/src/sysclasses/user.lisp

@@ -191 +191 @@
-
-(define-persistent-class owned-object (store-object)
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-(defgeneric user-owns-object-p (user object))
-
-object
+(object t)
-  nil)
-
-(defmethod user-owns-object-p ((user user) (object owned-object))
-member user (owned-object-owners
+eq user (owned-object-owner
-
-(define-persistent-class message-event (event)

trunk/projects/quickhoney/src/handlers.lisp

@@ -137 +137 @@
-                                  "webserver@quickhoney.com"
-                                  (remove-duplicates (mapcar #'user-email
-s
+
-                                                                 (list (find-user "n") (find-user "p"))))))
-      (cl-mime:print-mime
@@ -439 +439 @@
-    ; do nothing
-    )
+  (:method :before ((image quickhoney-image))
+    (when (owned-object-owner image)
+      (encode-object-element "owner" (user-login (owned-object-owner image))))
+    (encode-object-element "date" (format-date-time (blob-timestamp image) :vms-style t :show-time nil))
+    (encode-object-element "name" (store-image-name image)))
-  (:method ((image quickhoney-image))
-    (let ((vectorp (member :vector (store-image-keywords image))))
-      (encode-object-element "uploader" (if vectorp "Peter" "Nana"))
-      (encode-object-element "category" (if vectorp "vector" "pixel"))
-
-
-
+
+
+
+
-
-(defmethod handle-object ((handler json-news-handler) (channel rss-channel))

trunk/projects/quickhoney/src/quickhoney.asd

@@ -34 +34 @@
-               (:file "imageproc" :depends-on ("config"))
-               (:file "json" :depends-on ("packages"))
-
+ "news"
-               (:file "tags" :depends-on ("image"))
-               (:file "webserver" :depends-on ("handlers"))

trunk/projects/quickhoney/website/static/javascript.js

@@ -247 +247 @@
-                                         DIV(null,
-                                             H1(null, item.name),
-upload
+own
-                                             A({ href: '/index#' + item.category + '/' + item.subcategory + '/' + item.image_name }, 'permalink'),
-                                             BR(),
@@ -462 +462 @@
-                   footer_hide();
-                   loadJSONDoc('/json-news-archive/quickhoney').addCallbacks(load_news_archive, alert);
-//                   load_news(
+loadJSONDoc('/json-news/quickhoney').addCallbacks(load_news, alert
-               });
-