You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by an...@apache.org on 2006/10/12 19:17:43 UTC

svn commit: r463329 - /jackrabbit/trunk/contrib/spi/spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/QPropertyDefinitionImpl.java

Author: angela
Date: Thu Oct 12 10:17:42 2006
New Revision: 463329

URL: http://svn.apache.org/viewvc?view=rev&rev=463329
Log:
work in progress

parsing PropertyDefinition: only convert constraint-string to 
qualified value if the required type is NAME or PATH 

Modified:
    jackrabbit/trunk/contrib/spi/spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/QPropertyDefinitionImpl.java

Modified: jackrabbit/trunk/contrib/spi/spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/QPropertyDefinitionImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/spi/spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/QPropertyDefinitionImpl.java?view=diff&rev=463329&r1=463328&r2=463329
==============================================================================
--- jackrabbit/trunk/contrib/spi/spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/QPropertyDefinitionImpl.java (original)
+++ jackrabbit/trunk/contrib/spi/spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/QPropertyDefinitionImpl.java Thu Oct 12 10:17:42 2006
@@ -99,7 +99,10 @@
             ElementIterator it = DomUtil.getChildren(child, VALUECONSTRAINT_ELEMENT, null);
             while (it.hasNext()) {
                 int constType = (requiredType == PropertyType.REFERENCE) ?  PropertyType.NAME : requiredType;
-                String qValue = ValueFormat.getQValue(DomUtil.getText(it.nextElement()), constType, nsResolver).getString();
+                String qValue = DomUtil.getText(it.nextElement());
+                if (constType == PropertyType.NAME || constType == PropertyType.PATH) {
+                   qValue = ValueFormat.getQValue(qValue, constType, nsResolver).getString();
+                }
                 vc.add(qValue);
             }
             valueConstraints = (String[]) vc.toArray(new String[vc.size()]);