/ - Diff - Application: gvSIG desktop - gvSIG

Revision 5245

+     *
      * $Id$
      * $Log$
      * Revision 1.3  2006-05-16 17:10:27  jaume
      * Revision 1.3.2.1  2006-05-17 09:21:49  jaume
      * *** empty log message ***
+     *
      * Revision 1.3  2006/05/16 17:10:27  jaume
      * *** empty log message ***
+     *
      * Revision 1.2  2006/05/15 09:39:52  jaume
      * *** empty log message ***
+     *
-...
     		request1.setFile(page1);
     		request1.setFileName(tempDirectoryPath+File.separator+"task1");
     		request1.setRequestType(URLRequest.GET);
     		task1 = new URLRetrieveTask(request1, listener1);
     		task1 = new URLRetrieveTask(request1);
     		request2 = new URLRequest();
     		// http://localhost/aegCapabilities1.3.xml
-...
     		request2.setFile(page2);
     		request2.setFileName(tempDirectoryPath+File.separator+"task2");
     		request2.setRequestType(URLRequest.GET);
     		task2 = new URLRetrieveTask(request2, listener2);
     		task2 = new URLRetrieveTask(request2);
     		request3 = new URLRequest();
     		// http://localhost/avalencia.ecw
-...
     		request3.setFile(page3);
     		request3.setFileName(tempDirectoryPath+File.separator+"task3");
     		request3.setRequestType(URLRequest.GET);
     		task3 = new URLRetrieveTask(request3, listener3);
     		task3 = new URLRetrieveTask(request3);
     		request4 = new URLRequest();
     		// http://192.168.0.223/prueba.rar
-...
     		request4.setFileName(tempDirectoryPath+File.separator+"task4");
     		request4.setRequestType(URLRequest.GET);
     		task4 = new URLRetrieveTask(request4, listener4);
     		task4 = new URLRetrieveTask(request4);
