Revision 8805

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/VCSGisRepositoryLocaldbImpl.java
142 142
    public static final String CONFIG_CHECKOUT_ALGORITHM = "CHECKOUT_ALGORITHM";
143 143
    public static final String CONFIG_INDEX_GEOMETRIES = "INDEX_GEOMETRIES";
144 144
    public static final String CONFIG_IDENTITY_CONTROLLER = "IDENTITY_CONTROLLER";
145
    public static final String CONFIG_CHECKOUT_WITH_REVNUMBER = "CHECKOUT_WITH_REVNUMBER";
145 146
                
146 147
    public static int create(JDBCServerExplorerParameters serverParameters, VCSGisCodeGenerator codeGenerator, IProjection crs, Envelope tablebbox, boolean indexGeometries ,SimpleTaskStatus status) {
147 148
        if( status == null ) {
......
462 463
        } catch (Exception ex) {
463 464
            throw new VCSGisRuntimeException(VCSGisManager.ERR_INVALID_REPOSITORY, "Can't open server explorer.");
464 465
        }
466
        String crsAbrev = "";
467
        if( crs != null ) {
468
            crsAbrev = crs.getAbrev();
469
        }
465 470
        this.code = this.createUniqueCode();
466 471
        ConfigRepoTable varsTable = new ConfigRepoTable();
467 472
        varsTable.set(this, CONFIG_REPOSITORY_CODE_NAME, this.code);
......
470 475
        varsTable.set(this, CONFIG_PREPARED_WORKING_COPIES_FOLDER_NAME, "");
471 476
        varsTable.set(this, CONFIG_REPOSITORY_URL_NAME, "");
472 477
        varsTable.set(this, CONFIG_TRUSTED_CLIENT_IP_NAME, "");
473
        varsTable.set(this, CONFIG_REPOSITORY_CRS, crs.getAbrev());
478
        varsTable.set(this, CONFIG_REPOSITORY_CRS, crsAbrev);
474 479
        varsTable.set(this, CONFIG_CHECKOUT_ALGORITHM,  VCSGisUtils.getSqlTemplate(
475 480
                    this.server.getProviderName(),
476 481
                    "defaultCheckoutMode"
477 482
            )
478 483
        );
479 484
        varsTable.set(this, CONFIG_INDEX_GEOMETRIES, BooleanUtils.toStringTrueFalse(indexGeometries));
485
        varsTable.set(this, CONFIG_CHECKOUT_WITH_REVNUMBER, "false");
480 486
    }
481 487

  
482 488
    @Override
org.gvsig.vcsgis/trunk/org.gvsig.vcsgis/org.gvsig.vcsgis.lib/org.gvsig.vcsgis.lib.impl/src/main/java/org/gvsig/vcsgis/lib/server/handlers/CheckoutHandler.java
33 33
import javax.json.stream.JsonGenerator;
34 34
import javax.json.stream.JsonGeneratorFactory;
35 35
import org.apache.commons.io.IOUtils;
36
import org.apache.commons.lang3.BooleanUtils;
36 37
import org.apache.commons.lang3.StringUtils;
37 38
import org.apache.commons.lang3.mutable.MutableObject;
38 39
import org.cresques.cts.IProjection;
......
43 44
import org.gvsig.json.Json;
44 45
import org.gvsig.vcsgis.lib.repository.VCSGisRepository;
45 46
import org.gvsig.vcsgis.lib.repository.VCSGisRepositoryData;
47
import org.gvsig.vcsgis.lib.repository.VCSGisRepositoryLocaldb;
48
import org.gvsig.vcsgis.lib.repository.localdb.VCSGisRepositoryLocaldbImpl;
46 49
import org.gvsig.vcsgis.lib.repository.requests.VCSGisCheckoutRequest;
47 50
import org.gvsig.vcsgis.lib.repository.requests.VCSGisRequest;
48 51
import static org.gvsig.vcsgis.lib.server.handlers.AbstractVCSGisServertHandler.LOGGER;
......
113 116
        final VCSGisCheckoutRequest request = (VCSGisCheckoutRequest) req;
114 117
        JsonGenerator gen = null;
115 118
        try {
119
            boolean use_revision_number = false;
120
            try {
121
                if( this.getRepository() instanceof VCSGisRepositoryLocaldb ) {
122
                    VCSGisRepositoryLocaldb repo = (VCSGisRepositoryLocaldb) this.getRepository();
123
                    String use_revision_number_s = repo.getConfigValue(VCSGisRepositoryLocaldbImpl.CONFIG_CHECKOUT_WITH_REVNUMBER);
124
                    use_revision_number = BooleanUtils.toBoolean(use_revision_number_s);
125
                }
126
            } catch(Exception ex) {
127
                LOGGER.debug("Can't retrieve use_revision_number value",ex);
128
            }
116 129
            JsonGeneratorFactory genFactory = Json.createGeneratorFactory(
117 130
                Collections.singletonMap(JsonGenerator.PRETTY_PRINTING, true)
118 131
            );
......
141 154
                gen.writeStartObject();
142 155
                gen.write("DataCode", data.getDataCode());
143 156
                gen.write("Data", data.getData());
157
                if( use_revision_number ) {
158
                    gen.write("RevisionNumber", data.getRevisionNumber());
159
                }
144 160
                gen.writeEnd(); 
145 161
                gen.flush();
146 162
            }

Also available in: Unified diff