changeset 546:210716612c30

Removed Encodingerrors from listed Files. All Files are now UTF-8 compliant. geo-backend/trunk@517 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Tim Englich <tim.englich@intevation.de>
date Fri, 08 Jan 2010 14:40:08 +0000 (2010-01-08)
parents 347c84467478
children 23d5cc37dd5b
files geo-backend/ChangeLog geo-backend/src/main/java/de/intevation/gnv/geobackend/base/connectionpool/ConnectionPoolFactory.java geo-backend/src/main/java/de/intevation/gnv/geobackend/sde/datasources/ArcSDEConnection.java geo-backend/src/main/java/de/intevation/gnv/geobackend/sde/datasources/ArcSDEStatement.java geo-backend/src/main/java/de/intevation/gnv/geobackend/sde/datasources/Row.java geo-backend/src/main/java/de/intevation/gnv/geobackend/sde/datasources/SDEQuery.java
diffstat 6 files changed, 17 insertions(+), 64 deletions(-) [+]
line wrap: on
line diff
--- a/geo-backend/ChangeLog	Tue Jan 05 15:08:01 2010 +0000
+++ b/geo-backend/ChangeLog	Fri Jan 08 14:40:08 2010 +0000
@@ -1,3 +1,12 @@
+2010-01-08  Tim Englich  <tim.englich@intevation.de>
+
+	* src/main/java/de/intevation/gnv/geobackend/sde/datasources/SDEQuery.java,
+	  src/main/java/de/intevation/gnv/geobackend/sde/datasources/Row.java,
+	  src/main/java/de/intevation/gnv/geobackend/sde/datasources/ArcSDEStatement.java, 
+	  src/main/java/de/intevation/gnv/geobackend/sde/datasources/ArcSDEConnection.java, 
+	  src/main/java/de/intevation/gnv/geobackend/base/connectionpool/ConnectionPoolFactory.java (initializeConnectionPool): 
+	  Removed Encodingerrors from listed Files. All Files are now UTF-8 compliant.
+
 2010-01-05  Tim Englich  <tim.englich@intevation.de>
 
 	* src/main/java/de/intevation/gnv/geobackend/sde/datasources/RasterObject.java:
