Revision 47486 trunk/org.gvsig.desktop/org.gvsig.desktop.plugin/org.gvsig.xml2db/org.gvsig.xml2db.lib/org.gvsig.xml2db.lib.impl/src/main/java/org/gvsig/xml2db/lib/impl/DefaultXml2dbManager.java

View differences:

DefaultXml2dbManager.java
102 102
103 103 
    @Override
104 104 
    public JDBCServerExplorerParameters createDatabase(File dbfile, XMLInfo xmlinfo, SimpleTaskStatus taskStatus) {
105 
        return addToDatabase(dbfile, xmlinfo, taskStatus, true);
106 
    }
107
108 
    @Override
109 
    public JDBCServerExplorerParameters addToDatabase(File dbfile, XMLInfo xmlinfo, SimpleTaskStatus taskStatus) {
110 
        return addToDatabase(dbfile, xmlinfo, taskStatus, false);
111 
    }
112
113 
    private JDBCServerExplorerParameters addToDatabase(File dbfile, XMLInfo xmlinfo, SimpleTaskStatus taskStatus, boolean createDB) {
105 114 
        try {
106 115 
            taskStatus = SimpleTaskStatus.get(taskStatus);
107 116
......
124 133 
            if( !H2SpatialUtils.existsH2db(dbfile) ) {
125 134 
                server.dropCaches();
126 135 
            }
127 

  		




  128
  
  
    
            dbworkspace.create(repoID, null);


  		




  129
  136
  
    
            


  		




  
  137
  
    
            if(createDB) {


  		




  
  138
  
    
                dbworkspace.create(repoID, null);


  		




  
  139
  
    
            }


  		




  
  140
  
    
            


  		




  130
  141
  
    

  		




  131
  142
  
    
            taskStatus.message(i18n.getTranslation("_Creating_tables"));


  		




  132
  143
  
    
            taskStatus.setRangeOfValues(0, xmlinfo.size());


  		




  ......




  143
  154
  
    
            taskStatus.setRangeOfValues(0, xmlinfo.size());


  		




  144
  155
  
    
            for (DataStoreParameters storeParams : server.list()) {


  		




  145
  156
  
    
                JDBCStoreParameters featureStoreParams = (JDBCStoreParameters)storeParams;


  		




  146
  
  
    
                if( StringUtils.isNotBlank(xmlinfo.getTablePrefix()) ) {


  		




  147
  157
  
    
                String tableName = featureStoreParams.getTable();


  		




  148
  
  
    
                    


  		




  149
  
  
    
                } else if( xmlinfo.get(featureStoreParams.getTable())==null ) { 


  		




  
  158
  
    
                if( xmlinfo.get(tableName)==null ) { 


  		




  150
  159
  
    
                    continue;


  		




  151
  160
  
    
                }


  		




  152
  
  
    
                dbworkspace.writeStoresRepositoryEntry(featureStoreParams.getTable(), featureStoreParams);


  		




  
  161
  
    
                dbworkspace.writeStoresRepositoryEntry(tableName, featureStoreParams);


  		




  153
  162
  
    
                taskStatus.incrementCurrentValue();


  		




  154
  163
  
    
            }


  		




  155
  164
  
    
            return serverParams;


  		












Also available in:  Unified diff