Strabon
changeset 883:0a6878442590 temporals
Merge with default branch.
author | Panayiotis Smeros <psmeros@di.uoa.gr> |
---|---|
date | Wed Feb 27 18:49:27 2013 +0200 (2013-02-27) |
parents | 6cd4c06a3557 47b0fb531588 |
children | 1fc6edc57974 ffd0338e5af3 |
files | evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/GeoConstants.java runtime/src/main/java/eu/earthobservatory/runtime/generaldb/Strabon.java runtime/src/main/resources/log4j.properties scripts/strabon |
line diff
1.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/GeoConstants.java Tue Feb 26 23:27:19 2013 +0200 1.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/GeoConstants.java Wed Feb 27 18:49:27 2013 +0200 1.3 @@ -29,10 +29,15 @@ 1.4 public static final String stRDF = "http://strdf.di.uoa.gr/ontology#"; 1.5 1.6 /** 1.7 + * The namespace for the RDFi framework 1.8 + */ 1.9 + public static final String rdfi = "http://rdfi.di.uoa.gr/ontology#"; 1.10 + 1.11 + /** 1.12 * The URI for the datatype SemiLinearPointSet 1.13 * (linear constraint-based representation of geometries) 1.14 */ 1.15 - public static final String stRDFSemiLinearPointset = stRDF + "SemiLinearPointSet"; 1.16 + public static final String stRDFSemiLinearPointset = stRDF + "SemiLinearPointSet"; 1.17 1.18 /** 1.19 * The URI for the datatype Well-Known Text (WKT) 1.20 @@ -185,4 +190,17 @@ 1.21 */ 1.22 public static final String diffDateTime = "http://strdf.di.uoa.gr/extensions/ontology#diffDateTime"; 1.23 /** End of addition **/ 1.24 + 1.25 + 1.26 + /** 1.27 + * RCC-8 relations for the RDFi framework 1.28 + */ 1.29 + public static final String rdfiDC = rdfi + "DC"; 1.30 + public static final String rdfiEC = rdfi + "EC"; 1.31 + public static final String rdfiPO = rdfi + "PO"; 1.32 + public static final String rdfiNTPP = rdfi + "NTPP"; 1.33 + public static final String rdfiNTPPi = rdfi + "NTPPi"; 1.34 + public static final String rdfiTPP = rdfi + "TPP"; 1.35 + public static final String rdfiTPPi = rdfi + "TPPi"; 1.36 + public static final String rdfiEQ = rdfi + "EQ"; 1.37 }
2.1 --- a/runtime/src/main/java/eu/earthobservatory/runtime/generaldb/Strabon.java Tue Feb 26 23:27:19 2013 +0200 2.2 +++ b/runtime/src/main/java/eu/earthobservatory/runtime/generaldb/Strabon.java Wed Feb 27 18:49:27 2013 +0200 2.3 @@ -491,10 +491,8 @@ 2.4 logger.info("[Strabon.storeURL] Storing file."); 2.5 logger.info("[Strabon.storeURL] URL : {}", url.toString()); 2.6 logger.info("[Strabon.storeURL] Context : {}", ((context == null) ? "default" : context)); 2.7 - if (logger.isDebugEnabled()) { 2.8 - logger.debug("[Strabon.storeURL] Base URI : {}", ((baseURI == null) ? url.toExternalForm() : baseURI)); 2.9 - logger.debug("[Strabon.storeURL] Format : {}", ((format == null) ? "null" : format)); 2.10 - } 2.11 + logger.info("[Strabon.storeURL] Base URI : {}", ((baseURI == null) ? "null" : baseURI)); 2.12 + logger.info("[Strabon.storeURL] Format : {}", ((format == null) ? "null" : format)); 2.13 2.14 InputStream in = (InputStream) url.openStream(); 2.15 InputStreamReader reader = new InputStreamReader(in);
3.1 --- a/runtime/src/main/resources/log4j.properties Tue Feb 26 23:27:19 2013 +0200 3.2 +++ b/runtime/src/main/resources/log4j.properties Wed Feb 27 18:49:27 2013 +0200 3.3 @@ -1,6 +1,6 @@ 3.4 # logger level values: OFF, ERROR, WARN, INFO, DEBUG, ALL 3.5 -log4j.rootLogger=ALL, CA 3.6 -log4j.rootLogger=DEBUG, CA 3.7 +log4j.rootLogger=INFO, CA 3.8 +#log4j.rootLogger=DEBUG, CA 3.9 #log4j.rootLogger=INFO, CA, FA 3.10 3.11 # Console Appender
4.1 --- a/scripts/strabon Tue Feb 26 23:27:19 2013 +0200 4.2 +++ b/scripts/strabon Wed Feb 27 18:49:27 2013 +0200 4.3 @@ -71,6 +71,9 @@ 4.4 # further options for java 4.5 JAVA_OPTS= 4.6 4.7 +# base max memory memory 4.8 +BASE_MEMORY=1024 4.9 + 4.10 # more memory 4.11 MORE_MEMORY="-Xms512M -Xmx1024M" 4.12 4.13 @@ -105,8 +108,9 @@ 4.14 echo " -d : don't run, just print what shall be executed" 4.15 echo " Variable for configuration file: \`DEBUG'" 4.16 echo " Values: \`true' or \`false'" 4.17 - echo " -m : use more memory \`${MORE_MEMORY}' (useful in \"out of memory exceptions\"" 4.18 - echo " -M : use much more memory \`${MMORE_MEMORY}' (useful in \"out of memory exceptions\"" 4.19 + echo " -m : use more memory \`${MORE_MEMORY}' (useful in \"out of memory exceptions\")" 4.20 + echo " -M : use much more memory \`${MMORE_MEMORY}' (useful in \"out of memory exceptions\")" 4.21 + echo " -MM MULT : use MULT * ${BASE_MEMORY} MB of memory (useful in \"out of memory exceptions\")" 4.22 echo " -i : include URI prefixes in the SPARQL query. Prefixes are taken from file" 4.23 echo " \`prefixes.sparql'" 4.24 echo " -e DATABASE : the database engine to connect (one of \`postgis' (default) or \`monetdb')" 4.25 @@ -222,6 +226,22 @@ 4.26 fi 4.27 shift 4.28 ;; 4.29 + -MM) 4.30 + shift 4.31 + if ! test $# -gt 1; then 4.32 + help 4.33 + exit 1 4.34 + fi 4.35 + MULT=${1} 4.36 + 4.37 + if ! ${MEMORY_INCREASED}; then 4.38 + JAVA_OPTS="${JAVA_OPTS} -Xms512M -Xmx$((${MULT}*${BASE_MEMORY}))M" 4.39 + MEMORY_INCREASED=true 4.40 + else 4.41 + echo "${CMD}: memory has already been increased; option \`${1}' will be ignored." 4.42 + fi 4.43 + shift 4.44 + ;; 4.45 -i) 4.46 shift 4.47 PREFIXES="$(cat ${PREFIXES_FILE})