Revision 32626

View differences:

branches/v2_0_0_prep/libraries/org.gvsig.fmap.dal.cache/src/main/java/org/gvsig/fmap/dal/cache/h2spatial/FeatureCacheH2SpatialProvider.java
79 79
//			}
80 80
//			efad.setSize(fads[i].getSize());
81 81
//		}
82
		
82
		eft.add("IDPK", DataTypes.LONG);
83 83
		parameters.setDefaultFeatureType(eft);
84 84
		calculateFieldsPosition();
85 85
		
......
101 101
	}	
102 102
	
103 103
	private void calculateFieldsPosition() throws DataException{
104
		FeatureType featureType = featureStoreProviderServices.getDefaultFeatureType();
104
		double d=0;
105
		FeatureType featureType = ((FeatureStore)featureStores.get(d)).getDefaultFeatureType();//featureStoreProviderServices.getDefaultFeatureType();
105 106
		Iterator it = featureType.iterator();
106 107
		fieldsPosition = new HashMap();
107 108
		int i=0;
......
117 118
	private NewFeatureStoreParameters createDataStoreParameters(double scale) throws DataException {
118 119
		NewFeatureStoreParameters parameters = (NewFeatureStoreParameters)dataServerExplorer.getAddParameters("H2Spatial");
119 120
//		File rootFile = ((FilesystemServerExplorer)dataServerExplorer).getCurrentPath();
120
		parameters.setDynValue("dbname",  System.getProperty("user.home")+File.separator+"gvsigcache"+File.separator+"cache.db");
121
//		parameters.setUrl(rootFile.getAbsolutePath());
121
		parameters.setDynValue("dbname",  System.getProperty("user.home")+File.separator+"gvsigcache"+File.separator+"cache");
122
		parameters.setDynValue("schema", "PUBLIC");
123
		
122 124
		parameters.setDynValue("table",getStoreIdByScale(scale));
123 125
		parameters.setDynValue(FIELD_SRS, sourceProjection);
124 126
		return parameters;
125 127
	}
126 128

  
127 129
	private String getStoreIdByScale(double scale) {
128
//		String cacheName = featureStoreProvider.getSourceId().toString();
129
//		cacheName = cacheName.substring(cacheName.lastIndexOf("/"), cacheName.length());
130
//		cacheName = stringUtils.replaceAll(cacheName, "\\.", "_"); 
131
//		cacheName = stringUtils.replaceAll(cacheName, ":", "_"); 
132
//		return cacheName + "_" + stringUtils.replaceAll(String.valueOf(scale), "\\.", "_");
133
		return "tablaprueba";
130
		String cacheName = featureStoreProvider.getSourceId().toString();
131
		cacheName = cacheName.substring(cacheName.lastIndexOf("/")+1, cacheName.length());
132
		cacheName = stringUtils.replaceAll(cacheName, "\\.", "_"); 
133
		cacheName = stringUtils.replaceAll(cacheName, ":", "_"); 
134
		return cacheName + "_" + stringUtils.replaceAll(String.valueOf(scale), "\\.", "_").toUpperCase();
135
//		return "tablaprueba";
134 136
	}
135 137

  
136 138
	@Override

Also available in: Unified diff