+    	}
-...
     		finished1 = finished2 = finished3 = finished4 = false;
     		System.out.println("tests to merge two or more equivalent transfers into one");
     		RequestManager manager = RequestManager.getInstance();
     		//manager.removeURLRequest(request3);
     		manager.removeURLRequest(request3);
     		request3.setFileName("task3");
     		manager.addURLRequest(request3, listener1);

     import java.io.File;
     import java.net.MalformedURLException;
     import java.util.Hashtable;
     import java.util.ArrayList;
     import java.util.TreeMap;
     import java.util.Vector;
     import org.gvsig.remoteClient.taskplanning.IQueue;
     import org.gvsig.remoteClient.taskplanning.IRunnableTask;
     /**
      * pa administrar les tasques (la hist?ria aquella
-...
     	public URLRetrieveTask addURLRequest(URLRequest request, RetrieveListener listener) {
     		try {
     			// TODO canviar per a quetorne el Request antic, que la request guarde el
     			// seu estat aix? com la llista de listeners
     			File f = getPreviousDownloadedURLRequest(request);
     			if (f!=null) {
     				// The file was already requested and it is in the cache or
     				// the download is in process
     			if (downloadedFiles.contains(request)) {
     				for (int i = 0; i < downloadedFiles.size(); i++) {
     					URLRequest r = (URLRequest) downloadedFiles.get(i);
     					if (r.equals(request)) {
     						request = r;
     						break;
+    					}
+    				}
     				// Overwrite the file name with the file in the cache's one.
     				request.setFileName(f.getAbsolutePath());
     				System.out.println(request.getUrl()+" is cached at '"+f.getAbsolutePath()+"'");
     				System.out.println(request.getUrl()+" is cached at '"+request.getFileName()+"'");
     				// get this server's task queue
     				RetrieveQueue serverQueue = (RetrieveQueue) getQueue(request.getHost());
     				// Look up the previous cached jobs
     				URLRetrieveTask workingTask = serverQueue.getURLPreviousRequest(request);
     				if (workingTask == null) {
     					// Task already done. Notify listener
     					if (debug)
     						System.err.println("done job found: "+request.getUrl());
     					RetrieveEvent event = new RetrieveEvent();
     					event.setType(RetrieveEvent.REQUEST_FINISHED);
     					listener.transferEventReceived(event);
     				synchronized (this) {
     					if (request.getStatus() == RetrieveEvent.REQUEST_FINISHED) {
     						if (debug)
     							System.err.println("done job found: "+request.getUrl());
     						RetrieveEvent event = new RetrieveEvent();
     						event.setType(RetrieveEvent.REQUEST_FINISHED);
     						listener.transferEventReceived(event);
     					} else if (request.getStatus() == RetrieveEvent.REQUEST_CANCELLED) {
     						removeURLRequest(request);
     						return addURLRequest(request, listener);
     					} else {
     						if (debug)
     							System.err.println("working job found: "+request.getUrl());
     						request.lock();
     						request.addRetrieveListener(listener);
     						request.unlock();
+    					}
     				} else {
     					// The task is working yet, will register the listener
     					// TODO no va b?... perqu? la cola va buidant-se molt r?pidament
     					// per a fer que vaja tamb? hi hauria que registrar en cache
     					// lo que s'est? baixant al principi de l'execute();
     					if (debug)
     						System.err.println("working job found: "+request.getUrl());
     					workingTask.addRetrieveListener(listener);
+    				}
     			} else {
     				// Pick an unrepeatable fileName
-...
     				if (fileName.startsWith(fileNamePrefix))
     					fileName = fileName.substring(fileNamePrefix.length(), fileName.length());
     				// get this server's task queue
     				RetrieveQueue serverQueue = (RetrieveQueue) getQueue(request.getHost());
-...
     				fileName = fileNamePrefix + fileName;
     				request.setFileName(fileName);
     				synchronized (this) {
     					addDownloadedURLRequest(request);
+    				}
     				// TODO
     				// jo ac? comprovaria quin protocol, m?tode, host, etc... i crearia un
     				// objecte que tractara la desc?rrega segons el m?tode que li toca.
-...
     				// serverQueue.put(new SMBRetrieveTask(request, listener));
     				// Enqueue the request and the listener will be notified when done.
     				URLRetrieveTask task = new URLRetrieveTask(request, listener);
     				request.addRetrieveListener(listener);
     				URLRetrieveTask task = new URLRetrieveTask(request);
     				return (URLRetrieveTask) serverQueue.put(task);
+    			}
     //			// TODO canviar per a quetorne el Request antic, que la request guarde el
     //			// seu estat aix? com la llista de listeners
     //			File f = getPreviousDownloadedURLRequest(request);
     //
     //			if (f!=null) {
     //				// The file was already requested and it is in the cache or
     //				// the download is in process
     //
     //				// Overwrite the file name with the file in the cache's one.
     //				request.setFileName(f.getAbsolutePath());
     //				System.out.println(request.getUrl()+" is cached at '"+f.getAbsolutePath()+"'");
     //
     //
     //				// get this server's task queue
     //				RetrieveQueue serverQueue = (RetrieveQueue) getQueue(request.getHost());
     //
     //				// Look up the previous cached jobs
     //
     //				URLRetrieveTask workingTask = serverQueue.getURLPreviousRequest(request);
     //				if (workingTask == null) {
     //					// Task already done. Notify listener
     //					if (debug)
     //						System.err.println("done job found: "+request.getUrl());
     //					RetrieveEvent event = new RetrieveEvent();
     //					event.setType(RetrieveEvent.REQUEST_FINISHED);
     //					listener.transferEventReceived(event);
     //
     //				} else {
     //					// The task is working yet, will register the listener
     //
     //					// TODO no va b?... perqu? la cola va buidant-se molt r?pidament
     //					// per a fer que vaja tamb? hi hauria que registrar en cache
     //					// lo que s'est? baixant al principi de l'execute();
     //					if (debug)
     //						System.err.println("working job found: "+request.getUrl());
     //					workingTask.addRetrieveListener(listener);
     //
     //				}
     //			} else {
     //				// Pick an unrepeatable fileName
     //				String host = request.getHost();
     //				String fileName = request.getFileName();
     //				File tempDir = new File(tempDirectoryPath);
     //				if (!tempDir.exists())
     //					tempDir.mkdir();
     //				String fileNamePrefix = tempDirectoryPath +
     //											File.separator + host +
     //											"-" ;
     //				if (fileName.startsWith(fileNamePrefix))
     //					fileName = fileName.substring(fileNamePrefix.length(), fileName.length());
     //
     //				// get this server's task queue
     //				RetrieveQueue serverQueue = (RetrieveQueue) getQueue(request.getHost());
     //
     //
     //				fileName = fileNamePrefix + fileName;
     //
     //				request.setFileName(fileName);
     //
     //				// TODO
     //				// jo ac? comprovaria quin protocol, m?tode, host, etc... i crearia un
     //				// objecte que tractara la desc?rrega segons el m?tode que li toca.
     //				// algo en plan Strategy's
     //				//
     //				// per exemple si fem URLRetrieveTask una abstracta i tenim
     //				//
     //				// GET de tota la vida
     //				// serverQueue.put(new HTTPGetRetrieveTask(request, listener));
     //				//
     //				// POST
     //				// serverQueue.put(new HTTPPostRetrieveTask(request, listener));
     //				//
     //				// FTP
     //				// serverQueue.put(new FTPRetrieveTask(request, listener));
     //				//
     //				// ????Xarxa local?????
     //				// serverQueue.put(new SMBRetrieveTask(request, listener));
     //
     //				// Enqueue the request and the listener will be notified when done.
     //				URLRetrieveTask task = new URLRetrieveTask(request, listener);
     //				return (URLRetrieveTask) serverQueue.put(task);
     //			}
     		} catch (MalformedURLException e) {
     			e.printStackTrace();
+    		}
-...
+    	}
     	private Hashtable downloadedFiles;
     	private Vector downloadedFiles = new Vector();
     	private final String tempDirectoryPath = System.getProperty("java.io.tmpdir")+"tmp-andami";
     	/**
          * Remove an URL from the system cache. The file will remain in the file
-...
          * @param request
          */
     	public void removeURLRequest(URLRequest request) {
     		if (downloadedFiles != null && downloadedFiles.containsKey(request))
     		if (downloadedFiles != null && downloadedFiles.contains(request))
     			downloadedFiles.remove(request);
+    	}
     	/**
-...
          * @param url
          * @param filePath
          */
         protected void addDownloadedURLRequest(URLRequest request, String filePath){
             if (downloadedFiles==null)
                 downloadedFiles = new Hashtable();
             String fileName = (String) downloadedFiles.put(request, filePath);
             if (fileName!=null){
                 File f = new File(fileName);
                 if (f.exists())
                     f.delete();
         protected void addDownloadedURLRequest(URLRequest request){
             if (!downloadedFiles.contains(request)) {
             	downloadedFiles.add(request);
             } else {
             	System.out.println("NOT ADDED");
+            }
     //
     //        String fileName = request.getFileName();
     //        if (fileName!=null){
     //            File f = new File(fileName);
     //            if (f.exists())
     //                f.delete();
     //        }
+        }
         /**
          * Returns the content of this URL as a file from the file system.<br>
          * <p>
          * If the URL has been already downloaded in this session and notified
          * to the system using the static <b>Utilities.addDownloadedURL(URL)</b>
          * method, it can be restored faster from the file system avoiding to
          * download it again.
          * </p>
          * @param url
          * @return File containing this URL's content or null if no file was found.
          */
         private File getPreviousDownloadedURLRequest(URLRequest request){
             File f = null;
             if (downloadedFiles!=null && downloadedFiles.containsKey(request)){
                 String filePath = (String) downloadedFiles.get(request);
                 f = new File(filePath);
+            }
             return f;
+        }
+    }

     import java.net.MalformedURLException;
     import java.net.URL;
     import java.util.Iterator;
     import java.util.Vector;
     /**
      * @author Luis W. Sevilla (sevilla_lui@gva.es)
-...
     	private int port = -1;
     	private String file;
     	private String fileName;
     	private boolean locked;
     	private int status;
     	private Vector listeners = new Vector();
     	private RetrieveEvent event = new RetrieveEvent();
     	public URL getUrl() throws MalformedURLException {
     		String u = protocol;
-...
     		if (this.requestType != other.requestType) return false;
     		return true;
+    	}
+    }
     	protected void lock() {
     		locked = true;
+    	}
     	protected void unlock() {
     		locked = false;
+    	}
     	protected synchronized void setStatus(int status) {
     		event.setType(status);
     		fireEvent();
+    	}
     	protected synchronized int getStatus() {
     		return event.getType();
+    	}
     	public void addRetrieveListener(RetrieveListener l) {
     		if (l!=null)
     			listeners.add(l);
+    	}
     	private void fireEvent() {
     		while (locked) { /* wait*/System.out.println("I'm locked"); }
     		Iterator it = listeners.iterator();
     		while (it.hasNext()) {
     			RetrieveListener listener = (RetrieveListener) it.next();
     			listener.transferEventReceived(event);
+    		}
+    	}
+     }

     	private boolean running, cancelled;
     	private URLRequest request;
     	private Vector listeners = new Vector();
     	private RetrieveEvent event = new RetrieveEvent();
     	private InputStream is;
     	/**
+    	 *
     	 */
     	public URLRetrieveTask(URLRequest request, RetrieveListener listener) {
     	public URLRetrieveTask(URLRequest request) {
     		this.request = request;
     		addRetrieveListener(listener);
     		running = cancelled = false;
+    	}
     	public void execute() {
     		event.setType(RetrieveEvent.NOT_STARTED);
     		fireEvent();
     		request.setStatus(RetrieveEvent.NOT_STARTED);
     		cancelled = false;
     		running= true;
-...
+    		}
     		URL url;
     		try {
     			event.setType(RetrieveEvent.CONNECTING);
     			fireEvent();
     			request.setStatus(RetrieveEvent.CONNECTING);
     			url = request.getUrl();
     			request.setFileName(f.getAbsolutePath());
     			System.out.println("downloading '"+url+"' to: "+f.getAbsolutePath());
     			DataOutputStream dos = new DataOutputStream( new BufferedOutputStream(new FileOutputStream(f)));
     			byte[] buffer = new byte[1024*256];
     			fireEvent();
     			is = url.openStream();
     			event.setType(RetrieveEvent.TRANSFERRING);
     			fireEvent();
     			request.setStatus(RetrieveEvent.TRANSFERRING);
     			if (!cancelled) {
     				long readed = 0;
     				for (int i = is.read(buffer); !cancelled && i>0; i = is.read(buffer)){
-...
     				// register job in the cache
     				// TODO aix? deuria d'estar al principi per a poder capturar
     				// treballs que s'estan fent per? que encara no s'han acabat
     				synchronized (this) {
     					RequestManager.getInstance().addDownloadedURLRequest(request, f.getAbsolutePath());
+    				}
     //				synchronized (this) {
     //					RequestManager.getInstance().addDownloadedURLRequest(request);
     //				}
+    			}
     			running = false;
     			if (cancelled)
     				event.setType(RetrieveEvent.REQUEST_CANCELLED);
     				request.setStatus(RetrieveEvent.REQUEST_CANCELLED);
     			else
     				event.setType(RetrieveEvent.REQUEST_FINISHED);
     				request.setStatus(RetrieveEvent.REQUEST_FINISHED);
     		} catch (MalformedURLException e) {
     			e.printStackTrace();
     			event.setType(RetrieveEvent.REQUEST_FAILED);
     			request.setStatus(RetrieveEvent.REQUEST_FAILED);
     		} catch (IOException e) {
     			e.printStackTrace();
     			event.setType(RetrieveEvent.REQUEST_FAILED);
     			request.setStatus(RetrieveEvent.REQUEST_FAILED);
+    		}
     		fireEvent();
+    	}
     	private void fireEvent() {
     		Iterator it = listeners.iterator();
     		while (it.hasNext()) {
     			RetrieveListener listener = (RetrieveListener) it.next();
     			listener.transferEventReceived(event);
+    		}
+    	}
     //	private void fireEvent() {
     //		Iterator it = listeners.iterator();
     //		while (it.hasNext()) {
     //			RetrieveListener listener = (RetrieveListener) it.next();
     //			listener.transferEventReceived(event);
     //		}
     //	}
     	public void addRetrieveListener(RetrieveListener l) {
     		if (l!=null)
     			listeners.add(l);
+    	}
     	public void cancel() {
     		cancelled = true;
     		try {
-...
     	public URLRequest getRequest() {
     		return request;
+    	}
     	public Vector getListeners() {
     		return listeners;
+    	}
+    }

Also available in: Unified diff