Update of /var/cvs/speeltuin/andre/mmget/src/org/mmbase/mmget
In directory james.mmbase.org:/tmp/cvs-serv8251/src/org/mmbase/mmget
Modified Files:
MMGet.java ResourceReWriter.java
Log Message:
mainly debug
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.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- MMGet.java 23 Mar 2009 22:30:22 -0000 1.10
+++ MMGet.java 23 Mar 2009 23:04:58 -0000 1.11
@@ -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.10 2009/03/23 22:30:22 andre Exp $
+ * @version $Id: MMGet.java,v 1.11 2009/03/23 23:04:58 andre Exp $
*/
public final class MMGet {
@@ -94,7 +94,7 @@
// savedir
if (directory == null || "".equals(directory) ||
!webroot.getResource(directory).openConnection().getDoInput()) {
log.warn("Exportdir '" + directory + "' does not exist! Will try
to save to MMBase datadir.");
- log.debug("Datadir is: " + datadir.toString());
+ log.warn("Datadir is: " + datadir.toString());
savedir = new File(datadir, "mmget");
if (! savedir.exists()) {
@@ -174,19 +174,21 @@
info.append("\n* saved in: ").append(savedir.toString());
log.info(info.toString());
+ /*
ThreadPools.jobsExecutor.submit(new Callable() {
public String call() {
return start();
}
});
+ */
// this Future stuff prevents errors to surface
- /*
Future<String> fthread = ThreadPools.jobsExecutor.submit(new
Callable() {
public String call() {
return start();
}
});
-
+ String tname = ThreadPools.getString(fthread);
+ log.debug("thread: " + tname);
try {
status = fthread.get(60, TimeUnit.SECONDS);
} catch(TimeoutException e) {
@@ -197,9 +199,9 @@
log.error(e);
}
- info.append(status);
+ info.append("\n").append(status);
log.info(status);
- */
+
return info.toString();
}
@@ -215,7 +217,7 @@
startdirURL = null;
readUrl(startURL);
- return "Job finished?!";
+ return "Job finished!";
}
/**
@@ -224,8 +226,8 @@
*/
private void readUrl(URL url) {
if (url == null) return;
-
log.debug("---------------------------------------------------------------------");
- log.debug("reading: " + url.toString());
+ if (log.isDebugEnabled())
log.debug("---------------------------------------------------------------------");
+ if (log.isDebugEnabled()) log.debug("reading: " + url.toString());
URL dirURL;
UrlReader reader = null;
@@ -249,8 +251,8 @@
Map<String,String> links2files = new HashMap<String,String>();
/* maps a harvested link to the resulting saved file if different */
//if (startdirURL == null) startdirURL = dirURL;
- log.debug("@@ dirURL: " + dirURL.toString());
- log.debug("@@ startdirURL: " + startdirURL.toString());
+ if (log.isDebugEnabled()) log.debug("@@ dirURL: " +
dirURL.toString());
+ if (log.isDebugEnabled()) log.debug("@@ startdirURL: " +
startdirURL.toString());
Iterator<String> it = links.iterator();
while (it.hasNext()) {
@@ -331,7 +333,7 @@
String relative = UriParser.makeRelative(calcdir,
calclink.toString());
if (!"".equals(link) && !links2files.containsKey(link) &&
!link.equals(relative)) { // only when different
- log.debug("link2files: " + link + " -> " + relative);
+ //log.debug("link2files: " + link + " -> " + relative);
links2files.put(link, relative); /* /dir/css/bla.css +
../css/bla.css */
}
Index: ResourceReWriter.java
===================================================================
RCS file:
/var/cvs/speeltuin/andre/mmget/src/org/mmbase/mmget/ResourceReWriter.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- ResourceReWriter.java 23 Mar 2009 22:30:22 -0000 1.5
+++ ResourceReWriter.java 23 Mar 2009 23:04:58 -0000 1.6
@@ -12,7 +12,7 @@
* Typically to be used for html and css files.
*
* @author André van Toly
- * @version $Id: ResourceReWriter.java,v 1.5 2009/03/23 22:30:22 andre Exp $
+ * @version $Id: ResourceReWriter.java,v 1.6 2009/03/23 23:04:58 andre Exp $
*/
public final class ResourceReWriter extends ResourceWriter {
private static final Logger log =
Logging.getLoggerInstance(ResourceReWriter.class);
@@ -66,7 +66,7 @@
BufferedReader in = new BufferedReader(new
InputStreamReader(url.openStream()));
PrintWriter out = new PrintWriter(new FileWriter(f));
- String line;
+ String line = null;
while((line = in.readLine()) != null) {
if (links2files != null) {
for (Map.Entry<String,String> pair : links2files.entrySet()) {
@@ -87,8 +87,7 @@
if (!testlink.equals(link)) continue;
line = line.replace(hitlink, file);
- if (log.isDebugEnabled())
- log.debug("replaced '" + link + "' with '" + file
+ "' in: " + filename);
+ //if (log.isDebugEnabled()) log.debug("replaced '" +
link + "' with '" + file + "' in: " + filename);
}
}
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
