src/java/m/rse/cfactor/V1_0.java
| @@ -142,7 +142,7 @@ |
| + " FROM [dbo].[c_factor]" |
| + " where (geometry::STGeomFromText('POINT(" + lon + " " + lat + ")', 4326).STIntersects([geometry])!= 0);"; |
| |
| - try (Connection c = PGTools.getConnection("cfactor", LOG)) { |
| + try (Connection c = PGTools.getConnection("legacy.cfactor", LOG)) { |
| try (Statement s = c.createStatement()) { |
| try (ResultSet r = s.executeQuery(intersect_polygons)) {; |
| LOG.info("query sql=" + intersect_polygons); |
| @@ -153,7 +153,7 @@ |
| } |
| // If no intersect find C-Factor using step 2 of algorithm |
| if (!r.next()) { |
| - try (Connection c2 = PGTools.getConnection("cfactor", LOG)) { |
| + try (Connection c2 = PGTools.getConnection("legacy.cfactor", LOG)) { |
| try (Statement s2 = c2.createStatement()) { |
| String dist_from_polylines = "SELECT [C_VALUE]" |
| + " ,(geometry::STGeomFromText('POINT(" + lon + " " + lat + ")', 4326).STDistance([geometry])) as distance" |
src/java/m/rse/cfactor/utils/PGTools.java
| @@ -89,6 +89,7 @@ |
| break; |
| |
| case "cfactor": |
| + case "legacy.cfactor": |
| if (datasource == null || !confString.equals(connectionString)) { |
| //Close previous datasource if it exists |
| DataSourceProxy proxy = (DataSourceProxy) datasource; |
web/META-INF/csip-conf.json
| @@ -3,6 +3,7 @@ |
| "csip.logging.enabled": false, |
| "csip.session.backend": "local", |
| "cfactor.db": "jdbc:sqlserver:\/\/129.82.20.241:1433;databaseName=ssurgo;user=sa;password=csurams#1", |
| + "legacy.cfactor.db": "jdbc:sqlserver:\/\/129.82.20.244:1433;databaseName=csip_rse;user=sa;password=csurams#1", |
| "ssurgo.db":"jdbc:postgresql://csip.engr.colostate.edu:5435/ssurgo", |
| "lmod.version": "$version: 0.2.10 452c2816cec7 2015-05-20 $", |
| "csip.session.ttl": "1000" |