Merge branch 'hotfixes' into development

install.sh

@@ -6,6 +6,7 @@ root_htaccess="root.htaccess"
 parent_htaccess="../.htaccess"
 settings_file="settings.inc.php"
 
+metadb="db.sqlite"
 basedir="http://localhost/my/data/"
 home=`basename \`pwd\`` # 'lodspeakr', the directory from git clone
 ns=$basedir
@@ -21,6 +22,21 @@ fi
 
 back_one=`cd .. 2>/dev/null && pwd`
 parent=`basename $back_one`
+
+mkdir -p meta
+cd meta
+if [ ! -e $metadb ]; then
+  SQLITE3=`which sqlite3`
+  if [ -z "$SQLITE3" ]; then
+  	echo "SQLlite3 is required to continue installation. Please add it to your \$PATH."
+  	exit 1
+  fi
+  $SQLITE3 $metadb 'CREATE TABLE document (uri varcharg(1000), doc varchar(1000), format varchar(50));'
+else
+  echo "WARNING: SQLite database already exists."
+fi
+cd ..
+
 while [ "$everything_ok" != "y" ]; do
   echo
   echo "== Basic Information =="
@@ -111,19 +127,6 @@ echo "WARNING: Copying $root_htaccess as .htaccess in parent directory"
 echo ""
 cp $root_htaccess $parent_htaccess
 
-#Creating symlinks for turtle and ntriples
-cd views
-ln -s rdfs:Resource.view.rdf rdfs:Resource.view.nt
-ln -s rdfs:Resource.view.rdf rdfs:Resource.view.ttl
-ln -s rdfs:Resource.view.rdf rdfs:Resource.view.json
-
-cd ../models
-ln -s rdfs:Resource.model.rdf rdfs:Resource.model.nt
-ln -s rdfs:Resource.model.rdf rdfs:Resource.model.ttl
-ln -s rdfs:Resource.model.rdf rdfs:Resource.model.json
-
-cd ..
-
 mkdir cache
 
 echo