diff --git a/classes/modules/typeModule.php b/classes/modules/typeModule.php index baa18b0bcb1ddc226b23ad072f48a41bf3712281..2f5b3f48d666bbe7a85a168561e43947ab4a2054 100644 --- a/classes/modules/typeModule.php +++ b/classes/modules/typeModule.php @@ -119,11 +119,13 @@ class TypeModule extends abstractModule{ */ //Get the firstResults type available $typesAndValues = array('rdfs:Resource' => -1); - foreach($t as $v){ - $curie = Utils::uri2curie($v); - $typesAndValues[$curie] = 0; - if(isset($conf['type']['priorities'][$curie]) && $conf['type']['priorities'][$curie] >= 0){ - $typesAndValues[$curie] = $conf['type']['priorities'][$curie]; + if($conf['disableComponents'] != true){ + foreach($t as $v){ + $curie = Utils::uri2curie($v); + $typesAndValues[$curie] = 0; + if(isset($conf['type']['priorities'][$curie]) && $conf['type']['priorities'][$curie] >= 0){ + $typesAndValues[$curie] = $conf['type']['priorities'][$curie]; + } } } arsort($typesAndValues); diff --git a/classes/modules/uriModule.php b/classes/modules/uriModule.php index ed9ce4a40c21e87ec87d6aea163c9f385e721f5c..73d55aa5d752c085f89fda5cd1ab0ab2e806aaa9 100644 --- a/classes/modules/uriModule.php +++ b/classes/modules/uriModule.php @@ -11,6 +11,9 @@ class UriModule extends abstractModule{ global $endpoints; global $lodspk; + if($conf['disableComponents'] == true){ + return FALSE; + } require_once('classes/MetaDb.php'); $metaDb = new MetaDb($conf['metadata']['db']['location']); diff --git a/utils/lodspk.sh b/utils/lodspk.sh index b97a987691bd9e3dac5d8e86ec2255e2f17b7be8..81be7a79d2a90dfb7f554bb2b9cb2e1318b6ba7b 100755 --- a/utils/lodspk.sh +++ b/utils/lodspk.sh @@ -1,33 +1,41 @@ #!/bin/bash # # https://github.com/alangrafu/lodspeakr/blob/master/utils/ldspk.sh -USAGE="Usage: $0 create|delete uri|type|service foo [html|rdf|ttl|nt|json]" +USAGE="Usage:\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" Turn debug:\t\t\t\t\t\t$0 debug on|off\n" +USAGE=$USAGE" Switch to standard view/models temporaly:\t\t$0 disable on|off\n" +USAGE=$USAGE" Backup current installation:\t\t\t\t$0 backup\n" +USAGE=$USAGE" Restore previous instllation:\t\t\t\t$0 restore\n" USAGEDEBUG="Usage: $0 debug on|off" if [[ $# -eq 0 || "$1" == "--help" ]]; then - echo $USAGE + echo -e $USAGE exit 1 fi DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -operations=( create delete debug backup restore ) +operations=( create delete debug backup restore disable ) currentOperation= if [[ ${operations[@]} =~ $1 ]]; then currentOperation=$1 else echo "Operation \"$1\" not valid" - echo $USAGE + echo -e $USAGE exit 1 fi ## Backup if [[ $currentOperation == "backup" ]]; then $DIR/modules/backup.sh + exit fi ## Restore if [[ $currentOperation == "restore" ]]; then $DIR/modules/restore.sh + exit fi ## Create/delete @@ -40,7 +48,7 @@ if [[ $currentOperation == "create" || $currentOperation == "delete" ]]; then currentModule=$2 else echo "Module \"$2\" not valid" - echo $USAGE + echo -e $USAGE exit 1 fi @@ -51,7 +59,7 @@ if [[ $currentOperation == "create" || $currentOperation == "delete" ]]; then currentFormat=$4 else echo "Format \"$4\" not valid" - echo $USAGE + echo -e $USAGE exit 1 fi else @@ -71,8 +79,25 @@ if [[ $currentOperation == "debug" ]]; then debugOperation=$2 else echo "Debug option not supported. Operation aborted" >&2 - echo $USAGEDEBUG + echo -e $USAGE exit 1 fi php $DIR/modules/debug.php "$debugOperation" + exit fi + +## Backup +if [[ $currentOperation == "disable" ]]; then + defaultOptions=( on off 0 1 ) + defaultOperation= + if [[ ${defaultOptions[@]} =~ $2 ]] + then + defaultOperation=$2 + else + echo "Disable option not supported. Operation aborted" >&2 + echo -e $USAGE + exit 1 + fi + php $DIR/modules/default.php "$defaultOperation" + exit +fi diff --git a/utils/modules/default.php b/utils/modules/default.php new file mode 100644 index 0000000000000000000000000000000000000000..585721387ea5362f10f5ae54bc7685e2bb95dfe8 --- /dev/null +++ b/utils/modules/default.php @@ -0,0 +1,27 @@ +<? +error_reporting(E_ERROR); +$s = 'settings.inc.php'; +$c = file_get_contents($s); +$optionarray = Array('on' => 'true', '1' => 'true', 'off' => 'false', '0' =>'false'); +$antiarray = Array('on' => 'false', '1' => 'false', 'off' => 'true', '0' =>'true'); +$option = $optionarray[$argv[1]]; +if($option == "" || $option == null){ + echo "Option not recognized. Aborting\n"; + exit(1); +} +if(preg_match('/disableComponents(.+)'.$optionarray[$argv[1]].'/', $c)){ + echo "Default already turned ".$option."\n"; + exit(0); +} +$newC = preg_replace('/disableComponents(.+)'.$antiarray[$argv[1]].'/', "disableComponents'] = ".$option, $c); +if($newC == $c){ + echo "WARNING: Variable 'disableComponents' does not exist. Adding it.\n"; + $newC = preg_replace("/\?>/", "\n\$conf['disableComponents'] = ".$option.";\n?>", $c); +} +if(file_put_contents($s, $newC) === FALSE){ + echo "An error ocurred"; + exit(1); +}else{ + echo "Default mode turned ".$option."\n"; +} +?> diff --git a/utils/modules/restore.sh b/utils/modules/restore.sh index cc330da8fd1f75f6ba2dc30ff58c5a3fdecd345a..dd18187a8a2309bd5cb131667d66b05dcd847536 100755 --- a/utils/modules/restore.sh +++ b/utils/modules/restore.sh @@ -12,8 +12,12 @@ if [[ ! -d $BACKUPDIR ]]; then exit 1 fi -LIST=( `ls $BACKUPDIR/$NAME-backup*` ) +LIST=( `ls $BACKUPDIR/$NAME-backup* 2>/dev/null` ) CHOSEN=-1 +if [ "${#LIST[@]}" -eq 0 ];then + echo "No backups available"; + exit +fi while [[ "$CHOSEN" -lt 0 || "$CHOSEN" -ge "${#LIST[@]}" ]] ;do j=0 echo