[Bedework-commit] carddav r158 - trunk/clients/javascript/bwAddrbookClient/resources

[svnadmin at bedework.org]

Author: johnsa
Date: 2010-10-11 16:17:18 -0400 (Mon, 11 Oct 2010)
New Revision: 158

Modified:
   trunk/clients/javascript/bwAddrbookClient/resources/addressbook.js
   trunk/clients/javascript/bwAddrbookClient/resources/vcardParser.js
Log:
javascript client: improve json output and handling

Modified: trunk/clients/javascript/bwAddrbookClient/resources/addressbook.js
===================================================================
--- trunk/clients/javascript/bwAddrbookClient/resources/addressbook.js	2010-10-11 19:59:22 UTC (rev 157)
+++ trunk/clients/javascript/bwAddrbookClient/resources/addressbook.js	2010-10-11 20:17:18 UTC (rev 158)
@@ -207,19 +207,19 @@
         }
         var familyName ="";
         if(curCard.N != undefined) { 
-          if(curCard.N[0].values[0].family_name != undefined) { 
-            familyName = curCard.N[0].values[0].family_name; 
+          if(curCard.N[0].values.family_name != undefined) { 
+            familyName = curCard.N[0].values.family_name; 
           }
         }
         var givenNames ="";
         if(curCard.N != undefined) { 
-          if(curCard.N[0].values[1].given_names != undefined) { 
-            givenNames = curCard.N[0].values[1].given_names; 
+          if(curCard.N[0].values.given_names != undefined) { 
+            givenNames = curCard.N[0].values.given_names; 
           }
         }
         var tel ="";
         if(curCard.TEL != undefined) { 
-          tel = curCard.TEL[0].values[0].number; 
+          tel = curCard.TEL[0].values.number; 
         }
         var email ="";
         if(curCard.EMAIL != undefined) { 
@@ -231,7 +231,7 @@
         }
         var org = "";
         if(curCard.ORG != undefined) { 
-          org = curCard.ORG[0].values[0].organization_name; 
+          org = curCard.ORG[0].values.organization_name; 
         }
         var url = "";
         if(curCard.URL != undefined) { 
@@ -421,7 +421,7 @@
     }
     var tel = "";
     if(curCard.TEL != undefined) { 
-      tel = curCard.TEL[0].values[0].number; 
+      tel = curCard.TEL[0].values.number; 
     }
     var email = "";
     if(curCard.EMAIL != undefined) { 
@@ -433,7 +433,7 @@
     }
     var org = "";
     if(curCard.ORG != undefined) { 
-      org = curCard.ORG[0].values[0].organization_name; 
+      org = curCard.ORG[0].values.organization_name; 
     }
     var url = "";
     if(curCard.URL != undefined) { 

Modified: trunk/clients/javascript/bwAddrbookClient/resources/vcardParser.js
===================================================================
--- trunk/clients/javascript/bwAddrbookClient/resources/vcardParser.js	2010-10-11 19:59:22 UTC (rev 157)
+++ trunk/clients/javascript/bwAddrbookClient/resources/vcardParser.js	2010-10-11 20:17:18 UTC (rev 158)
@@ -159,9 +159,9 @@
         bwJsonObj += '"values": {';
         //one array goes from 1 to length-1 and the other from 0 to length-1. Hope it's clear.
         for (y=1;y<attributeInfo.length;y++) {
-          bwJsonObj += attributeInfo[y] + '": ';
+          bwJsonObj += '"' + attributeInfo[y] + '" : ';
           if (y<=attributeFieldValues.length) {
-            bwJsonObj += '"' + attributeFieldValues[y-1];
+            bwJsonObj += '"' + attributeFieldValues[y-1] + '"';
           } else {
             //avoid undefines
             bwJsonObj += '""';
@@ -172,7 +172,7 @@
             bwJsonObj += ',';
           }
         }
-        bwJsonObj += '}';
+        bwJsonObj += '}}';
 
       }
       if (lastAttributeName == attribute) {