Update of /var/cvs/speeltuin/andre/mmget/src/org/mmbase/mmget
In directory james.mmbase.org:/tmp/cvs-serv20211
Modified Files:
MMGet.java
Log Message:
See also:
http://cvs.mmbase.org/viewcvs/speeltuin/andre/mmget/src/org/mmbase/mmget
Index: MMGet.java
===================================================================
RCS file: /var/cvs/speeltuin/andre/mmget/src/org/mmbase/mmget/MMGet.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- MMGet.java 24 Mar 2009 20:02:07 -0000 1.13
+++ MMGet.java 25 Mar 2009 10:11:29 -0000 1.14
@@ -25,7 +25,7 @@
* TODO: init rootURL early on, and check all urls against it (so we don't
travel up the rootURL)
*
* @author André van Toly
- * @version $Id: MMGet.java,v 1.13 2009/03/24 20:02:07 andre Exp $
+ * @version $Id: MMGet.java,v 1.14 2009/03/25 10:11:29 andre Exp $
*/
public final class MMGet {
@@ -47,6 +47,8 @@
public static String directory;
protected static File savedir;
+ protected static Future<String> future = null;
+
/* not wanted: offsite, already tried but 404 etc. */
protected static Set<URL> ignoredURLs = new HashSet<URL>();
/* urls to read (html, css) */
@@ -56,9 +58,6 @@
/* rewrite these: url -> link in page / new link in rewritten page */
protected static Map<URL,Map<String,String>> url2links =
Collections.synchronizedMap(new HashMap<URL,Map<String,String>>());
- /* future status */
- public Future<String> fstatus;
-
/* homepage to use when saving a file with no extension (thus presuming
directory) */
protected static String homepage = "index.html";
protected static List<String> contentheadersHTML = Arrays.asList(
@@ -173,16 +172,16 @@
info.append("\n saved in: ").append(savedir.toString());
log.info(info.toString());
- Future<String> fthread = ThreadPools.jobsExecutor.submit(new
Callable() {
+ future = ThreadPools.jobsExecutor.submit(new Callable() {
public String call() {
return start();
}
});
- ThreadPools.identify(fthread, "MMGet download of " +
startURL.toString());
- String tname = ThreadPools.getString(fthread);
+ ThreadPools.identify(future, "MMGet download of '" +
startURL.toString() + "' in '" + savedir.toString() + "'");
+ String tname = ThreadPools.getString(future);
log.debug("threadname: " + tname);
try {
- status = "Job '" + tname + "' is " + fthread.get(10,
TimeUnit.SECONDS);
+ status = tname + "' is " + future.get(10, TimeUnit.SECONDS);
} catch(TimeoutException e) {
//log.error(e);
status = tname;
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
