Revision 7

View differences:

trunk/libraries/libCq CMS for java.old/src/org/cresques/io/DataSource.java
28 28 
	public String getPath() { return path; }
29 29
30 30 
	public static DataSource getDSFromName(String name) {
31 
		if (name.startsWith("[")) name = name.substring(1);
32 
		if (name.indexOf("]") >= 0) name = name.substring(name.indexOf("]"));
31 
		if (name.indexOf("[") >= 0) name = name.substring(name.indexOf("[")+1);
32 
		if (name.indexOf("]") >= 0) name = name.substring(0,name.indexOf("]"));
33 33 
		DataSource ds = (DataSource) units.get(name);
34 34 
		return ds;
35 35 
	}
36 36
37 
	/**
38 
	 * Sustituye en el path el nombre de la unidad por su path real.
39 
	 *
40 
	 * @param path
41 
	 * @return
42 
	 */
43 
	public static String normalize(String path) {
44 
		if (path.indexOf("[") >= 0) {
45 
			DataSource ds = DataSource.getDSFromName(path);
46 
			path = path.substring(0,path.indexOf("[")) +
47 
				ds.getPath() + path.substring(path.indexOf("]")+1);
48 
			//System.out.println(path);
49 
		}
50 
		return path;
51 
	}
52
37 53 
	public String toString() {
38 54 
		return "["+counter+"]";
39 55 
	}
trunk/libraries/libCq CMS for java.old/src/org/cresques/io/ZipFileFolder.java
32 32 
	 */
33 33
34 34 
	public ZipFileFolder(String fName) throws IOException {
35 
		fName = DataSource.normalize(fName);
35 36 
		if (isUrl(fName))
36 37 
			zName = getZName(fName);
37 38 
		else
38 39 
			zName = fName;
39 
		if (fName.substring(0) == "[") {
40 
			DataSource ds = DataSource.getDSFromName(fName);
41 
			fName = ds.getPath() + fName.substring(fName.indexOf("]")+1);
42 
			System.out.println(fName);
43 
		}
44 40 
		file = new ZipFile(zName);
45 41 
	}
46 42

Also available in: Unified diff