Revision 6232

View differences:

org.gvsig.vcsgis/trunk/org.gvsig.vcsgis/org.gvsig.vcsgis.lib/org.gvsig.vcsgis.lib.impl/src/main/java/org/gvsig/vcsgis/lib/repository/localdb/tables/DataRepoTable.java
279 279
            }
280 280
            switch (algorithm) {
281 281
                case CHECKOUT_ALGORITHM_USEDBFUNCTION:
282
                default:
283
                    sql = String.format(
284
                            VCSGisUtils.getSqlTemplate(
285
                                    repository.getServerExplorer().getProviderName(),
286
                                    "getDataOfEntityToRevisionNumberUsingDatabaseFunction"),
287
                            revnumber,
288
                            entityCode,
289
                            dataTableName
282
                    String sqltemplate = VCSGisUtils.getSqlTemplate(
283
                            repository.getServerExplorer().getProviderName(),
284
                            "getDataOfEntityToRevisionNumberUsingDatabaseFunction"
290 285
                    );
291
                    if( StringUtils.isNotBlank(sql) ) {
286
                    if( StringUtils.isNotBlank(sqltemplate) ) {
287
                        sql = String.format(
288
                                sqltemplate,
289
                                revnumber,
290
                                entityCode,
291
                                dataTableName
292
                        );
292 293
                        store = repository.openFeatureStore(dataTableName, sql, true);
293 294
                        query = store.createFeatureQuery();
294 295
                        query.setPageSize(1000);
......
298 299
                        features = fset.iterable();
299 300
                        break;
300 301
                    }
302

  
301 303
                case CHECKOUT_ALGORITHM_USESELECT:
304
                default:
302 305
                    if (roi == null || !repository.getCRS().equals(roi.getProjection())) {
303 306
                        sql = String.format(
304 307
                                VCSGisUtils.getSqlTemplate(
org.gvsig.vcsgis/trunk/org.gvsig.vcsgis/org.gvsig.vcsgis.lib/org.gvsig.vcsgis.lib.impl/src/main/java/org/gvsig/vcsgis/lib/repository/localdb/VCSGisRepositoryLocaldbImpl.java
294 294
        } catch (Exception ex) {
295 295
            throw new VCSGisRuntimeException(VCSGisManager.ERR_INVALID_REPOSITORY, "Can't open server explorer.");
296 296
        }
297

  
297
        loadConfigTable();
298
        HooksRepoTable hooksTable = new HooksRepoTable();
299
        this.watchersNotifier = hooksTable.createRepositoryWatchersNotifier(this);
300
        this.watchersNotifier.start();
301
    }
302
    
303
    private void loadConfigTable() {
298 304
        ConfigRepoTable varsTable = new ConfigRepoTable();
299 305
        Map<String, String> vars = varsTable.getVars(this, 
300 306
                CONFIG_REPOSITORY_CODE_NAME, 
......
346 352
            }
347 353
        }        
348 354
        this.setProperty(CONFIG_CHECKOUT_ALGORITHM, algorithm);
349
        HooksRepoTable hooksTable = new HooksRepoTable();
350
        this.watchersNotifier = hooksTable.createRepositoryWatchersNotifier(this);
351
        this.watchersNotifier.start();
352 355
    }
353 356
    
354 357
    private void initialize(JDBCServerExplorerParameters serverParameters, VCSGisCodeGenerator codeGenerator, IProjection crs) {
......
373 376
        varsTable.set(this, CONFIG_REPOSITORY_URL_NAME, "");
374 377
        varsTable.set(this, CONFIG_TRUSTED_CLIENT_URL_NAME, "");
375 378
        varsTable.set(this, CONFIG_REPOSITORY_CRS, crs.getAbrev());
376
        varsTable.set(this, CONFIG_CHECKOUT_ALGORITHM, 
377
                String.format("%s (posible values %s, %s, %s)", 
378
                CHECKOUT_ALGORITHM_USEDBFUNCTION,
379
                CHECKOUT_ALGORITHM_USEDBFUNCTION,
380
                CHECKOUT_ALGORITHM_USESELECT,
381
                CHECKOUT_ALGORITHM_USEAPPFILTER
379
        varsTable.set(this, CONFIG_CHECKOUT_ALGORITHM,  VCSGisUtils.getSqlTemplate(
380
                    this.server.getProviderName(),
381
                    "defaultCheckoutMode"
382 382
            )
383 383
        );
384
//        String.format("%s (posible values %s, %s, %s)", 
385
//            CHECKOUT_ALGORITHM_USEDBFUNCTION,
386
//            CHECKOUT_ALGORITHM_USEDBFUNCTION,
387
//            CHECKOUT_ALGORITHM_USESELECT,
388
//            CHECKOUT_ALGORITHM_USEAPPFILTER
389
//        )
384 390
    }
385 391

  
386 392
    @Override
......
447 453
            this.stores = new HashMap<>();
448 454
            this.code = json.getString("code", null);
449 455
            this.allowAssignTheRevisionDate = json.getBoolean("allowAssignTheRevisionDate", false);
456
            loadConfigTable();
450 457
            HooksRepoTable hooksTable = new HooksRepoTable();
451 458
            this.watchersNotifier = hooksTable.createRepositoryWatchersNotifier(this);
452 459
            this.watchersNotifier.start();
453

  
460
            
454 461
//            this.authenticationRequired = json.getBoolean("authenticationRequired", false);
455 462
            
456 463
        } catch (Exception ex) {
org.gvsig.vcsgis/trunk/org.gvsig.vcsgis/org.gvsig.vcsgis.lib/org.gvsig.vcsgis.lib.impl/src/main/resources/org/gvsig/vcsgis/lib/PostgreSQL.sql
132 132
-- EntityName
133 133
ALTER TABLE "%1$s" ADD PRIMARY KEY ("VCSGISCODE")
134 134
@end alterTableAddPrimaryKeyVCSGISCODE
135

  
136
@begin defaultCheckoutMode
137
USESELECT (posible values USEDBFUNCTION, USESELECT, USEAPPFILTER)
138
@end defaultCheckoutMode
org.gvsig.vcsgis/trunk/org.gvsig.vcsgis/org.gvsig.vcsgis.lib/org.gvsig.vcsgis.lib.impl/src/main/resources/org/gvsig/vcsgis/lib/Oracle.sql
237 237
SELECT * FROM TABLE (VCSGISPKG.CHECKOUT('%2$s', %1$s))
238 238
@end getDataOfEntityToRevisionNumberUsingDatabaseFunction
239 239

  
240
@begin defaultCheckoutMode
241
USEDBFUNCTION (posible values USEDBFUNCTION, USESELECT, USEAPPFILTER)
242
@end defaultCheckoutMode
org.gvsig.vcsgis/trunk/org.gvsig.vcsgis/org.gvsig.vcsgis.lib/org.gvsig.vcsgis.lib.impl/src/main/resources/org/gvsig/vcsgis/lib/H2Spatial.sql
248 248
@rem EntityName
249 249
ALTER TABLE "%1$s" ADD PRIMARY KEY ("VCSGISCODE")
250 250
@end alterTableAddPrimaryKeyVCSGISCODE
251

  
252
@begin defaultCheckoutMode
253
USEAPPFILTER (posible values USEDBFUNCTION, USESELECT, USEAPPFILTER)
254
@end defaultCheckoutMode

Also available in: Unified diff