Changeset 49:b2625b0d312b


Ignore:
Timestamp:
03/14/12 15:09:21 (6 years ago)
Author:
Manos Karpathiotakis <mk@…>
Branch:
default
Children:
50:1fffa78c6e58, 53:17c697469b47
Parents:
48:4fda8ab4a47e (diff), 45:9199c0cbaa91 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merging

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • generaldb/src/main/java/org/openrdf/sail/generaldb/GeneralDBValueFactory.java

    r45 r49  
    372372         */ 
    373373 
    374         public GeneralDBPolyhedron getRdbmsPolyhedron(Number num, String datatype, byte[] pointSet)  { 
     374        public GeneralDBPolyhedron getRdbmsPolyhedron(Number num, String datatype, byte[] wkb, int srid)  { 
    375375 
    376376                Number id = ids.idOf(num); 
    377377                try { 
    378                         return new GeneralDBPolyhedron(id, literals.getIdVersion(), vf.createURI(datatype), pointSet); 
     378                        return new GeneralDBPolyhedron(id, literals.getIdVersion(), vf.createURI(datatype), wkb, srid); 
    379379                } catch (IOException e) { 
    380380                        e.printStackTrace(); 
  • generaldb/src/main/java/org/openrdf/sail/generaldb/GeneralDBValueFactory.java

    r47 r49  
    241241            try { 
    242242                    URI wkt = new URIImpl(StrabonPolyhedron.ogcGeometry); 
    243                     RdbmsLiteral literal = new RdbmsLiteral(new LiteralImpl(polyhedron.stringValue(), wkt)); 
     243                    RdbmsLiteral literal = new RdbmsLiteral(polyhedron.getInternalId(), polyhedron.getVersion(),new LiteralImpl(polyhedron.stringValue(), wkt)); 
    244244 
    245245                    if (polyhedron instanceof GeneralDBPolyhedron) { 
     
    247247                            return (RdbmsLiteral)literal; 
    248248                    } 
     249 
    249250                    RdbmsLiteral lit = literals.findInCache(literal); 
     251                     
    250252                    if (lit == null) { 
    251253                            lit = new RdbmsLiteral(literal); 
Note: See TracChangeset for help on using the changeset viewer.