Strabon
changeset 762:33f3fa561579 temporals
various changes
| author | Konstantina Bereta <Konstantina.Bereta@di.uoa.gr> |
|---|---|
| date | Sat Dec 01 20:07:42 2012 +0200 (2012-12-01) |
| parents | 07d584b2fb5b |
| children | d715fd304e9e |
| files | postgis/src/main/java/org/openrdf/sail/postgis/evaluation/PostGISQueryBuilder.java runtime/src/main/java/eu/earthobservatory/runtime/generaldb/NQuadsParser.java runtime/src/main/java/eu/earthobservatory/runtime/generaldb/NQuadsTranslator.java runtime/src/main/java/eu/earthobservatory/runtime/generaldb/QuadRDFHandler.java runtime/src/main/java/eu/earthobservatory/runtime/generaldb/Strabon.java scripts/strabon scripts/strabon.conf |
line diff
1.1 --- a/postgis/src/main/java/org/openrdf/sail/postgis/evaluation/PostGISQueryBuilder.java Thu Nov 29 19:18:37 2012 +0200 1.2 +++ b/postgis/src/main/java/org/openrdf/sail/postgis/evaluation/PostGISQueryBuilder.java Sat Dec 01 20:07:42 2012 +0200 1.3 @@ -1499,10 +1499,6 @@ 1.4 } 1.5 } 1.6 ///// 1.7 - 1.8 - 1.9 - 1.10 - 1.11 1.12 filter.openBracket(); 1.13 if (expr.getLeftArg() instanceof GeneralDBSqlTemporalConstructBinary)
2.1 --- a/runtime/src/main/java/eu/earthobservatory/runtime/generaldb/NQuadsParser.java Thu Nov 29 19:18:37 2012 +0200 2.2 +++ b/runtime/src/main/java/eu/earthobservatory/runtime/generaldb/NQuadsParser.java Sat Dec 01 20:07:42 2012 +0200 2.3 @@ -203,22 +203,57 @@ 2.4 { 2.5 String strdf = "http://strdf.di.uoa.gr/ontology#validTime"; 2.6 validTimeLiteral=sb; 2.7 + int i2=0; 2.8 + 2.9 if(sb.toString().contains("^^<http://strdf.di.uoa.gr/ontology#validTime>")) 2.10 { 2.11 2.12 String[] splits = sb.toString().split(","); 2.13 int i1 = splits[0].indexOf('['); 2.14 - int i2 = splits[1].indexOf(']'); 2.15 + if (splits[1].contains("]")) 2.16 + i2 = splits[1].indexOf(']'); 2.17 + else if (splits[1].contains(")")) 2.18 + { 2.19 + i2 = splits[1].indexOf(')'); 2.20 + } 2.21 String element1 = splits[0].substring(++i1); 2.22 String element2 = splits[1].substring(0,i2); 2.23 //System.out.println("element2"+element2); 2.24 DateFormat dateformat = DateFormat.getDateTimeInstance(DateFormat.MEDIUM, 2.25 DateFormat.SHORT); 2.26 - int syn = element1.indexOf('+'); 2.27 + String startDate=null; 2.28 + String endDate=null; 2.29 + 2.30 + int syn=0; 2.31 + 2.32 + if (element1.contains("+")) 2.33 + { 2.34 + syn = element1.indexOf('+'); 2.35 + if (syn<0) 2.36 + syn = element1.indexOf('+'); 2.37 + 2.38 + startDate = element2.substring(0,syn); 2.39 + } 2.40 + else 2.41 + { 2.42 + startDate = element1; 2.43 + } 2.44 //System.out.println("element1 = "+element1); 2.45 - String startDate = element1.substring(0,syn); 2.46 - syn = element2.indexOf('+'); 2.47 - String endDate = element2.substring(0,syn); 2.48 + 2.49 + 2.50 + if (element2.contains("+")) 2.51 + { 2.52 + syn = element2.indexOf('+'); 2.53 + if (syn<0) 2.54 + syn = element2.indexOf('+'); 2.55 + endDate = element2.substring(0,syn); 2.56 + 2.57 + } 2.58 + else 2.59 + { 2.60 + endDate = element2; 2.61 + } 2.62 + 2.63 SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); 2.64 Date start = format.parse(startDate); 2.65 //System.out.println("start date:"+startDate.toString());
3.1 --- a/runtime/src/main/java/eu/earthobservatory/runtime/generaldb/NQuadsTranslator.java Thu Nov 29 19:18:37 2012 +0200 3.2 +++ b/runtime/src/main/java/eu/earthobservatory/runtime/generaldb/NQuadsTranslator.java Sat Dec 01 20:07:42 2012 +0200 3.3 @@ -54,6 +54,7 @@ 3.4 3.5 parser.setRDFHandler(handler); 3.6 try { 3.7 + 3.8 parser.parse(is, "http://test.base.uri"); 3.9 handledTriples = handler.getTriples(); 3.10 // System.out.println("HANDLED TRIPLES: "+handledTriples.toString());
4.1 --- a/runtime/src/main/java/eu/earthobservatory/runtime/generaldb/QuadRDFHandler.java Thu Nov 29 19:18:37 2012 +0200 4.2 +++ b/runtime/src/main/java/eu/earthobservatory/runtime/generaldb/QuadRDFHandler.java Sat Dec 01 20:07:42 2012 +0200 4.3 @@ -27,7 +27,7 @@ 4.4 4.5 public class QuadRDFHandler extends StatementCollector { 4.6 4.7 - private StringBuffer triples = new StringBuffer(1024); 4.8 + private StringBuffer triples = new StringBuffer(4096); 4.9 4.10 4.11 @Override 4.12 @@ -65,7 +65,14 @@ 4.13 Resource graph = parser.createValidTimeURI(validPeriod); 4.14 4.15 String triple = "<"+graph.toString()+">"+ " <http://strdf.di.uoa.gr/ontology#hasValidTime> "+ validPeriod+ " .\n" ; 4.16 - triples.append(triple); 4.17 + if (!triples.toString().contains(triple)) 4.18 + { 4.19 + triples.append(triple); 4.20 + System.out.println("TRIPLE:"+triple); 4.21 + 4.22 + } 4.23 + 4.24 + 4.25 } catch (RDFParseException e) { 4.26 // TODO Auto-generated catch block 4.27 e.printStackTrace();
5.1 --- a/runtime/src/main/java/eu/earthobservatory/runtime/generaldb/Strabon.java Thu Nov 29 19:18:37 2012 +0200 5.2 +++ b/runtime/src/main/java/eu/earthobservatory/runtime/generaldb/Strabon.java Sat Dec 01 20:07:42 2012 +0200 5.3 @@ -485,6 +485,7 @@ 5.4 { 5.5 NQuadsTranslator translator = new NQuadsTranslator(); 5.6 Collection<Statement> statements = translator.translate(in, baseURI); 5.7 + System.out.println("Translated NQUADS to NTRIPLES!"); 5.8 Iterator iterator = statements.iterator(); 5.9 for(Statement st: statements) 5.10 {
6.1 --- a/scripts/strabon Thu Nov 29 19:18:37 2012 +0200 6.2 +++ b/scripts/strabon Sat Dec 01 20:07:42 2012 +0200 6.3 @@ -464,7 +464,7 @@ 6.4 else 6.5 FORMAT="${1}" 6.6 case "${FORMAT}" in 6.7 - ntriples|n3|rdfxml|turtle) 6.8 + ntriples|n3|rdfxml|turtle|nquads) 6.9 shift 6.10 ;; 6.11 *)
7.1 --- a/scripts/strabon.conf Thu Nov 29 19:18:37 2012 +0200 7.2 +++ b/scripts/strabon.conf Sat Dec 01 20:07:42 2012 +0200 7.3 @@ -14,13 +14,13 @@ 7.4 HOST=localhost 7.5 7.6 # the username to be used for the database connection 7.7 -DBUSER=endpoint 7.8 +DBUSER=postgres 7.9 7.10 # the password to be used for the database connection 7.11 -DBPASS=endpoint 7.12 +DBPASS=p1r3as 7.13 7.14 # the database to connect to 7.15 -DB=teleios-m18 7.16 +DB=clc_cha 7.17 7.18 # one of true or false 7.19 -DEBUG=false 7.20 +DEBUG=true