Fixed conflicts introduced in last merge from Vladimir

For some reason i can't seem to apply Vladimir's darcs patches (bad patch bundle).

I will sort this out eventually.

darcs-hash:20050629222132-5417e-1c3a6ec82da95571dc19e5d4b757620ef793edfb.gz

diff --git a/src/mewa/slot-presentations.lisp b/src/mewa/slot-presentations.lisp
index e0ddb79..09d1488 100644 (file)
--- a/src/mewa/slot-presentations.lisp
+++ b/src/mewa/slot-presentations.lisp
@@ -145,8 +145,9 @@
 
 
 (defaction add-to-has-many ((slot has-many-slot-presentation) instance)
-  (destructuring-bind (class home foreign) 
-      (multiple-value-funcall #'meta-model:explode-has-many instance (slot-name slot))
+  (mewa:ensure-instance-sync (parent slot))
+  (multiple-value-bindf (class home foreign) 
+      (meta-model:explode-has-many instance (slot-name slot))
     (let ((new (make-instance class)))
       (setf (slot-value new foreign) (slot-value instance home))
       (meta-model:sync-instance new :fill-gaps-only t)
@@ -230,4 +231,4 @@
          (progn
            (setf (instance (presentation slot)) (presentation-slot-value slot instance))
            (present (presentation slot)))
-         (<:as-html "--"))))
\ No newline at end of file
+         (<:as-html "--"))))

diff --git a/src/packages.lisp b/src/packages.lisp
index afa92f2..0fd0c87 100644 (file)
--- a/src/packages.lisp
+++ b/src/packages.lisp
@@ -65,8 +65,10 @@
    :edit-instance
    :save-instance
    :cancel-save-instance
-   :global-properties))
-
+   :ensure-instance-sync
+   :global-properties
+   :search-expr
+   :search-query))
 
 (defpackage :lisp-on-lines
-  (:use :mewa :meta-model :common-lisp :it.bese.ucw))
\ No newline at end of file
+  (:use :mewa :meta-model :common-lisp :it.bese.ucw))