# HG changeset patch
# User Marcus Pearce <m.pearce@gold.ac.uk>
# Date 1182348951 -3600
# Node ID 894fb5156603abe9e29bfeeccfa05cf0d0243d73
# Parent  49aae39b96dcc06fe24298d86baa24c39924547f
Prefix database table names with 'mtp-'

darcs-hash:20070620141551-c0ce4-23eb826c6323d1fdac3a8cc9b2b9406c2c39e1e9.gz

diff -r 49aae39b96dc -r 894fb5156603 implementations/mtp/methods.lisp
--- a/implementations/mtp/methods.lisp	Wed Jun 20 12:04:03 2007 +0100
+++ b/implementations/mtp/methods.lisp	Wed Jun 20 15:15:51 2007 +0100
@@ -10,12 +10,12 @@
          (where-clause [and [= [dataset-id] dataset-id]
                             [= [composition-id] composition-id]])
          (description 
-          (car (clsql:select [description] :from [composition] 
+          (car (clsql:select [description] :from [mtp-composition] 
                              :where where-clause :flatp t :field-names nil)))
          (event-count 
           (1+ 
            (car 
-            (clsql:select [max [event-id]] :from [event] 
+            (clsql:select [max [event-id]] :from [mtp-event] 
                           :where where-clause :flatp t :field-names nil))))
          (events nil))
     (dotimes (event-id event-count) 
@@ -53,7 +53,7 @@
                           :event-id event-id)))
     (dolist (a attributes mtp-event)
       (let ((value 
-             (clsql:select (cadr a) :from [event]
+             (clsql:select (cadr a) :from [mtp-event]
                            :where [and [= [dataset-id] dataset-id]
                                        [= [composition-id] composition-id]
                                        [= [event-id] event-id]]
@@ -86,7 +86,7 @@
 
 #.(clsql:locally-enable-sql-reader-syntax)
 (defun timebase-for-event (event)
-  (car (clsql:select [timebase] :from [dataset]
+  (car (clsql:select [timebase] :from [mtp-dataset]
                      :where [= [dataset-id] 
                                (dataset-id event)]
                      :flatp t