Revision 13999 branches/v10/extensions/extOracleSpatial/src/es/prodevelop/cit/gvsig/fmap/drivers/jdbc/oracle/OracleSpatialDriver.java

View differences:

OracleSpatialDriver.java
171 171
    public static final int ID_COLUMN_INDEX = 1;
172 172
    public static final String ORACLE_GEOMETADATA_VIEW = "ALL_SDO_GEOM_METADATA";
173 173
    public static final String ORACLE_EPSG_TABLE_NAME = "ORA_EPSG";
174
    public static final String ORACLE_EPSG_FILE_NAME = "ora_epsg.dbf";
174
    public static final String ORACLE_EPSG_FILE_NAME = "ORA_EPSG.DBF";
175 175
    public static final String DEFAULT_GEO_FIELD = "GEOMETRY";
176 176
    public static final String ORACLE_ID_FIELD = "ROWID";
177 177
    public static final String DEFAULT_ID_FIELD = "GID";
......
3205 3205

  
3206 3206
        // ---------------------------------------------
3207 3207
        FileSourceInfo fsi = new FileSourceInfo();
3208
        fsi.file = createFileString("dbf/" + ORACLE_EPSG_FILE_NAME);
3208
        fsi.file = createFileString("dbf", ORACLE_EPSG_FILE_NAME);
3209
        
3209 3210
        fsi.spatial = false;
3210 3211
        fsi.name = ORACLE_EPSG_TABLE_NAME;
3211 3212
        fsi.driverName = dbfdrv.getName(); //"DBF Driver";
......
3233 3234
        sds.setDataSourceFactory(dsf);
3234 3235
    }
3235 3236

  
3236
    private static String createFileString(String path) {
3237
    private static String createFileString(String folder, String _filename) {
3238
    	
3239
    	String filename = _filename.toUpperCase();
3240
    	
3237 3241
        try {
3238 3242
            File f = new File(
3239
                    "./gvSIG/extensiones/" + EXTENSION_DIR_NAME + "/" +
3240
                    path);
3243
                    "./gvSIG/extensiones/" + EXTENSION_DIR_NAME + "/" + folder + "/" +
3244
                    filename);
3245
            
3246
            if (!f.exists()) {
3247
            	filename = filename.toLowerCase();
3248
            	f = new File("./gvSIG/extensiones/"
3249
            			+ EXTENSION_DIR_NAME + "/" + folder + "/" + filename);
3250
            }
3241 3251

  
3242 3252
            return f.getCanonicalPath();
3243 3253
        }
3244 3254
        catch (Exception ex) {
3245
            return "./gvSIG/extensiones/" + EXTENSION_DIR_NAME + "/" +
3246
            path;
3255
            return "./gvSIG/extensiones/" + EXTENSION_DIR_NAME + "/" + folder + "/" +
3256
            _filename;
3247 3257
        }
3248 3258
    }
3249 3259

  

Also available in: Unified diff