Author: michi
Date: Fri Mar 17 04:46:03 2006
New Revision: 386634
URL: http://svn.apache.org/viewcvs?rev=386634&view=rev
Log:
ignore non-XML files
Modified:
lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/LinkRewriterImpl.java
Modified:
lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/LinkRewriterImpl.java
URL:
http://svn.apache.org/viewcvs/lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/LinkRewriterImpl.java?rev=386634&r1=386633&r2=386634&view=diff
==============================================================================
---
lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/LinkRewriterImpl.java
(original)
+++
lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/LinkRewriterImpl.java
Fri Mar 17 04:46:03 2006
@@ -41,6 +41,7 @@
import org.w3c.dom.Attr;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
+import org.xml.sax.SAXParseException;
/**
* Rewrite the links in a publication. This is used after renaming / moving a
document.
@@ -104,9 +105,7 @@
String[] xPaths = doctype.getLinkAttributeXPaths();
try {
-
- org.w3c.dom.Document xmlDocument =
SourceUtil.readDOM(examinedDocument.getSourceURI(),
- this.manager);
+ org.w3c.dom.Document xmlDocument =
SourceUtil.readDOM(examinedDocument.getSourceURI(), this.manager);
for (int xPathIndex = 0; xPathIndex < xPaths.length;
xPathIndex++) {
NodeList nodes =
XPathAPI.selectNodeList(xmlDocument,
@@ -144,10 +143,14 @@
examinedDocument.getSourceURI(),
this.manager);
}
-
+ } catch (SAXParseException e) {
+ getLogger().warn("Document [" + examinedDocument + "]
is not XML and will be ignored!");
+ } catch (Exception e) {
+ getLogger().error(e.getMessage(), e);
} finally {
}
-
+ } else {
+ getLogger().warn("HUGO: No such document: " +
examinedDocument.getSourceURI());
}
}
} catch (final Exception e) {
@@ -225,4 +228,4 @@
}
-}
\ No newline at end of file
+}
|