From a3eea09cc900e68909019fa3724ec2467167e9d0 Mon Sep 17 00:00:00 2001
From: moodler <moodler>
Date: Mon, 23 Dec 2002 11:47:17 +0000
Subject: [PATCH] More fixes for postgreSQL etc

---
 lib/db/mysql.php                |   6 ++
 lib/db/mysql.sql                |   1 +
 lib/db/postgres7.sql            |  27 +++---
 mod/assignment/db/postgres7.sql |  14 +--
 mod/choice/db/postgres7.sql     |  12 +--
 mod/forum/db/postgres7.sql      |  30 +++---
 mod/journal/db/postgres7.sql    |  12 +--
 mod/quiz/db/postgres7.sql       |  36 +++----
 mod/resource/db/postgres7.sql   |   4 +-
 mod/survey/db/postgres7.sql     | 160 ++++++++++++++++----------------
 version.php                     |   2 +-
 11 files changed, 157 insertions(+), 147 deletions(-)

diff --git a/lib/db/mysql.php b/lib/db/mysql.php
index da38bbf414..aa892ab8a6 100644
--- a/lib/db/mysql.php
+++ b/lib/db/mysql.php
@@ -225,6 +225,12 @@ function main_upgrade($oldversion=0) {
         execute_sql("ALTER TABLE `user_students` CHANGE `end` `timeend` INT(10) UNSIGNED DEFAULT '0' NOT NULL ");
     }
 
+    if ($oldversion < 2002122301) {
+        if (! record_exists_select("log_display", "", "user", "", "view")) {
+            execute_sql("INSERT INTO {$CFG->prefix}log_display VALUES ('user', 'view', 'user', 'CONCAT(firstname,' ',lastname)') ");
+        }
+    }
+
 
     return true;
 }
diff --git a/lib/db/mysql.sql b/lib/db/mysql.sql
index 77cca11f5d..c173f7d985 100644
--- a/lib/db/mysql.sql
+++ b/lib/db/mysql.sql
@@ -227,3 +227,4 @@ CREATE TABLE `prefix_user_teachers` (
   UNIQUE KEY `id` (`id`)
 ) TYPE=MyISAM COMMENT='One record per teacher per course';
 
+INSERT INTO prefix_log_display VALUES ('user', 'view', 'user', 'CONCAT(firstname,' ',lastname)');
diff --git a/lib/db/postgres7.sql b/lib/db/postgres7.sql
index 39eb39fde0..250781293e 100644
--- a/lib/db/postgres7.sql
+++ b/lib/db/postgres7.sql
@@ -1,11 +1,11 @@
-CREATE TABLE config (
+CREATE TABLE prefix_config (
    id SERIAL PRIMARY KEY,
    name varchar(255) NOT NULL default '',
    value varchar(255) NOT NULL default '',
    CONSTRAINT config_name_uk UNIQUE (name)
 );
 
-CREATE TABLE course (
+CREATE TABLE prefix_course (
    id SERIAL PRIMARY KEY,
    category integer NOT NULL default '0',
    password varchar(50) NOT NULL default '',
@@ -27,12 +27,12 @@ CREATE TABLE course (
    timemodified integer NOT NULL default '0'
 );
 
-CREATE TABLE course_categories (
+CREATE TABLE prefix_course_categories (
    id SERIAL PRIMARY KEY,
    name varchar(255) NOT NULL default ''
 );
 
-CREATE TABLE course_modules (
+CREATE TABLE prefix_course_modules (
    id SERIAL PRIMARY KEY,
    course integer NOT NULL default '0',
    module integer NOT NULL default '0',
@@ -43,7 +43,7 @@ CREATE TABLE course_modules (
    score integer NOT NULL default '0'
 );
 
-CREATE TABLE course_sections (
+CREATE TABLE prefix_course_sections (
    id SERIAL PRIMARY KEY,
    course integer NOT NULL default '0',
    section integer NOT NULL default '0',
@@ -51,7 +51,7 @@ CREATE TABLE course_sections (
    sequence varchar(255) NOT NULL default ''
 );
 
-CREATE TABLE log (
+CREATE TABLE prefix_log (
    id SERIAL PRIMARY KEY,
    time integer NOT NULL default '0',
    userid integer NOT NULL default '0',
@@ -63,14 +63,14 @@ CREATE TABLE log (
    info varchar(255) NOT NULL default ''
 );
 
-CREATE TABLE log_display (
+CREATE TABLE prefix_log_display (
    module varchar(20) NOT NULL default '',
    action varchar(20) NOT NULL default '',
    mtable varchar(20) NOT NULL default '',
    field varchar(40) NOT NULL default ''
 );
 
-CREATE TABLE modules (
+CREATE TABLE prefix_modules (
    id SERIAL PRIMARY KEY,
    name varchar(20) NOT NULL default '',
    version integer NOT NULL default '0',
@@ -79,7 +79,7 @@ CREATE TABLE modules (
    search varchar(255) NOT NULL default ''
 );
 
-CREATE TABLE "user" (
+CREATE TABLE prefix_user (
    id SERIAL PRIMARY KEY,
    confirmed integer NOT NULL default '0',
    deleted integer NOT NULL default '0',
@@ -113,12 +113,12 @@ CREATE TABLE "user" (
    CONSTRAINT user_username_uk UNIQUE (username)
 );
 
-CREATE TABLE user_admins (
+CREATE TABLE prefix_user_admins (
    id SERIAL PRIMARY KEY,
    userid integer NOT NULL default '0'
 );
 
-CREATE TABLE user_students (
+CREATE TABLE prefix_user_students (
    id SERIAL PRIMARY KEY,
    userid integer NOT NULL default '0',
    course integer NOT NULL default '0',
@@ -127,10 +127,13 @@ CREATE TABLE user_students (
    time integer NOT NULL default '0'
 );
 
-CREATE TABLE user_teachers (
+CREATE TABLE prefix_user_teachers (
    id SERIAL PRIMARY KEY,
    userid integer NOT NULL default '0',
    course integer NOT NULL default '0',
    authority integer NOT NULL default '3',
    role varchar(40) NOT NULL default ''
 );
+
+
+INSERT INTO prefix_log_display VALUES ('user', 'view', 'user', 'CONCAT(firstname," ",lastname)');
diff --git a/mod/assignment/db/postgres7.sql b/mod/assignment/db/postgres7.sql
index 1348a7fe7d..d163052c3d 100644
--- a/mod/assignment/db/postgres7.sql
+++ b/mod/assignment/db/postgres7.sql
@@ -2,7 +2,7 @@
 # Table structure for table assignment
 #
 
-CREATE TABLE assignment (
+CREATE TABLE prefix_assignment (
   id SERIAL PRIMARY KEY,
   course integer NOT NULL default '0',
   name varchar(255) NOT NULL default '',
@@ -20,7 +20,7 @@ CREATE TABLE assignment (
 # Table structure for table assignment_submissions
 #
 
-CREATE TABLE assignment_submissions (
+CREATE TABLE prefix_assignment_submissions (
   id SERIAL PRIMARY KEY,
   assignment integer NOT NULL default '0',
   userid integer NOT NULL default '0',
@@ -36,9 +36,9 @@ CREATE TABLE assignment_submissions (
 # --------------------------------------------------------
 
 
-INSERT INTO log_display VALUES ('assignment', 'view', 'assignment', 'name');
-INSERT INTO log_display VALUES ('assignment', 'add', 'assignment', 'name');
-INSERT INTO log_display VALUES ('assignment', 'update', 'assignment', 'name');
-INSERT INTO log_display VALUES ('assignment', 'view submissions', 'assignment', 'name');
-INSERT INTO log_display VALUES ('assignment', 'upload', 'assignment', 'name');
+INSERT INTO prefix_log_display VALUES ('assignment', 'view', 'assignment', 'name');
+INSERT INTO prefix_log_display VALUES ('assignment', 'add', 'assignment', 'name');
+INSERT INTO prefix_log_display VALUES ('assignment', 'update', 'assignment', 'name');
+INSERT INTO prefix_log_display VALUES ('assignment', 'view submissions', 'assignment', 'name');
+INSERT INTO prefix_log_display VALUES ('assignment', 'upload', 'assignment', 'name');
 
diff --git a/mod/choice/db/postgres7.sql b/mod/choice/db/postgres7.sql
index e1dbe97ea1..b2c8476da7 100755
--- a/mod/choice/db/postgres7.sql
+++ b/mod/choice/db/postgres7.sql
@@ -14,7 +14,7 @@
 # Table structure for table `choice`
 #
 
-CREATE TABLE choice (
+CREATE TABLE prefix_choice (
   id SERIAL PRIMARY KEY,
   course integer NOT NULL default '0',
   name varchar(255) NOT NULL default '',
@@ -35,7 +35,7 @@ CREATE TABLE choice (
 # Table structure for table `choice_answers`
 #
 
-CREATE TABLE choice_answers (
+CREATE TABLE prefix_choice_answers (
   id SERIAL PRIMARY KEY,
   choice integer NOT NULL default '0',
   userid integer NOT NULL default '0',
@@ -47,10 +47,10 @@ CREATE TABLE choice_answers (
 # Dumping data for table `log_display`
 #
 
-INSERT INTO log_display VALUES ('choice', 'view', 'choice', 'name');
-INSERT INTO log_display VALUES ('choice', 'update', 'choice', 'name');
-INSERT INTO log_display VALUES ('choice', 'add', 'choice', 'name');
-INSERT INTO log_display VALUES ('choice', 'report', 'choice', 'name');
+INSERT INTO prefix_log_display VALUES ('choice', 'view', 'choice', 'name');
+INSERT INTO prefix_log_display VALUES ('choice', 'update', 'choice', 'name');
+INSERT INTO prefix_log_display VALUES ('choice', 'add', 'choice', 'name');
+INSERT INTO prefix_log_display VALUES ('choice', 'report', 'choice', 'name');
 
     
 
diff --git a/mod/forum/db/postgres7.sql b/mod/forum/db/postgres7.sql
index 44031854cb..e19bb371b4 100644
--- a/mod/forum/db/postgres7.sql
+++ b/mod/forum/db/postgres7.sql
@@ -2,7 +2,7 @@
 # Table structure for table `forum`
 #
 
-CREATE TABLE forum (
+CREATE TABLE prefix_forum (
   id SERIAL PRIMARY KEY,
   course integer NOT NULL default '0',
   type varchar(10) CHECK (type IN ('single','news','general','social','eachuser','teacher')) NOT NULL default 'general',
@@ -19,7 +19,7 @@ CREATE TABLE forum (
 # Table structure for table `forum_discussions`
 #
 
-CREATE TABLE forum_discussions (
+CREATE TABLE prefix_forum_discussions (
   id SERIAL PRIMARY KEY,
   course integer NOT NULL default '0',
   forum integer NOT NULL default '0',
@@ -34,7 +34,7 @@ CREATE TABLE forum_discussions (
 # Table structure for table `forum_posts`
 #
 
-CREATE TABLE forum_posts (
+CREATE TABLE prefix_forum_posts (
   id SERIAL PRIMARY KEY,
   discussion integer NOT NULL default '0',
   parent integer NOT NULL default '0',
@@ -54,7 +54,7 @@ CREATE TABLE forum_posts (
 # Table structure for table `forum_ratings`
 #
 
-CREATE TABLE forum_ratings (
+CREATE TABLE prefix_forum_ratings (
   id SERIAL PRIMARY KEY,
   userid integer NOT NULL default '0',
   post integer NOT NULL default '0',
@@ -67,7 +67,7 @@ CREATE TABLE forum_ratings (
 # Table structure for table `forum_subscriptions`
 #
 
-CREATE TABLE forum_subscriptions (
+CREATE TABLE prefix_forum_subscriptions (
   id SERIAL PRIMARY KEY,
   userid integer NOT NULL default '0',
   forum integer NOT NULL default '0'
@@ -78,14 +78,14 @@ CREATE TABLE forum_subscriptions (
 # Dumping data for table `log_display`
 #
 
-INSERT INTO log_display VALUES ('forum', 'add', 'forum', 'name');
-INSERT INTO log_display VALUES ('forum', 'update', 'forum', 'name');
-INSERT INTO log_display VALUES ('forum', 'add discussion', 'forum_discussions', 'name');
-INSERT INTO log_display VALUES ('forum', 'add post', 'forum_posts', 'subject');
-INSERT INTO log_display VALUES ('forum', 'update post', 'forum_posts', 'subject');
-INSERT INTO log_display VALUES ('forum', 'view subscribers', 'forum', 'name');
-INSERT INTO log_display VALUES ('forum', 'view discussion', 'forum_discussions', 'name');
-INSERT INTO log_display VALUES ('forum', 'view forum', 'forum', 'name');
-INSERT INTO log_display VALUES ('forum', 'subscribe', 'forum', 'name');
-INSERT INTO log_display VALUES ('forum', 'unsubscribe', 'forum', 'name');
+INSERT INTO prefix_log_display VALUES ('forum', 'add', 'forum', 'name');
+INSERT INTO prefix_log_display VALUES ('forum', 'update', 'forum', 'name');
+INSERT INTO prefix_log_display VALUES ('forum', 'add discussion', 'forum_discussions', 'name');
+INSERT INTO prefix_log_display VALUES ('forum', 'add post', 'forum_posts', 'subject');
+INSERT INTO prefix_log_display VALUES ('forum', 'update post', 'forum_posts', 'subject');
+INSERT INTO prefix_log_display VALUES ('forum', 'view subscribers', 'forum', 'name');
+INSERT INTO prefix_log_display VALUES ('forum', 'view discussion', 'forum_discussions', 'name');
+INSERT INTO prefix_log_display VALUES ('forum', 'view forum', 'forum', 'name');
+INSERT INTO prefix_log_display VALUES ('forum', 'subscribe', 'forum', 'name');
+INSERT INTO prefix_log_display VALUES ('forum', 'unsubscribe', 'forum', 'name');
 
diff --git a/mod/journal/db/postgres7.sql b/mod/journal/db/postgres7.sql
index 71f301a03b..ee974fa955 100755
--- a/mod/journal/db/postgres7.sql
+++ b/mod/journal/db/postgres7.sql
@@ -14,7 +14,7 @@
 # Table structure for table `journal`
 #
 
-CREATE TABLE journal (
+CREATE TABLE prefix_journal (
   id SERIAL PRIMARY KEY,
   course integer NOT NULL default '0',
   name varchar(255) default NULL,
@@ -29,7 +29,7 @@ CREATE TABLE journal (
 # Table structure for table `journal_entries`
 #
 
-CREATE TABLE journal_entries (
+CREATE TABLE prefix_journal_entries (
   id SERIAL PRIMARY KEY,
   journal integer NOT NULL default '0',
   userid integer NOT NULL default '0',
@@ -47,7 +47,7 @@ CREATE TABLE journal_entries (
 # Dumping data for table `log_display`
 #
 
-INSERT INTO log_display VALUES ('journal', 'view', 'journal', 'name');
-INSERT INTO log_display VALUES ('journal', 'add entry', 'journal', 'name');
-INSERT INTO log_display VALUES ('journal', 'update entry', 'journal', 'name');
-INSERT INTO log_display VALUES ('journal', 'view responses', 'journal', 'name');
+INSERT INTO prefix_log_display VALUES ('journal', 'view', 'journal', 'name');
+INSERT INTO prefix_log_display VALUES ('journal', 'add entry', 'journal', 'name');
+INSERT INTO prefix_log_display VALUES ('journal', 'update entry', 'journal', 'name');
+INSERT INTO prefix_log_display VALUES ('journal', 'view responses', 'journal', 'name');
diff --git a/mod/quiz/db/postgres7.sql b/mod/quiz/db/postgres7.sql
index e93189a68e..11f689e268 100644
--- a/mod/quiz/db/postgres7.sql
+++ b/mod/quiz/db/postgres7.sql
@@ -13,7 +13,7 @@
 # Table structure for table quiz
 #
 
-CREATE TABLE quiz (
+CREATE TABLE prefix_quiz (
   id SERIAL PRIMARY KEY,
   course integer NOT NULL default '0',
   name varchar(255) NOT NULL default '',
@@ -36,7 +36,7 @@ CREATE TABLE quiz (
 # Table structure for table quiz_answers
 #
 
-CREATE TABLE quiz_answers (
+CREATE TABLE prefix_quiz_answers (
   id SERIAL PRIMARY KEY,
   question integer NOT NULL default '0',
   answer varchar(255) NOT NULL default '',
@@ -49,7 +49,7 @@ CREATE TABLE quiz_answers (
 # Table structure for table quiz_attempts
 #
 
-CREATE TABLE quiz_attempts (
+CREATE TABLE prefix_quiz_attempts (
   id SERIAL PRIMARY KEY,
   quiz integer NOT NULL default '0',
   userid integer NOT NULL default '0',
@@ -65,7 +65,7 @@ CREATE TABLE quiz_attempts (
 # Table structure for table quiz_categories
 #
 
-CREATE TABLE quiz_categories (
+CREATE TABLE prefix_quiz_categories (
   id SERIAL PRIMARY KEY,
   course integer NOT NULL default '0',
   name varchar(255) NOT NULL default '',
@@ -78,7 +78,7 @@ CREATE TABLE quiz_categories (
 # Table structure for table quiz_grades
 #
 
-CREATE TABLE quiz_grades (
+CREATE TABLE prefix_quiz_grades (
   id SERIAL PRIMARY KEY,
   quiz integer NOT NULL default '0',
   userid integer NOT NULL default '0',
@@ -91,7 +91,7 @@ CREATE TABLE quiz_grades (
 # Table structure for table quiz_multichoice
 #
 
-CREATE TABLE quiz_multichoice (
+CREATE TABLE prefix_quiz_multichoice (
   id SERIAL PRIMARY KEY,
   question integer NOT NULL default '0',
   layout integer NOT NULL default '0',
@@ -99,13 +99,13 @@ CREATE TABLE quiz_multichoice (
   single integer NOT NULL default '0'
 );
 # --------------------------------------------------------
-CREATE INDEX question_quiz_multichoice_idx ON quiz_multichoice (question);
+CREATE INDEX question_quiz_multichoice_idx ON prefix_quiz_multichoice (question);
 
 #
 # Table structure for table quiz_question_grades
 #
 
-CREATE TABLE quiz_question_grades (
+CREATE TABLE prefix_quiz_question_grades (
   id SERIAL PRIMARY KEY,
   quiz integer NOT NULL default '0',
   question integer NOT NULL default '0',
@@ -117,7 +117,7 @@ CREATE TABLE quiz_question_grades (
 # Table structure for table quiz_questions
 #
 
-CREATE TABLE quiz_questions (
+CREATE TABLE prefix_quiz_questions (
   id SERIAL PRIMARY KEY,
   category integer NOT NULL default '0',
   name varchar(255) NOT NULL default '',
@@ -131,7 +131,7 @@ CREATE TABLE quiz_questions (
 # Table structure for table quiz_responses
 #
 
-CREATE TABLE quiz_responses (
+CREATE TABLE prefix_quiz_responses (
   id SERIAL PRIMARY KEY,
   attempt integer NOT NULL default '0',
   question integer NOT NULL default '0',
@@ -144,30 +144,30 @@ CREATE TABLE quiz_responses (
 # Table structure for table quiz_shortanswer
 #
 
-CREATE TABLE quiz_shortanswer (
+CREATE TABLE prefix_quiz_shortanswer (
   id SERIAL PRIMARY KEY,
   question integer NOT NULL default '0',
   answers varchar(255) NOT NULL default '',
   usecase integer NOT NULL default '0'
 );
 # --------------------------------------------------------
-CREATE INDEX question_quiz_shortanswer_idx ON quiz_shortanswer (question);
+CREATE INDEX prefix_question_quiz_shortanswer_idx ON quiz_shortanswer (question);
 
 #
 # Table structure for table quiz_truefalse
 #
 
-CREATE TABLE quiz_truefalse (
+CREATE TABLE prefix_quiz_truefalse (
   id SERIAL PRIMARY KEY,
   question integer NOT NULL default '0',
   "true" integer NOT NULL default '0',
   "false" integer NOT NULL default '0'
 );
-CREATE INDEX question_quiz_truefalse_idx ON quiz_truefalse (question);
+CREATE INDEX prefix_question_quiz_truefalse_idx ON quiz_truefalse (question);
 
 
-INSERT INTO log_display VALUES ('quiz', 'view', 'quiz', 'name');
-INSERT INTO log_display VALUES ('quiz', 'report', 'quiz', 'name');
-INSERT INTO log_display VALUES ('quiz', 'attempt', 'quiz', 'name');
-INSERT INTO log_display VALUES ('quiz', 'submit', 'quiz', 'name');
+INSERT INTO prefix_log_display VALUES ('quiz', 'view', 'quiz', 'name');
+INSERT INTO prefix_log_display VALUES ('quiz', 'report', 'quiz', 'name');
+INSERT INTO prefix_log_display VALUES ('quiz', 'attempt', 'quiz', 'name');
+INSERT INTO prefix_log_display VALUES ('quiz', 'submit', 'quiz', 'name');
 
diff --git a/mod/resource/db/postgres7.sql b/mod/resource/db/postgres7.sql
index c0e8fd33ed..3ce60d5026 100644
--- a/mod/resource/db/postgres7.sql
+++ b/mod/resource/db/postgres7.sql
@@ -14,7 +14,7 @@
 # Table structure for table `resource`
 #
 
-CREATE TABLE resource (
+CREATE TABLE prefix_resource (
   id SERIAL PRIMARY KEY,
   course integer NOT NULL default '0',
   name varchar(255) NOT NULL default '',
@@ -30,4 +30,4 @@ CREATE TABLE resource (
 # Dumping data for table `log_display`
 #
 
-INSERT INTO log_display VALUES ('resource', 'view', 'resource', 'name');
+INSERT INTO prefix_log_display VALUES ('resource', 'view', 'resource', 'name');
diff --git a/mod/survey/db/postgres7.sql b/mod/survey/db/postgres7.sql
index 16c46336f2..d3865c7e53 100755
--- a/mod/survey/db/postgres7.sql
+++ b/mod/survey/db/postgres7.sql
@@ -14,7 +14,7 @@
 # Table structure for table survey
 #
 
-CREATE TABLE survey (
+CREATE TABLE prefix_survey (
   id SERIAL PRIMARY KEY,
   course integer NOT NULL default '0',
   template integer NOT NULL default '0',
@@ -30,10 +30,10 @@ CREATE TABLE survey (
 # Dumping data for table survey
 #
 
-INSERT INTO survey (id, course, template, days, timecreated, timemodified, name, intro, questions) VALUES (1, 0, 0, 0, 985017600, 985017600, 'collesaname', 'collesaintro', '25,26,27,28,29,30,43,44');
-INSERT INTO survey (id, course, template, days, timecreated, timemodified, name, intro, questions) VALUES (2, 0, 0, 0, 985017600, 985017600, 'collespname', 'collespintro', '31,32,33,34,35,36,43,44');
-INSERT INTO survey (id, course, template, days, timecreated, timemodified, name, intro, questions) VALUES (3, 0, 0, 0, 985017600, 985017600, 'collesapname', 'collesapintro', '37,38,39,40,41,42,43,44');
-INSERT INTO survey (id, course, template, days, timecreated, timemodified, name, intro, questions) VALUES (4, 0, 0, 0, 985017600, 985017600, 'attlsname', 'attlsintro', '65,67,68');
+INSERT INTO prefix_survey (id, course, template, days, timecreated, timemodified, name, intro, questions) VALUES (1, 0, 0, 0, 985017600, 985017600, 'collesaname', 'collesaintro', '25,26,27,28,29,30,43,44');
+INSERT INTO prefix_survey (id, course, template, days, timecreated, timemodified, name, intro, questions) VALUES (2, 0, 0, 0, 985017600, 985017600, 'collespname', 'collespintro', '31,32,33,34,35,36,43,44');
+INSERT INTO prefix_survey (id, course, template, days, timecreated, timemodified, name, intro, questions) VALUES (3, 0, 0, 0, 985017600, 985017600, 'collesapname', 'collesapintro', '37,38,39,40,41,42,43,44');
+INSERT INTO prefix_survey (id, course, template, days, timecreated, timemodified, name, intro, questions) VALUES (4, 0, 0, 0, 985017600, 985017600, 'attlsname', 'attlsintro', '65,67,68');
 
 
 
@@ -41,7 +41,7 @@ INSERT INTO survey (id, course, template, days, timecreated, timemodified, name,
 # Table structure for table survey_analysis
 #
 
-CREATE TABLE survey_analysis (
+CREATE TABLE prefix_survey_analysis (
   id SERIAL PRIMARY KEY,
   survey integer NOT NULL default '0',
   userid integer NOT NULL default '0',
@@ -58,7 +58,7 @@ CREATE TABLE survey_analysis (
 # Table structure for table survey_answers
 #
 
-CREATE TABLE survey_answers (
+CREATE TABLE prefix_survey_answers (
   id SERIAL PRIMARY KEY,
   userid integer NOT NULL default '0',
   survey integer NOT NULL default '0',
@@ -78,7 +78,7 @@ CREATE TABLE survey_answers (
 # Table structure for table survey_questions
 #
 
-CREATE TABLE survey_questions (
+CREATE TABLE prefix_survey_questions (
   id SERIAL PRIMARY KEY,
   text varchar(255) NOT NULL default '',
   shorttext varchar(30) NOT NULL default '',
@@ -92,73 +92,73 @@ CREATE TABLE survey_questions (
 # Dumping data for table survey_questions
 #
 
-INSERT INTO survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (1, 'colles1', 'colles1short', '', '', 1, 'scaletimes5');
-INSERT INTO survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (2, 'colles2', 'colles2short', '', '', 1, 'scaletimes5');
-INSERT INTO survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (3, 'colles3', 'colles3short', '', '', 1, 'scaletimes5');
-INSERT INTO survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (4, 'colles4', 'colles4short', '', '', 1, 'scaletimes5');
-INSERT INTO survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (5, 'colles5', 'colles5short', '', '', 1, 'scaletimes5');
-INSERT INTO survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (6, 'colles6', 'colles6short', '', '', 1, 'scaletimes5');
-INSERT INTO survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (7, 'colles7', 'colles7short', '', '', 1, 'scaletimes5');
-INSERT INTO survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (8, 'colles8', 'colles8short', '', '', 1, 'scaletimes5');
-INSERT INTO survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (9, 'colles9', 'colles9short', '', '', 1, 'scaletimes5');
-INSERT INTO survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (10, 'colles10', 'colles10short', '', '', 1, 'scaletimes5');
-INSERT INTO survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (11, 'colles11', 'colles11short', '', '', 1, 'scaletimes5');
-INSERT INTO survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (12, 'colles12', 'colles12short', '', '', 1, 'scaletimes5');
-INSERT INTO survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (13, 'colles13', 'colles13short', '', '', 1, 'scaletimes5');
-INSERT INTO survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (14, 'colles14', 'colles14short', '', '', 1, 'scaletimes5');
-INSERT INTO survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (15, 'colles15', 'colles15short', '', '', 1, 'scaletimes5');
-INSERT INTO survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (16, 'colles16', 'colles16short', '', '', 1, 'scaletimes5');
-INSERT INTO survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (17, 'colles17', 'colles17short', '', '', 1, 'scaletimes5');
-INSERT INTO survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (18, 'colles18', 'colles18short', '', '', 1, 'scaletimes5');
-INSERT INTO survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (19, 'colles19', 'colles19short', '', '', 1, 'scaletimes5');
-INSERT INTO survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (20, 'colles20', 'colles20short', '', '', 1, 'scaletimes5');
-INSERT INTO survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (21, 'colles21', 'colles21short', '', '', 1, 'scaletimes5');
-INSERT INTO survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (22, 'colles22', 'colles22short', '', '', 1, 'scaletimes5');
-INSERT INTO survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (23, 'colles23', 'colles23short', '', '', 1, 'scaletimes5');
-INSERT INTO survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (24, 'colles24', 'colles24short', '', '', 1, 'scaletimes5');
-INSERT INTO survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (25, 'collesm1', 'collesm1short', '1,2,3,4', 'collesmintro', 1, 'scaletimes5');
-INSERT INTO survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (26, 'collesm2', 'collesm2short', '5,6,7,8', 'collesmintro', 1, 'scaletimes5');
-INSERT INTO survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (27, 'collesm3', 'collesm3short', '9,10,11,12', 'collesmintro', 1, 'scaletimes5');
-INSERT INTO survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (28, 'collesm4', 'collesm4short', '13,14,15,16', 'collesmintro', 1, 'scaletimes5');
-INSERT INTO survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (29, 'collesm5', 'collesm5short', '17,18,19,20', 'collesmintro', 1, 'scaletimes5');
-INSERT INTO survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (30, 'collesm6', 'collesm6short', '21,22,23,24', 'collesmintro', 1, 'scaletimes5');
-INSERT INTO survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (31, 'collesm1', 'collesm1short', '1,2,3,4', 'collesmintro', 2, 'scaletimes5');
-INSERT INTO survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (32, 'collesm2', 'collesm2short', '5,6,7,8', 'collesmintro', 2, 'scaletimes5');
-INSERT INTO survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (33, 'collesm3', 'collesm3short', '9,10,11,12', 'collesmintro', 2, 'scaletimes5');
-INSERT INTO survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (34, 'collesm4', 'collesm4short', '13,14,15,16', 'collesmintro', 2, 'scaletimes5');
-INSERT INTO survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (35, 'collesm5', 'collesm5short', '17,18,19,20', 'collesmintro', 2, 'scaletimes5');
-INSERT INTO survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (36, 'collesm6', 'collesm6short', '21,22,23,24', 'collesmintro', 2, 'scaletimes5');
-INSERT INTO survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (37, 'collesm1', 'collesm1short', '1,2,3,4', 'collesmintro', 3, 'scaletimes5');
-INSERT INTO survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (38, 'collesm2', 'collesm2short', '5,6,7,8', 'collesmintro', 3, 'scaletimes5');
-INSERT INTO survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (39, 'collesm3', 'collesm3short', '9,10,11,12', 'collesmintro', 3, 'scaletimes5');
-INSERT INTO survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (40, 'collesm4', 'collesm4short', '13,14,15,16', 'collesmintro', 3, 'scaletimes5');
-INSERT INTO survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (41, 'collesm5', 'collesm5short', '17,18,19,20', 'collesmintro', 3, 'scaletimes5');
-INSERT INTO survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (42, 'collesm6', 'collesm6short', '21,22,23,24', 'collesmintro', 3, 'scaletimes5');
-INSERT INTO survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (43, 'howlong', '', '', '', 1, 'howlongoptions');
-INSERT INTO survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (44, 'othercomments', '', '', '', 0, '');
-INSERT INTO survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (64, 'attls20', 'attls20short', '', '', 1, 'scaleagree5');
-INSERT INTO survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (58, 'attls14', 'attls14short', '', '', 1, 'scaleagree5');
-INSERT INTO survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (59, 'attls15', 'attls15short', '', '', 1, 'scaleagree5');
-INSERT INTO survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (60, 'attls16', 'attls16short', '', '', 1, 'scaleagree5');
-INSERT INTO survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (61, 'attls17', 'attls17short', '', '', 1, 'scaleagree5');
-INSERT INTO survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (62, 'attls18', 'attls18short', '', '', 1, 'scaleagree5');
-INSERT INTO survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (63, 'attls19', 'attls19short', '', '', 1, 'scaleagree5');
-INSERT INTO survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (56, 'attls12', 'attls12short', '', '', 1, 'scaleagree5');
-INSERT INTO survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (57, 'attls13', 'attls13short', '', '', 1, 'scaleagree5');
-INSERT INTO survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (55, 'attls11', 'attls11short', '', '', 1, 'scaleagree5');
-INSERT INTO survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (54, 'attls10', 'attls10short', '', '', 1, 'scaleagree5');
-INSERT INTO survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (53, 'attls9', 'attls9short', '', '', 1, 'scaleagree5');
-INSERT INTO survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (52, 'attls8', 'attls8short', '', '', 1, 'scaleagree5');
-INSERT INTO survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (51, 'attls7', 'attls7short', '', '', 1, 'scaleagree5');
-INSERT INTO survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (50, 'attls6', 'attls6short', '', '', 1, 'scaleagree5');
-INSERT INTO survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (49, 'attls5', 'attls5short', '', '', 1, 'scaleagree5');
-INSERT INTO survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (48, 'attls4', 'attls4short', '', '', 1, 'scaleagree5');
-INSERT INTO survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (47, 'attls3', 'attls3short', '', '', 1, 'scaleagree5');
-INSERT INTO survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (45, 'attls1', 'attls1short', '', '', 1, 'scaleagree5');
-INSERT INTO survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (46, 'attls2', 'attls2short', '', '', 1, 'scaleagree5');
-INSERT INTO survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (65, 'attlsm1', 'attlsm1', '45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64', 'attlsmintro', 1, 'scaleagree5');
-INSERT INTO survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (67, 'attlsm2', 'attlsm2', '63,62,59,57,55,49,52,50,48,47', 'attlsmintro', -1, 'scaleagree5');
-INSERT INTO survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (68, 'attlsm3', 'attlsm3', '46,54,45,51,60,53,56,58,61,64', 'attlsmintro', -1, 'scaleagree5');
+INSERT INTO prefix_survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (1, 'colles1', 'colles1short', '', '', 1, 'scaletimes5');
+INSERT INTO prefix_survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (2, 'colles2', 'colles2short', '', '', 1, 'scaletimes5');
+INSERT INTO prefix_survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (3, 'colles3', 'colles3short', '', '', 1, 'scaletimes5');
+INSERT INTO prefix_survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (4, 'colles4', 'colles4short', '', '', 1, 'scaletimes5');
+INSERT INTO prefix_survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (5, 'colles5', 'colles5short', '', '', 1, 'scaletimes5');
+INSERT INTO prefix_survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (6, 'colles6', 'colles6short', '', '', 1, 'scaletimes5');
+INSERT INTO prefix_survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (7, 'colles7', 'colles7short', '', '', 1, 'scaletimes5');
+INSERT INTO prefix_survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (8, 'colles8', 'colles8short', '', '', 1, 'scaletimes5');
+INSERT INTO prefix_survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (9, 'colles9', 'colles9short', '', '', 1, 'scaletimes5');
+INSERT INTO prefix_survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (10, 'colles10', 'colles10short', '', '', 1, 'scaletimes5');
+INSERT INTO prefix_survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (11, 'colles11', 'colles11short', '', '', 1, 'scaletimes5');
+INSERT INTO prefix_survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (12, 'colles12', 'colles12short', '', '', 1, 'scaletimes5');
+INSERT INTO prefix_survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (13, 'colles13', 'colles13short', '', '', 1, 'scaletimes5');
+INSERT INTO prefix_survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (14, 'colles14', 'colles14short', '', '', 1, 'scaletimes5');
+INSERT INTO prefix_survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (15, 'colles15', 'colles15short', '', '', 1, 'scaletimes5');
+INSERT INTO prefix_survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (16, 'colles16', 'colles16short', '', '', 1, 'scaletimes5');
+INSERT INTO prefix_survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (17, 'colles17', 'colles17short', '', '', 1, 'scaletimes5');
+INSERT INTO prefix_survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (18, 'colles18', 'colles18short', '', '', 1, 'scaletimes5');
+INSERT INTO prefix_survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (19, 'colles19', 'colles19short', '', '', 1, 'scaletimes5');
+INSERT INTO prefix_survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (20, 'colles20', 'colles20short', '', '', 1, 'scaletimes5');
+INSERT INTO prefix_survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (21, 'colles21', 'colles21short', '', '', 1, 'scaletimes5');
+INSERT INTO prefix_survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (22, 'colles22', 'colles22short', '', '', 1, 'scaletimes5');
+INSERT INTO prefix_survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (23, 'colles23', 'colles23short', '', '', 1, 'scaletimes5');
+INSERT INTO prefix_survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (24, 'colles24', 'colles24short', '', '', 1, 'scaletimes5');
+INSERT INTO prefix_survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (25, 'collesm1', 'collesm1short', '1,2,3,4', 'collesmintro', 1, 'scaletimes5');
+INSERT INTO prefix_survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (26, 'collesm2', 'collesm2short', '5,6,7,8', 'collesmintro', 1, 'scaletimes5');
+INSERT INTO prefix_survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (27, 'collesm3', 'collesm3short', '9,10,11,12', 'collesmintro', 1, 'scaletimes5');
+INSERT INTO prefix_survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (28, 'collesm4', 'collesm4short', '13,14,15,16', 'collesmintro', 1, 'scaletimes5');
+INSERT INTO prefix_survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (29, 'collesm5', 'collesm5short', '17,18,19,20', 'collesmintro', 1, 'scaletimes5');
+INSERT INTO prefix_survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (30, 'collesm6', 'collesm6short', '21,22,23,24', 'collesmintro', 1, 'scaletimes5');
+INSERT INTO prefix_survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (31, 'collesm1', 'collesm1short', '1,2,3,4', 'collesmintro', 2, 'scaletimes5');
+INSERT INTO prefix_survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (32, 'collesm2', 'collesm2short', '5,6,7,8', 'collesmintro', 2, 'scaletimes5');
+INSERT INTO prefix_survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (33, 'collesm3', 'collesm3short', '9,10,11,12', 'collesmintro', 2, 'scaletimes5');
+INSERT INTO prefix_survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (34, 'collesm4', 'collesm4short', '13,14,15,16', 'collesmintro', 2, 'scaletimes5');
+INSERT INTO prefix_survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (35, 'collesm5', 'collesm5short', '17,18,19,20', 'collesmintro', 2, 'scaletimes5');
+INSERT INTO prefix_survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (36, 'collesm6', 'collesm6short', '21,22,23,24', 'collesmintro', 2, 'scaletimes5');
+INSERT INTO prefix_survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (37, 'collesm1', 'collesm1short', '1,2,3,4', 'collesmintro', 3, 'scaletimes5');
+INSERT INTO prefix_survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (38, 'collesm2', 'collesm2short', '5,6,7,8', 'collesmintro', 3, 'scaletimes5');
+INSERT INTO prefix_survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (39, 'collesm3', 'collesm3short', '9,10,11,12', 'collesmintro', 3, 'scaletimes5');
+INSERT INTO prefix_survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (40, 'collesm4', 'collesm4short', '13,14,15,16', 'collesmintro', 3, 'scaletimes5');
+INSERT INTO prefix_survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (41, 'collesm5', 'collesm5short', '17,18,19,20', 'collesmintro', 3, 'scaletimes5');
+INSERT INTO prefix_survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (42, 'collesm6', 'collesm6short', '21,22,23,24', 'collesmintro', 3, 'scaletimes5');
+INSERT INTO prefix_survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (43, 'howlong', '', '', '', 1, 'howlongoptions');
+INSERT INTO prefix_survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (44, 'othercomments', '', '', '', 0, '');
+INSERT INTO prefix_survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (64, 'attls20', 'attls20short', '', '', 1, 'scaleagree5');
+INSERT INTO prefix_survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (58, 'attls14', 'attls14short', '', '', 1, 'scaleagree5');
+INSERT INTO prefix_survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (59, 'attls15', 'attls15short', '', '', 1, 'scaleagree5');
+INSERT INTO prefix_survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (60, 'attls16', 'attls16short', '', '', 1, 'scaleagree5');
+INSERT INTO prefix_survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (61, 'attls17', 'attls17short', '', '', 1, 'scaleagree5');
+INSERT INTO prefix_survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (62, 'attls18', 'attls18short', '', '', 1, 'scaleagree5');
+INSERT INTO prefix_survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (63, 'attls19', 'attls19short', '', '', 1, 'scaleagree5');
+INSERT INTO prefix_survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (56, 'attls12', 'attls12short', '', '', 1, 'scaleagree5');
+INSERT INTO prefix_survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (57, 'attls13', 'attls13short', '', '', 1, 'scaleagree5');
+INSERT INTO prefix_survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (55, 'attls11', 'attls11short', '', '', 1, 'scaleagree5');
+INSERT INTO prefix_survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (54, 'attls10', 'attls10short', '', '', 1, 'scaleagree5');
+INSERT INTO prefix_survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (53, 'attls9', 'attls9short', '', '', 1, 'scaleagree5');
+INSERT INTO prefix_survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (52, 'attls8', 'attls8short', '', '', 1, 'scaleagree5');
+INSERT INTO prefix_survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (51, 'attls7', 'attls7short', '', '', 1, 'scaleagree5');
+INSERT INTO prefix_survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (50, 'attls6', 'attls6short', '', '', 1, 'scaleagree5');
+INSERT INTO prefix_survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (49, 'attls5', 'attls5short', '', '', 1, 'scaleagree5');
+INSERT INTO prefix_survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (48, 'attls4', 'attls4short', '', '', 1, 'scaleagree5');
+INSERT INTO prefix_survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (47, 'attls3', 'attls3short', '', '', 1, 'scaleagree5');
+INSERT INTO prefix_survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (45, 'attls1', 'attls1short', '', '', 1, 'scaleagree5');
+INSERT INTO prefix_survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (46, 'attls2', 'attls2short', '', '', 1, 'scaleagree5');
+INSERT INTO prefix_survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (65, 'attlsm1', 'attlsm1', '45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64', 'attlsmintro', 1, 'scaleagree5');
+INSERT INTO prefix_survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (67, 'attlsm2', 'attlsm2', '63,62,59,57,55,49,52,50,48,47', 'attlsmintro', -1, 'scaleagree5');
+INSERT INTO prefix_survey_questions (id, text, shorttext, multi, intro, type, options) VALUES (68, 'attlsm3', 'attlsm3', '46,54,45,51,60,53,56,58,61,64', 'attlsmintro', -1, 'scaleagree5');
 
 
 
@@ -166,8 +166,8 @@ INSERT INTO survey_questions (id, text, shorttext, multi, intro, type, options)
 # Dumping data for table log_display
 #
 
-INSERT INTO log_display VALUES ('survey', 'download', 'survey', 'name');
-INSERT INTO log_display VALUES ('survey', 'view form', 'survey', 'name');
-INSERT INTO log_display VALUES ('survey', 'view graph', 'survey', 'name');
-INSERT INTO log_display VALUES ('survey', 'view report', 'survey', 'name');
-INSERT INTO log_display VALUES ('survey', 'submit', 'survey', 'name');
+INSERT INTO prefix_log_display VALUES ('survey', 'download', 'survey', 'name');
+INSERT INTO prefix_log_display VALUES ('survey', 'view form', 'survey', 'name');
+INSERT INTO prefix_log_display VALUES ('survey', 'view graph', 'survey', 'name');
+INSERT INTO prefix_log_display VALUES ('survey', 'view report', 'survey', 'name');
+INSERT INTO prefix_log_display VALUES ('survey', 'submit', 'survey', 'name');
diff --git a/version.php b/version.php
index 8519838cd0..c823e68d97 100644
--- a/version.php
+++ b/version.php
@@ -5,7 +5,7 @@
 // database to determine whether upgrades should
 // be performed (see lib/db/*.php)
 
-$version = 2002122300;   // The current version is a date (YYYYMMDDXX)
+$version = 2002122301;   // The current version is a date (YYYYMMDDXX)
 
 $release = "1.0.8 dev";  // User-friendly version number
 
-- 
2.39.5