moved db to admin area and dbscheme to seperate unique file.

diff --git a/admin/include/db.inc b/admin/include/db.inc
index 7c4da1d54ee759b10d4dfe0a64a819f2284a69be..f7c4e6c12de6ea5086fd86cb502b06bb8b664754 100644 (file)
--- a/admin/include/db.inc
+++ b/admin/include/db.inc
@@ -1,18 +1,7 @@
 <?php
   if (! isset($db)) {
     if ($db = new PDO('sqlite:banane.db')) {
 <?php
   if (! isset($db)) {
     if ($db = new PDO('sqlite:banane.db')) {

-      $db->query('CREATE TABLE IF NOT EXISTS students   
-         (mnumber int, firstname string, lastname string, email string, password string, blackboard int DEFAULT 0, lastblackboard TIMESTAMP, PRIMARY KEY (mnumber))');
-      $db->query('CREATE TABLE IF NOT EXISTS workdone
-          (mnumber int, session int, manydone int, thisdone string, tstamp TIMESTAMP)');
-      $db->query('CREATE TABLE IF NOT EXISTS prefs
-          (key string, value string, PRIMARY KEY (key))');
-      $db->query('CREATE TABLE IF NOT EXISTS sessions
-          (id int NOT NULL, examples string, nexamples int, PRIMARY KEY (id))');
-      $db->query('CREATE TABLE IF NOT EXISTS exams
-          (id int NOT NULL, score string, PRIMARY KEY (id))'); 
-      $db->query('CREATE TABLE IF NOT EXISTS examscore
-          (mnumber int, exam int, scorestr string, tstamp TIMESTAMP)');
+      require 'dbscheme.inc';

     }
   }
 ?>
     }
   }
 ?>

diff --git a/admin/include/dbscheme.inc b/admin/include/dbscheme.inc
new file mode 120000 (symlink)
index 0000000..e7bfda0
--- /dev/null
+++ b/admin/include/dbscheme.inc
@@ -0,0 +1 @@
+../../include/dbscheme.inc
\ No newline at end of file

diff --git a/include/db.inc b/include/db.inc
index efd7aae6a678270247a0f81b65f5c51bb6a15d50..f3d18041860e1c72bcc4b12c4c1a420589fa5eb8 100644 (file)
--- a/include/db.inc
+++ b/include/db.inc
@@ -1,18 +1,7 @@
 <?php
   if (! isset($db)) {
 <?php
   if (! isset($db)) {

-    if ($db = new PDO('sqlite:banane.db')) {
-      $db->query('CREATE TABLE IF NOT EXISTS students 
-         (mnumber int, firstname string, lastname string, email string, password string, blackboard int DEFAULT 0, lastblackboard TIMESTAMP, PRIMARY KEY (mnumber))');
-      $db->query('CREATE TABLE IF NOT EXISTS workdone
-          (mnumber int, session int, manydone int, thisdone string, tstamp TIMESTAMP)');
-      $db->query('CREATE TABLE IF NOT EXISTS prefs
-          (key string, value string, PRIMARY KEY (key))');
-      $db->query('CREATE TABLE IF NOT EXISTS sessions
-          (id int NOT NULL, examples string, nexamples int, PRIMARY KEY (id))');
-      $db->query('CREATE TABLE IF NOT EXISTS exams
-          (id int NOT NULL, score string, PRIMARY KEY (id))'); 
-      $db->query('CREATE TABLE IF NOT EXISTS examscore
-          (mnumber int, exam int, scorestr string, tstamp TIMESTAMP)');
+    if ($db = new PDO('sqlite:admin/banane.db')) {
+      require 'dbscheme.inc';

     }
   }
 ?>
     }
   }
 ?>

diff --git a/include/dbscheme.inc b/include/dbscheme.inc
new file mode 100644 (file)
index 0000000..02feb33
--- /dev/null
+++ b/include/dbscheme.inc
@@ -0,0 +1,14 @@
+<?php
+$db->query('CREATE TABLE IF NOT EXISTS students 
+  (mnumber int, firstname string, lastname string, email string, password string, blackboard int DEFAULT 0, lastblackboard TIMESTAMP, PRIMARY KEY (mnumber))');
+$db->query('CREATE TABLE IF NOT EXISTS workdone
+  (mnumber int, session int, manydone int, thisdone string, tstamp TIMESTAMP)');
+$db->query('CREATE TABLE IF NOT EXISTS prefs
+  (key string, value string, PRIMARY KEY (key))');
+$db->query('CREATE TABLE IF NOT EXISTS sessions
+  (id int NOT NULL, examples string, nexamples int, PRIMARY KEY (id))');
+$db->query('CREATE TABLE IF NOT EXISTS exams
+  (id int NOT NULL, score string, PRIMARY KEY (id))'); 
+$db->query('CREATE TABLE IF NOT EXISTS examscore
+  (mnumber int, exam int, scorestr string, tstamp TIMESTAMP)');
+?>
\ No newline at end of file