Permalink
Browse files

Refactoring of this project:

linkedgeodata-cli: Contains all the scripts
linkedgeodata-debian: Module for creating a deb package from the cli module
linkedgeodata-core: Java code is broken, but the resources are referenced by the cli module
other modules: deprecated
  • Loading branch information...
1 parent 929985c commit 0716eef93914ab3d70cc731aa4ab963110a73333 cstadler committed Jun 27, 2013
Showing with 682 additions and 280 deletions.
  1. +5 −0 Makefile
  2. +0 −1 bin/README.txt
  3. BIN bin/bremen-latest.osm.pbf
  4. +0 −11 bin/config.ini.dist
  5. +0 −12 bin/install-sparqlify-ubuntu.sh
  6. +0 −86 bin/run-dump-lgd.sh
  7. +0 −90 bin/run-query-lgd.sh
  8. +0 −15 bin/test-query-a.sh
  9. +0 −20 bin/test-query.sh
  10. +0 −4 bin/uninstall-lgd-ubuntu.sh
  11. +15 −0 linkedgeodata-cli/README.txt
  12. 0 bin/install-lgd-ubuntu.sh → linkedgeodata-cli/bin/lgd-apt-get.sh
  13. +18 −0 linkedgeodata-cli/bin/lgd-build-and-install-dependencies.sh
  14. +53 −34 bin/createdb-lgd.sh → linkedgeodata-cli/bin/lgd-createdb.sh
  15. +29 −0 linkedgeodata-cli/bin/lgd-download-and-install-dependecies.sh
  16. +8 −4 bin/prepare-interlinks.sh → linkedgeodata-cli/bin/lgd-prepare-interlinks.sh
  17. +134 −0 linkedgeodata-cli/bin/lgd-query.sh
  18. +8 −0 linkedgeodata-cli/bin/lgd.conf.dist
  19. 0 ...sparqlify → resources/org/aksw/linkedgeodata/sml/LinkedGeoData-Triplify-IndividualViews-Wiki.sml}
  20. +91 −0 ...iews.sparqlify → resources/org/aksw/linkedgeodata/sml/LinkedGeoData-Triplify-IndividualViews.sml}
  21. +1 −0 linkedgeodata-core/src/main/resources/org/aksw/linkedgeodata/sml/lgd-default-wiki.sml
  22. +1 −0 linkedgeodata-core/src/main/resources/org/aksw/linkedgeodata/sml/lgd-default.sml
  23. 0 linkedgeodata-core/src/main/{ → resources/org/aksw/linkedgeodata}/sql/DeletionQueries.sql
  24. 0 linkedgeodata-core/src/main/{ → resources/org/aksw/linkedgeodata}/sql/ExtraOsmIndexes.sql
  25. 0 ...odata-core/src/main/{ → resources/org/aksw/linkedgeodata}/sql/LinkedGeoData3 Individual Views.sql
  26. 0 ...eodata-core/src/main/{ → resources/org/aksw/linkedgeodata}/sql/LinkedGeoData3 Physical Schema.sql
  27. 0 linkedgeodata-core/src/main/{ → resources/org/aksw/linkedgeodata}/sql/LinkedGeoData3.sql
  28. 0 linkedgeodata-core/src/main/{ → resources/org/aksw/linkedgeodata}/sql/Mappings.sql
  29. 0 linkedgeodata-core/src/main/{ → resources/org/aksw/linkedgeodata}/sql/SnapshotViews.sql
  30. 0 linkedgeodata-core/src/main/{ → resources/org/aksw/linkedgeodata}/sql/TagStats.sql
  31. 0 linkedgeodata-core/src/main/{ → resources/org/aksw/linkedgeodata}/sql/TranslateWikiLabels.sql
  32. 0 linkedgeodata-core/src/main/{ → resources/org/aksw/linkedgeodata}/sql/Triggers.sql
  33. 0 linkedgeodata-core/src/main/{ → resources/org/aksw/linkedgeodata}/sql/UpdateDatatypesStats.sql
  34. 0 ...in/{ → resources/org/aksw/linkedgeodata}/sql/Wikipedia-Active-But-Prefix-Match-Suboptimal-Yet.sql
  35. 0 ...ata-core/src/main/{ → resources/org/aksw/linkedgeodata}/sql/Wikipedia-Trash-ExplicitCondition.sql
  36. 0 linkedgeodata-core/src/main/{ → resources/org/aksw/linkedgeodata}/sql/Wikipedia-Trash.sql
  37. 0 linkedgeodata-core/src/main/{ → resources/org/aksw/linkedgeodata}/sql/Wikipedia-Trash2.sql
  38. 0 ...data-core/src/main/{ → resources/org/aksw/linkedgeodata}/sql/adaption-of-osm2postgresql_05rc4.sql
  39. +163 −0 linkedgeodata-debian/pom.xml
  40. +6 −0 linkedgeodata-debian/src/deb/resources/DEBIAN/changelog
  41. +45 −0 linkedgeodata-debian/src/deb/resources/DEBIAN/copyright
  42. +2 −0 linkedgeodata-debian/src/deb/resources/DEBIAN/links
  43. +14 −0 linkedgeodata-debian/src/deb/resources/DEBIAN/rules
  44. +59 −0 linkedgeodata-debian/src/deb/resources/etc/linkedgeodata/lgd.conf.dist
  45. +4 −0 linkedgeodata-debian/src/deb/resources/usr/bin/lgd-createdb
  46. +4 −0 linkedgeodata-debian/src/deb/resources/usr/bin/lgd-prepare-interlinks
  47. +4 −0 linkedgeodata-debian/src/deb/resources/usr/bin/lgd-query
  48. +18 −3 pom.xml
