Zorba

Merge lp:~zorba-coders/zorba/email-module-nsbindings into lp:zorba/email-module

  1. email-module-nsbindings
  2. Merge into email-module
Proposed by Chris Hillery
Status: Merged
Approved by: Matthias Brantner
Approved revision: 42
Merged at revision: 42
Proposed branch: lp:~zorba-coders/zorba/email-module-nsbindings
Merge into: lp:zorba/email-module
Diff against target: 57 lines (+6/-6)
1 file modified
src/com/zorba-xquery/www/modules/email/imap.xq.src/imap_function.cpp (+6/-6)
To merge this branch: bzr merge lp:~zorba-coders/zorba/email-module-nsbindings
Reviewer Review Type Date Requested Status
Matthias Brantner Approve
Chris Hillery Approve
Review via email: mp+88252@code.launchpad.net

Commit message

Use new NsBindings typedef.

To post a comment you must log in.
Revision history for this message
Chris Hillery (ceejatec) :
review: Approve
Revision history for this message
Matthias Brantner (matthias-brantner) :
review: Approve
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/email-module-nsbindings-2012-01-11T18-53-41.142Z/log.html

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue job email-module-nsbindings-2012-01-11T18-53-41.142Z is finished. The final status was:

All tests succeeded!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/com/zorba-xquery/www/modules/email/imap.xq.src/imap_function.cpp'
2--- src/com/zorba-xquery/www/modules/email/imap.xq.src/imap_function.cpp 2011-10-05 13:00:46 +0000
3+++ src/com/zorba-xquery/www/modules/email/imap.xq.src/imap_function.cpp 2012-01-11 18:30:39 +0000
4@@ -282,7 +282,7 @@
5 std::vector<int>& aFlagsVector,
6 const bool aQualified) const
7 {
8- std::vector<std::pair<String, String> > ns_binding;
9+ NsBindings ns_binding;
10 ns_binding.push_back(std::pair<String, String>("email", SCHEMA_NAMESPACE));
11
12 // if aParent is null, then we want to have the flags node qualified (so that it can be shema validated)
13@@ -330,7 +330,7 @@
14 const std::string& aType,
15 const std::string& aContent) const
16 {
17- std::vector<std::pair<String, String> > null_binding;
18+ NsBindings null_binding;
19 Item lName = theModule->getItemFactory()->createQName(aNamespace, aPrefix, aName);
20 Item lType = theModule->getItemFactory()->createQName(aTypeNamespace, aType);
21 Item lItem = theModule->getItemFactory()->createElementNode(aParent, lName, lType, false, false, null_binding);
22@@ -351,7 +351,7 @@
23 {
24 Item lNullItem;
25
26- std::vector<std::pair<String, String> > null_binding;
27+ NsBindings null_binding;
28 Item lName = theModule->getItemFactory()->createQName(SCHEMA_NAMESPACE, "email", "content");
29 Item lType = theModule->getItemFactory()->createQName(SCHEMA_NAMESPACE, "contentType" );
30 Item lItem = theModule->getItemFactory()->createElementNode(aParent, lName, lType, false, false, null_binding);
31@@ -379,7 +379,7 @@
32 Item lType = theModule->getItemFactory()->createQName(SCHEMA_NAMESPACE, "emailAddress");
33 Item lName = theModule->getItemFactory()->createQName(SCHEMA_NAMESPACE, "email", aName);
34
35- std::vector<std::pair<String, String> > ns_binding;
36+ NsBindings ns_binding;
37 ns_binding.push_back(std::pair<String, String>("email", SCHEMA_NAMESPACE));
38
39 Item lItem = theModule->getItemFactory()->createElementNode(aParent, lName, lType, false, false, ns_binding);
40@@ -402,7 +402,7 @@
41 Item lType = theModule->getItemFactory()->createQName(SCHEMA_NAMESPACE, "recipientType");
42 Item lName = theModule->getItemFactory()->createQName(SCHEMA_NAMESPACE, "recipient");
43
44- std::vector<std::pair<String, String> > ns_binding;
45+ NsBindings ns_binding;
46 ns_binding.push_back(std::pair<String, String>("email", SCHEMA_NAMESPACE));
47
48 Item lItem = theModule->getItemFactory()->createElementNode(aParent, lName, lType, false, false, ns_binding);
49@@ -484,7 +484,7 @@
50 lEnvelope = ImapClient::Instance().fetchStructure(aHostName, aUserName, aPassword, aMailbox, &lBody, aMessageNumber, aUid, lFlags);
51 }
52
53- std::vector<std::pair<String, String> > ns_binding;
54+ NsBindings ns_binding;
55 ns_binding.push_back(std::pair<String, String>("email", SCHEMA_NAMESPACE));
56
57 Item lEnvelopeItem;

Subscribers

People subscribed via source and target branches

to all changes: