From e684e40a6c67397d78134ee4e3ea64e43438b16f Mon Sep 17 00:00:00 2001
From: alvaro <alvaro@alia.(none)>
Date: Thu, 6 Dec 2012 08:52:09 -0800
Subject: [PATCH] removing changes from visualbox
Adding explanation when sqlite db is not writable
---
classes/MetaDb.php | 2 +-
install.sh | 21 ++++++++++-----------
root.htaccess | 2 +-
utils/install | 6 +++---
utils/lodspk.sh | 4 ++--
5 files changed, 17 insertions(+), 18 deletions(-)
diff --git a/classes/MetaDb.php b/classes/MetaDb.php
index c717a53b..136b8a77 100644
--- a/classes/MetaDb.php
+++ b/classes/MetaDb.php
@@ -34,7 +34,7 @@ class MetaDb{
$results = $db->exec($q);
$db = NULL;
}catch(Exception $e){
- echo "Can't write in SQLite database. Please check you have granted write permissions to <tt>meta/</tt> and <tt>meta/db.sqlite</tt>.";
+ echo "Can't write in SQLite database. Please check you have granted write permissions to <tt>meta/</tt> and <tt>meta/db.sqlite</tt>.<br/>Also you can check a list of <a href='https://github.com/alangrafu/lodspeakr/wiki/CommonErrors'>common errors</a> and how to <a href='https://github.com/alangrafu/lodspeakr/wiki/Wipe-out-the-database'>wipe out the database</a>'";
trigger_error('Exception exec: '.$e->getMessage(), E_USER_ERROR);
exit(1);
}
diff --git a/install.sh b/install.sh
index a21ea6af..91d6cc92 100755
--- a/install.sh
+++ b/install.sh
@@ -38,15 +38,14 @@ while [ "$everything_ok" != "y" ]; do
basedir=$aux_basedir
ns=$basedir
-##Visualbox doesn't need this
-# echo "(2/3) What local namespace you will use?"
-# echo -n "(default '$ns'): "
-# read -u 1 aux_ns
-# echo ""
-# if [ "$aux_ns" != "" ]; then
-# aux_ns="`echo $aux_ns | sed 's/\/$//'`/" # remove any ending slash and append one.
-# ns=$aux_ns
-# fi
+ echo "(2/3) What local namespace you will use?"
+ echo -n "(default '$ns'): "
+ read -u 1 aux_ns
+ echo ""
+ if [ "$aux_ns" != "" ]; then
+ aux_ns="`echo $aux_ns | sed 's/\/$//'`/" # remove any ending slash and append one.
+ ns=$aux_ns
+ fi
external=""
extra=""
@@ -71,7 +70,7 @@ while [ "$everything_ok" != "y" ]; do
echo
echo "Base URL is $basedir"
echo "lodspeakr is installed at $basedir$home"
-# echo "The local namespace is $ns"
+ echo "The local namespace is $ns"
echo "Your SPARQL endpoint is located at $endpoint"
echo
@@ -129,7 +128,7 @@ wwwUser=`ps aux|egrep "apache|httpd|www" |egrep -v "grep|root"|awk '{print $1}'|
echo
echo " *** ATTENTION ***"
echo
-echo "Visualbox needs the web server to have write permissions for $home/cache/ $home/meta/ $home/components and $home/settings.inc.php."
+echo "LODSPeaKr needs the web server to have write permissions for $home/cache/ $home/meta/ $home/components and $home/settings.inc.php."
echo
echo
echo "Common ways of doing this:"
diff --git a/root.htaccess b/root.htaccess
index 1ed2a9ff..81a83696 100644
--- a/root.htaccess
+++ b/root.htaccess
@@ -1,5 +1,5 @@
-RewriteRule ^$ visualbox/index.php [L]
+RewriteRule ^$ lodspeakr/index.php [L]
RewriteCond %{REQUEST_FILENAME} !-f
RewriteCond %{REQUEST_FILENAME} !-d
diff --git a/utils/install b/utils/install
index 3f2d0001..c0bd38ef 100644
--- a/utils/install
+++ b/utils/install
@@ -1,14 +1,14 @@
#!/usr/bin/env bash
#
-# Installation script for Visualbox (http://visualbox.org)
+# Installation script for LODSPeaKr (http://lodspeakr.org)
# Author: Alvaro Graves (alvaro@graves.cl)
# Modified by: Tim Lebo (lebot@rpi.edu)
#
# The URL:
-# http://visualbox.org/install
+# http://lodspeakr.org/install
# 303 redirects to this script.
-lodspeakr_repository="git://github.com/alangrafu/visualbox.git"
+lodspeakr_repository="git://github.com/alangrafu/lodspeakr.git"
home=`basename $lodspeakr_repository | sed 's/.git//'`
source ~/.bashrc
diff --git a/utils/lodspk.sh b/utils/lodspk.sh
index bdf3332d..502b8125 100755
--- a/utils/lodspk.sh
+++ b/utils/lodspk.sh
@@ -3,8 +3,8 @@
# https://github.com/alangrafu/lodspeakr/blob/master/utils/ldspk.sh
USAGE="Usage:\n"
USAGE=$USAGE"===COMPONENTS==\n"
-USAGE=$USAGE" Create component:\t\t\t\t\t$0 create uri|type|service foo [html|rdf|ttl|nt|json]\n"
-USAGE=$USAGE" Delete component:\t\t\t\t\t$0 delete uri|type|service foo [html|rdf|ttl|nt|json]\n"
+USAGE=$USAGE" Create component:\t\t\t\t\t$0 create uri|type|service foo [html|json]\n"
+USAGE=$USAGE" Delete component:\t\t\t\t\t$0 delete uri|type|service foo [html|json]\n"
USAGE=$USAGE" List components:\t\t\t\t\t$0 list components\n"
USAGE=$USAGE"\n===DEBUG==\n"
USAGE=$USAGE" Turn debug:\t\t\t\t\t\t$0 debug on|off\n"
--
GitLab