[Bedework-commit] carddav r164 - in trunk/server/src/org/bedework/carddav: server vcard

[svnadmin at bedework.org]

Author: douglm
Date: 2010-10-16 01:10:28 -0400 (Sat, 16 Oct 2010)
New Revision: 164

Modified:
   trunk/server/src/org/bedework/carddav/server/CarddavBWIntf.java
   trunk/server/src/org/bedework/carddav/vcard/Card.java
Log:
Small change to error reporting

Turn off validation of vcard we read from db 

Modified: trunk/server/src/org/bedework/carddav/server/CarddavBWIntf.java
===================================================================
--- trunk/server/src/org/bedework/carddav/server/CarddavBWIntf.java	2010-10-13 17:58:19 UTC (rev 163)
+++ trunk/server/src/org/bedework/carddav/server/CarddavBWIntf.java	2010-10-16 05:10:28 UTC (rev 164)
@@ -854,7 +854,8 @@
     } else if (create) {
       /* Resource already exists */
 
-      throw new WebdavException(HttpServletResponse.SC_PRECONDITION_FAILED);
+      throw new WebdavException(HttpServletResponse.SC_PRECONDITION_FAILED,
+                                CarddavTags.noUidConflict);
     } else {
       if (!entityName.equals(oldCard.getName())) {
         throw new WebdavBadRequest("Mismatched names");

Modified: trunk/server/src/org/bedework/carddav/vcard/Card.java
===================================================================
--- trunk/server/src/org/bedework/carddav/vcard/Card.java	2010-10-13 17:58:19 UTC (rev 163)
+++ trunk/server/src/org/bedework/carddav/vcard/Card.java	2010-10-16 05:10:28 UTC (rev 164)
@@ -72,7 +72,7 @@
 
   private String prevLastmod;
 
-  private static VCardOutputter cardOut = new VCardOutputter();
+  private static VCardOutputter cardOut = new VCardOutputter(false);
 
   /** Create Card with a new embedded VCard
    *