Strabon

changeset 49:b2625b0d312b

Merging
author Manos Karpathiotakis <mk@di.uoa.gr>
date Wed Mar 14 15:09:21 2012 +0200 (2012-03-14)
parents 4fda8ab4a47e 9199c0cbaa91
children 1fffa78c6e58 17c697469b47
files generaldb/src/main/java/org/openrdf/sail/generaldb/GeneralDBValueFactory.java
line diff
     1.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/GeneralDBTripleRepository.java	Wed Mar 14 15:07:38 2012 +0200
     1.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/GeneralDBTripleRepository.java	Wed Mar 14 15:09:21 2012 +0200
     1.3 @@ -289,6 +289,7 @@
     1.4  				try {
     1.5  					setSelectQuery(stmt, s, p, o, c);
     1.6  					int count = stmt.executeUpdate();
     1.7 +					System.err.println("statement: "+stmt.toString());
     1.8  					statements.removed(id, count);
     1.9  					total += count;
    1.10  				}
     2.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/GeneralDBValueFactory.java	Wed Mar 14 15:07:38 2012 +0200
     2.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/GeneralDBValueFactory.java	Wed Mar 14 15:09:21 2012 +0200
     2.3 @@ -240,13 +240,15 @@
     2.4      public RdbmsLiteral asRdbmsLiteral(GeneralDBPolyhedron polyhedron) {
     2.5              try {
     2.6                      URI wkt = new URIImpl(StrabonPolyhedron.ogcGeometry);
     2.7 -                    RdbmsLiteral literal = new RdbmsLiteral(new LiteralImpl(polyhedron.stringValue(), wkt));
     2.8 +                    RdbmsLiteral literal = new RdbmsLiteral(polyhedron.getInternalId(), polyhedron.getVersion(),new LiteralImpl(polyhedron.stringValue(), wkt));
     2.9  
    2.10                      if (polyhedron instanceof GeneralDBPolyhedron) {
    2.11                              literals.cache(literal);
    2.12                              return (RdbmsLiteral)literal;
    2.13                      }
    2.14 +
    2.15                      RdbmsLiteral lit = literals.findInCache(literal);
    2.16 +                    
    2.17                      if (lit == null) {
    2.18                              lit = new RdbmsLiteral(literal);
    2.19                              literals.cache(lit);
     3.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/managers/TripleManager.java	Wed Mar 14 15:07:38 2012 +0200
     3.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/managers/TripleManager.java	Wed Mar 14 15:09:21 2012 +0200
     3.3 @@ -41,6 +41,7 @@
     3.4  		throws SQLException, InterruptedException
     3.5  	{
     3.6  		statements.insert(ctx, subj, pred, obj);//,intervalStart,intervalEnd);
     3.7 +		System.err.println(subj+", "+pred+", "+obj);
     3.8  	}
     3.9  
    3.10  }