[Swift-commit] r8324 - in branches/release-0.95/src: . org/griphyn/vdl/karajan/lib

[hategan at ci.uchicago.edu]

Author: hategan
Date: 2014-12-10 20:47:54 -0600 (Wed, 10 Dec 2014)
New Revision: 8324

Modified:
   branches/release-0.95/src/
   branches/release-0.95/src/org/griphyn/vdl/karajan/lib/SiteCatalog.java
Log:
perform variable substitution in xml text nodes


Property changes on: branches/release-0.95/src
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/release-0.94/src:6283-6619,6999-7001,7125
/trunk/src:6214,6255,6275-6618,7913,7915
   + /branches/release-0.94/src:6283-6619,6999-7001,7125
/trunk/src:6214,6255,6275-6618,7913,7915,7934,7936

Modified: branches/release-0.95/src/org/griphyn/vdl/karajan/lib/SiteCatalog.java
===================================================================
--- branches/release-0.95/src/org/griphyn/vdl/karajan/lib/SiteCatalog.java	2014-12-11 02:28:05 UTC (rev 8323)
+++ branches/release-0.95/src/org/griphyn/vdl/karajan/lib/SiteCatalog.java	2014-12-11 02:47:54 UTC (rev 8324)
@@ -277,7 +277,7 @@
 
     private String text(Node n) {
         if (n.getFirstChild() != null) {
-            return n.getFirstChild().getNodeValue();
+            return expandProps(n.getFirstChild().getNodeValue());
         }
         else {
             return null;