Revision 962 org.gvsig.raster.postgis/trunk/org.gvsig.raster.postgis/org.gvsig.raster.postgis.app/org.gvsig.raster.postgis.app.postgisrasterclient/src/main/java/org/gvsig/raster/postgis/app/postgisrasterclient/gui/LayerLoaderManager.java

View differences:

LayerLoaderManager.java
59 59
 * @author Nacho Brodin (nachobrodin@gmail.com)
60 60
 */
61 61
public class LayerLoaderManager {
62
	private static int                  ALL_SUBDATASETS       = -2;
63
	private static int                  ENTIRE                = -1;
64
	
62 65
	private static Logger               logger                = LoggerFactory.getLogger(AddPostGISRasterLayerWizard.class.getName());
63 66
	private AddLayerUI                  apiUI                 = null;
64 67
	private DBServerExplorerParameters  dbExplorerParameters  = null;
......
101 104
			
102 105
			//Sin subdatasets
103 106
			if(getNumberOfColumns(schema, table) == 1) {
104
				loadOneLayer(item, -1);
107
				loadOneLayer(item, ENTIRE);
105 108
			} 
106 109
			//Con subdatasets
107 110
			else { 
108 111
				int[] subdatasets = apiUI.getSelectedSubdatasets();
109 112
				if(subdatasets == null || subdatasets.length <= 0) {
113
					loadOneLayer(item, ALL_SUBDATASETS);
114
				} else {
110 115
					long cols = getNumberOfColumns(schema, table);
111 116
					for (int i = 0; i < cols; i++) {
112 117
						loadOneLayer(item, i + 1);
113 118
					}
114
				} else {
115
					for (int i = 0; i < subdatasets.length; i++) {
116
						loadOneLayer(item, subdatasets[i] + 1);
117
					}
118 119
				}
119 120
			}
120 121
		}
......
126 127
				String schema = item.getSchema();
127 128
				String table = item.getTableName();
128 129
				long subdatasets = getNumberOfColumns(schema, table);
129
				for (int j = 0; j < subdatasets; j++) {
130
					loadOneLayer(item, j + 1);
130
				if(subdatasets == 1) {
131
					loadOneLayer(item, ENTIRE);
132
				} 
133
				if(subdatasets > 1) {
134
					loadOneLayer(item, ALL_SUBDATASETS);
131 135
				}
132 136
			}
133 137
		}
......
155 159
		else
156 160
			connString = "PG:host='" + host + "' port='" + port + "' dbname='" + dbname + "' user='" + user + "' password='" + password + "' schema='" + schema + "' table='" + table + "'";
157 161
		
162
		if(subdataset == ALL_SUBDATASETS)
163
			connString += " mode='2'";
164
		
158 165
		if(subdataset >= 0)
159 166
			connString += " column='rast' where='rid = "+ subdataset + "'";
160 167
		

Also available in: Unified diff