zorba-coders team mailing list archive

[Chris Hillery <chillery+launchpad@xxxxxxxxx>]

Chris Hillery has proposed merging lp:~zorba-coders/zorba/email-module-nsbindings into lp:zorba/email-module.

Requested reviews:
  Chris Hillery (ceejatec)
  Matthias Brantner (matthias-brantner)

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/email-module-nsbindings/+merge/88252
-- 
https://code.launchpad.net/~zorba-coders/zorba/email-module-nsbindings/+merge/88252
Your team Zorba Coders is subscribed to branch lp:zorba/email-module.

=== modified file 'src/com/zorba-xquery/www/modules/email/imap.xq.src/imap_function.cpp'
--- src/com/zorba-xquery/www/modules/email/imap.xq.src/imap_function.cpp	2011-10-05 13:00:46 +0000
+++ src/com/zorba-xquery/www/modules/email/imap.xq.src/imap_function.cpp	2012-01-11 18:30:39 +0000
@@ -282,7 +282,7 @@
   std::vector<int>& aFlagsVector,
   const bool aQualified) const
 {
-  std::vector<std::pair<String, String> >  ns_binding;
+  NsBindings ns_binding;
   ns_binding.push_back(std::pair<String, String>("email", SCHEMA_NAMESPACE));
   
   // if aParent is null, then we want to have the flags node qualified (so that it can be shema validated)
@@ -330,7 +330,7 @@
   const std::string& aType,
   const std::string& aContent) const
 {
-  std::vector<std::pair<String, String> > null_binding; 
+  NsBindings null_binding;
   Item lName = theModule->getItemFactory()->createQName(aNamespace, aPrefix, aName);
   Item lType = theModule->getItemFactory()->createQName(aTypeNamespace,  aType);
   Item lItem = theModule->getItemFactory()->createElementNode(aParent, lName, lType, false, false, null_binding);
@@ -351,7 +351,7 @@
 {  
   Item lNullItem;
    
-  std::vector<std::pair<String, String> > null_binding;
+  NsBindings null_binding;
   Item lName = theModule->getItemFactory()->createQName(SCHEMA_NAMESPACE, "email", "content");
   Item lType = theModule->getItemFactory()->createQName(SCHEMA_NAMESPACE, "contentType" );
   Item lItem = theModule->getItemFactory()->createElementNode(aParent, lName, lType, false, false, null_binding);
@@ -379,7 +379,7 @@
   Item lType = theModule->getItemFactory()->createQName(SCHEMA_NAMESPACE, "emailAddress");
   Item lName = theModule->getItemFactory()->createQName(SCHEMA_NAMESPACE, "email",  aName);
 
-  std::vector<std::pair<String, String> >  ns_binding; 
+  NsBindings ns_binding;
   ns_binding.push_back(std::pair<String, String>("email", SCHEMA_NAMESPACE));
  
   Item lItem = theModule->getItemFactory()->createElementNode(aParent, lName, lType, false, false, ns_binding);
@@ -402,7 +402,7 @@
   Item lType = theModule->getItemFactory()->createQName(SCHEMA_NAMESPACE, "recipientType");                                                                    
   Item lName = theModule->getItemFactory()->createQName(SCHEMA_NAMESPACE, "recipient");                           
   
-  std::vector<std::pair<String, String> >  ns_binding;                                        
+  NsBindings ns_binding;
   ns_binding.push_back(std::pair<String, String>("email", SCHEMA_NAMESPACE));
  
   Item lItem = theModule->getItemFactory()->createElementNode(aParent, lName, lType, false, false, ns_binding); 
@@ -484,7 +484,7 @@
     lEnvelope = ImapClient::Instance().fetchStructure(aHostName, aUserName, aPassword, aMailbox, &lBody, aMessageNumber, aUid, lFlags);
   }
     
-  std::vector<std::pair<String, String> >   ns_binding;
+  NsBindings ns_binding;
   ns_binding.push_back(std::pair<String, String>("email", SCHEMA_NAMESPACE));
     
   Item lEnvelopeItem;