--- a/geo-backend/src/main/java/de/intevation/gnv/geobackend/base/connectionpool/ConnectionPoolFactory.java	Tue Jan 05 15:08:01 2010 +0000
+++ b/geo-backend/src/main/java/de/intevation/gnv/geobackend/base/connectionpool/ConnectionPoolFactory.java	Fri Jan 08 14:40:08 2010 +0000
@@ -67,7 +67,7 @@
     public void initializeConnectionPool(Properties properties){
         log.debug("ConnectionPoolFactory.initializeConnectionPool");
         if (this.connectionPool == null){
-            //TODO: Hier k�nnte anhand eines Flags die Instanz des Connectionpools umgeschaltet werden.
+            //TODO: Here it might be possible to switch the ConnectionPoolInstance using a FLAG.
             this.connectionPool = new ArcSDEConnectionPool();
             this.connectionPool.initialize(properties);
         }else{
--- a/geo-backend/src/main/java/de/intevation/gnv/geobackend/sde/datasources/ArcSDEConnection.java	Tue Jan 05 15:08:01 2010 +0000
+++ b/geo-backend/src/main/java/de/intevation/gnv/geobackend/sde/datasources/ArcSDEConnection.java	Fri Jan 08 14:40:08 2010 +0000
@@ -99,7 +99,6 @@
 	 */
 	public Statement createStatement(int resultSetType, int resultSetConcurrency)
 	        throws SQLException {
-		// TODO: �bergabeparameter beachten ?
 		return new ArcSDEStatement(this);
 	}
 
@@ -109,7 +108,6 @@
 	public Statement createStatement(int resultSetType,
 	        int resultSetConcurrency, int resultSetHoldability)
 	        throws SQLException {
-		// TODO: �bergabeparameter beachten?
 		return new ArcSDEStatement(this);
 	}
 
--- a/geo-backend/src/main/java/de/intevation/gnv/geobackend/sde/datasources/ArcSDEStatement.java	Tue Jan 05 15:08:01 2010 +0000
+++ b/geo-backend/src/main/java/de/intevation/gnv/geobackend/sde/datasources/ArcSDEStatement.java	Fri Jan 08 14:40:08 2010 +0000
@@ -169,20 +169,20 @@
 	            int pos = where.indexOf("intersects");
 	            if (pos >= 0 ){
 	                String substr =  where.substring(pos);
-	                where = where.substring(0,where.lastIndexOf("intersects")); // TODO auch or unterst�tzen
+	                where = where.substring(0,where.lastIndexOf("intersects"));
 	                int andPos = where.lastIndexOf("and");
 	                if (andPos < 0){
 	                    andPos = 0;
 	                }
-	                where = where.substring(0,andPos); // TODO auch or unterst�tzen
-	                String intersectsStmt = substr.substring(0, substr.lastIndexOf(")")); // Annahme r�umliches Stmt steht am Ende
+	                where = where.substring(0,andPos); // TODO support or also
+	                String intersectsStmt = substr.substring(0, substr.lastIndexOf(")")); // Spatial-Statment is the last one
 	                String wkt = null;
 	                if (intersectsStmt.contains("select")){
 	                    // Anstelle eines WKT ist ein InnerSelect zum Bestimmen der Comparatorgeometrie gegeben.
 	                    String stmt = intersectsStmt.substring(intersectsStmt.indexOf("select"),intersectsStmt.lastIndexOf(")"));
 	                    ResultSet resultSet = this.executeQuery(stmt);
 	                    if (resultSet != null && resultSet.next()){
-	                        // TODO Selektion von mehreren Geometrien unterst�tzen.
+	                        // TODO: Support the selection of more than one Geometry
 	                        wkt = resultSet.getString("SHAPE");
 	                    }
 	                }else{
--- a/geo-backend/src/main/java/de/intevation/gnv/geobackend/sde/datasources/Row.java	Tue Jan 05 15:08:01 2010 +0000
+++ b/geo-backend/src/main/java/de/intevation/gnv/geobackend/sde/datasources/Row.java	Fri Jan 08 14:40:08 2010 +0000
@@ -285,7 +285,7 @@
                        }
                     }
                     returnValue.append(")");
-                    // TODO Wie werden innere Ringe unterst�tzt.
+                    // TODO How are Rings supported
 //                    for (int i =1 ; i < aList.size(); i++){
 //                        returnValue.append("(");
 //                        mPoint = (SDEPoint[])aList.get(i);
--- a/geo-backend/src/main/java/de/intevation/gnv/geobackend/sde/datasources/SDEQuery.java	Tue Jan 05 15:08:01 2010 +0000
+++ b/geo-backend/src/main/java/de/intevation/gnv/geobackend/sde/datasources/SDEQuery.java	Fri Jan 08 14:40:08 2010 +0000
@@ -196,34 +196,7 @@
         Connection con = null;
         try {
             con = getConnection();
-//            // get the layer for querying
-//            SeLayer lLayer = new SeLayer(con, pLayername, pSpatialColumnName);
-//            SeCoordinateReference cref = lLayer.getCoordRef();
-//
-//
-//            SeShape shape = new SeShape();
-//            shape.setCoordRef(lLayer.getCoordRef());
-//            SDEPoint[] lPoints = ArcSDEUtils.createPoints(pPoints);
-//
-//            /*
-//            * int�numPts, int�numParts, int[]�partOffsets,SDEPoint[]�ptArray
-//            * */
-//            shape.generatePolygon(lPoints.length, 1, null, lPoints);
-//            SeShapeFilter filter = new SeShapeFilter(pLayername, pSpatialColumnName, shape, SeFilter.METHOD_AI);
-//            SeShapeFilter[] filters = new SeShapeFilter[1];
-//            filters[0] = filter;
-//
-//            SeQuery spatialQuery = null;
-//            SeSqlConstruct sqlCons = new SeSqlConstruct(pLayername);
-//            spatialQuery = new SeQuery(con, pReturnFields, sqlCons);
-//            spatialQuery.prepareQuery();
-//            /*
-//            *   Set spatial constraints
-//            */
-//            spatialQuery.setSpatialConstraints(SeQuery.SE_OPTIMIZE, false, filters);
-//            spatialQuery.execute();
-
-            return null;//handleResultSet(spatialQuery);
+            return null;
 
         } catch (TechnicalException e) {
             sLogger.error(e.getMessage(), e);
@@ -253,34 +226,7 @@
         Connection con = null;
         try {
             con = getConnection();
-//            // get the layer for querying
-//            SeLayer lLayer = new SeLayer(con, pLayername, pSpatialColumnName);
-//            SeCoordinateReference cref = lLayer.getCoordRef();
-//
-//
-//            SeShape shape = new SeShape();
-//            shape.setCoordRef(lLayer.getCoordRef());
-//            SDEPoint[] lPoints = ArcSDEUtils.createPoints(pPoints);
-//
-//            /*
-//            * int�numPts, int�numParts, int[]�partOffsets,SDEPoint[]�ptArray
-//            * */
-//            shape.generatePolygon(lPoints.length, 1, null, lPoints);
-//            SeShapeFilter filter = new SeShapeFilter(pLayername, pSpatialColumnName, shape, SeFilter.METHOD_AI);
-//            SeShapeFilter[] filters = new SeShapeFilter[1];
-//            filters[0] = filter;
-//
-//            SeQuery spatialQuery = null;
-//            SeSqlConstruct sqlCons = new SeSqlConstruct(pLayername,pWhere);
-//            spatialQuery = new SeQuery(con, pReturnFields, sqlCons);
-//            spatialQuery.prepareQuery();
-//            /*
-//            *   Set spatial constraints
-//            */
-//            spatialQuery.setSpatialConstraints(SeQuery.SE_OPTIMIZE, false, filters);
-//            spatialQuery.execute();
-
-            return null;//handleResultSet(spatialQuery);
+            return null;
 
         } catch (TechnicalException e) {
             sLogger.error(e.getMessage(), e);

http://dive4elements.wald.intevation.org