View
@@ -0,0 +1,5 @@
+
+deb:
+ mvn -U clean install
+ cd linkedgeodata-debian && mvn clean install deb:package
+
View
@@ -1 +0,0 @@
-An issue with the install script might be, that Osmosis removes all indexes upon loading a dataset and only re-creates some of them when done.
View
Binary file not shown.
View
@@ -1,11 +0,0 @@
-dbHost="localhost"
-dbName="lgd"
-dbUser="postgres"
-dbPass="postgres"
-
-# If you want to load a pbf file, set the following variable, e.g:
-#osmFile=/your/path/bremen-06-03-2013.osm.pbf
-
-# You can find chunked OSM files here: http://download.geofabrik.de/openstreetmap/
-# Planet files are available at: http://planet.openstreetmap.org
-
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-sparqlifyPath="./sparqlify-parent"
-git clone git://github.com/AKSW/Sparqlify.git "$sparqlifyPath"
-
-cd "$sparqlifyPath"
-git checkout devel
-
-cd sparqlify-core
-mvn -U clean assembly:assembly
-
-
View
@@ -1,86 +0,0 @@
-#!/bin/bash
-
-#
-# Dump script for LinkedGeoData:
-# ./install-lgd.sh data.osm.gz
-#
-#
-#
-#
-
-usage="$(basename "$0") options -- program to dump a LinkedGeoData database
-
-where:
- -h postgres host name
- -d postgres database name
- -u postgres user name
- -p postgres password"
-
-
-source config.ini.dist
-
-
-#lgdBasePath="../"
-sparqlifyJarFile="./sparqlify-parent/sparqlify-core/target/sparqlify-core-jar-with-dependencies.jar"
-
-
-# Use a config.ini file to override any of the settings of this file
-[ -f "./config.ini" ] && source ./config.ini
-
-# Simple function to echo to stderr
-echoerr() { echo "$@" 1>&2; }
-
-# Support for simple command line args
-# Source: http://mywiki.wooledge.org/BashFAQ/035#getopts
-# A POSIX variable
-OPTIND=1 # Reset in case getopts has been used previously in the shell.
-
-while getopts "?h:U:W:d:" opt; do
- case "$opt" in
- \?)
- echoerr "$usage"
- exit 0
- ;;
- h) dbHost="$OPTARG"
- ;;
- U) dbUser="$OPTARG"
- ;;
- W) dbPass="$OPTARG"
- ;;
- d) dbName="$OPTARG"
- ;;
- esac
-done
-
-shift $((OPTIND-1))
-
-[ "$1" = "--" ] && shift
-
-
-# Confirm settings before continuation
-echoerr "-------------------------------------------------------------------"
-echoerr "Your settings are:"
-echoerr "Database"
-echoerr " Name: $dbName"
-echoerr " Host: $dbHost"
-echoerr " Username: $dbUser"
-echoerr " Password: $dbPass"
-
-echoerr "Paths:"
-echoerr " Sparqlify path: $sparqlifyJarFile"
-
-echoerr "-------------------------------------------------------------------"
-read -p "Press [Enter] key to start loading"
-
-
-java -cp "$sparqlifyJarFile" org.aksw.sparqlify.web.Main -h "$dbHost" -u "$dbUser" -p "$dbPass" -d "$dbName" -m ../linkedgeodata-core/src/main/sparqlify/LinkedGeoData-Triplify-IndividualViews.sparqlify -D
-
-
-#java -cp target/sparqlify-core-jar-with-dependencies.jar org.aksw.sparqlify.web.Main -h localhost -u postgres -p postgres -d lgd -t 10 -c ./mappings/LinkedGeoData-Triplify-IndividualViews.sparqlify -Q 'Construct { ?s ?p ?o } { ?s ?p ?o . Filter(?p = <http://www.opengis.net/ont/geosparql#asWKT>) }'
-
-
-
-
-
-
-
View
@@ -1,90 +0,0 @@
-#!/bin/bash
-
-#
-# Dump script for LinkedGeoData:
-# ./install-lgd.sh data.osm.gz
-#
-#
-#
-#
-
-usage="$(basename "$0") options -- program to dump a LinkedGeoData database
-
-where:
- -h postgres host name
- -d postgres database name
- -u postgres user name
- -p postgres password
- -Q SPARQL query string"
-
-queryString='Construct {?s ?p ?o } {?s ?p ?o } Limit 10'
-
-
-#lgdBasePath="../"
-sparqlifyJarFile="./sparqlify-parent/sparqlify-core/target/sparqlify-core-jar-with-dependencies.jar"
-
-source config.ini.dist
-
-# Use a config.ini file to override any of the settings of this file
-[ -f "./config.ini" ] && source ./config.ini
-
-# Simple function to echo to stderr
-echoerr() { echo "$@" 1>&2; }
-
-# Support for simple command line args
-# Source: http://mywiki.wooledge.org/BashFAQ/035#getopts
-# A POSIX variable
-OPTIND=1 # Reset in case getopts has been used previously in the shell.
-
-while getopts "?h:U:W:d:Q:" opt; do
- case "$opt" in
- \?)
- echoerr "$usage"
- exit 0
- ;;
- h) dbHost="$OPTARG"
- ;;
- U) dbUser="$OPTARG"
- ;;
- W) dbPass="$OPTARG"
- ;;
- d) dbName="$OPTARG"
- ;;
- Q) queryString="$OPTARG"
- ;;
-
- esac
-done
-
-shift $((OPTIND-1))
-
-[ "$1" = "--" ] && shift
-
-
-# Confirm settings before continuation
-echoerr "-------------------------------------------------------------------"
-echoerr "Your settings are:"
-echoerr "Database"
-echoerr " Name: $dbName"
-echoerr " Host: $dbHost"
-echoerr " Username: $dbUser"
-echoerr " Password: $dbPass"
-
-echoerr "Paths:"
-echoerr " Sparqlify path: $sparqlifyJarFile"
-
-echoerr "-------------------------------------------------------------------"
-#read -p "Press [Enter] key to start loading"
-
-
-java -cp "$sparqlifyJarFile" org.aksw.sparqlify.web.Main -h "$dbHost" -u "$dbUser" -p "$dbPass" -d "$dbName" -m ../linkedgeodata-core/src/main/sparqlify/LinkedGeoData-Triplify-IndividualViews.sparqlify -Q "$queryString"
-
-
-#java -cp target/sparqlify-core-jar-with-dependencies.jar org.aksw.sparqlify.web.Main -h localhost -u postgres -p postgres -d lgd -t 10 -c ./mappings/LinkedGeoData-Triplify-IndividualViews.sparqlify -Q 'Construct { ?s ?p ?o } { ?s ?p ?o . Filter(?p = <http://www.opengis.net/ont/geosparql#asWKT>) }'
-
-
-
-
-
-
-
View
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-# A query for tram stops
-
-./run-query-lgd.sh -Q '
-Prefix ogc:<http://www.opengis.net/ont/geosparql#>
-Prefix geom: <http://geovocab.org/geometry#>
-Prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#>
-Prefix lgdo: <http://linkedgeodata.org/ontology/>
-Select * {
- ?a a lgdo:TramRoute .
- ?a lgdo:members ?x .
- ?x ?y ?z .
-}'
-
View
@@ -1,20 +0,0 @@
-#!/bin/bash
-
-# A query for tram stops
-
-./run-query-lgd.sh -Q '
-Prefix ogc:<http://www.opengis.net/ont/geosparql#>
-Prefix geom: <http://geovocab.org/geometry#>
-Prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#>
-Prefix lgdo: <http://linkedgeodata.org/ontology/>
-Select * {
- ?a a lgdo:TramRoute .
- ?a lgdo:members ?x .
- ?x ?y ?z .
- ?z lgdo:ref ?b .
- ?b a lgdo:TramStop .
- ?b rdfs:label ?l .
- ?b geom:geometry ?geom .
- ?geom ogc:asWKT ?geo .
-}'
-
@@ -1,4 +0,0 @@
-#!/bin/bash
-#Just drop the DB according to settings - YET TO BE DONE
-#
-#dropdb lgd -h localhost -U postgres
@@ -0,0 +1,15 @@
+An issue with the install script might be, that Osmosis removes all indexes upon loading a dataset and only re-creates some of them when done.
+
+
+For the deb archive:
+
+The scripts should read configurations by default from the following locations:
+
+~/.config/linkedgeodata/profiles.d/default
+/etc/linkedgeodata/profiles.d/default
+
+
+/etc/linkedgeodata/lgd.conf
+profileBase[0]=~/.....
+profileBase[1]=./
+
File renamed without changes.
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+sparqlifyPath="/tmp/sparqlify-parent"
+
+echo "Building and Installing the Sparqlify Debian Package..."
+
+git clone git://github.com/AKSW/Sparqlify.git "$sparqlifyPath"
+
+cd "$sparqlifyPath"
+git pull
+
+#git checkout devel
+
+make deb
+debFile=`ls -1 sparqlify-debian/target/sparqlify*.deb`
+
+sudo dpkg -i "$debFile"
+
Oops, something went wrong.

0 comments on commit 0716eef

Please sign in to comment.