vgritsenko 01/06/22 07:47:59
Modified: src/org/apache/cocoon/sitemap Tag: cocoon_20_branch
AbstractSitemap.java
Log:
- fix debug statement (was my fault)
- check for absence of substituted value as suggested by Steffen Stundzig
<[EMAIL PROTECTED]>
Revision Changes Path
No revision
No revision
1.4.2.12 +10 -8 xml-cocoon2/src/org/apache/cocoon/sitemap/AbstractSitemap.java
Index: AbstractSitemap.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/sitemap/AbstractSitemap.java,v
retrieving revision 1.4.2.11
retrieving revision 1.4.2.12
diff -u -r1.4.2.11 -r1.4.2.12
--- AbstractSitemap.java 2001/06/22 11:50:33 1.4.2.11
+++ AbstractSitemap.java 2001/06/22 14:47:57 1.4.2.12
@@ -43,7 +43,7 @@
* Base class for generated <code>Sitemap</code> classes
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Giacomo Pati</a>
- * @version CVS $Revision: 1.4.2.11 $ $Date: 2001/06/22 11:50:33 $
+ * @version CVS $Revision: 1.4.2.12 $ $Date: 2001/06/22 14:47:57 $
*/
public abstract class AbstractSitemap extends AbstractLoggable implements Sitemap,
Disposable, ThreadSafe {
private Context context;
@@ -282,14 +282,16 @@
k--;
m = l;
}
- if (m == -1) {
- result.append(((Object)((Map)list.get(k)).get(s)).toString());
- } else {
- result.append(((Object)((Map)list.get(k)).get(s.substring(m +
3))).toString());
+ if (m != -1) {
+ s = s.substring(m + 3);
}
- // FIXME (DIMS): This causes Exception in the Internationalization
sample.
- //getLogger().debug("substitute evaluated value for " + ((m == -1)
? s : s.substring(m + 1)) + " as " +
- // ((Object)((Map)list.get(k)).get((m == -1) ? s : s.substring(m
+ 1))).toString());
+ Object value = ((Map)list.get(k)).get(s);
+ if (value != null){
+ result.append(value.toString());
+ getLogger().debug("Substitute evaluated value for " + s + " as
" + value);
+ }else{
+ getLogger().warn("Substitute: value not found for " + s + "
while evaluating " + expr);
+ }
}
if (ii < expr.length()) {
result.append(expr.substring(ii));
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
