[svn] commit: r689 - in /experiments/each-query/src: bin/auth/auth_srv.cc lib/auth/cpp/data_source_static.cc

[BIND 10 source code commits]

Author: jelte
Date: Sat Jan 30 02:45:56 2010
New Revision: 689

Log:
run the query
we get data!

Modified:
    experiments/each-query/src/bin/auth/auth_srv.cc
    experiments/each-query/src/lib/auth/cpp/data_source_static.cc

Modified: experiments/each-query/src/bin/auth/auth_srv.cc
==============================================================================
--- experiments/each-query/src/bin/auth/auth_srv.cc (original)
+++ experiments/each-query/src/bin/auth/auth_srv.cc Sat Jan 30 02:45:56 2010
@@ -100,6 +100,8 @@
         msg.setRcode(Rcode::NOERROR());
 
         // do the DataSource call here
+        Query q = Query(msg, false);
+        data_src.runQuery(q);
 
         OutputBuffer obuffer(4096);
         MessageRenderer renderer(obuffer);

Modified: experiments/each-query/src/lib/auth/cpp/data_source_static.cc
==============================================================================
--- experiments/each-query/src/lib/auth/cpp/data_source_static.cc (original)
+++ experiments/each-query/src/lib/auth/cpp/data_source_static.cc Sat Jan 30 02:45:56 2010
@@ -3,6 +3,8 @@
 #include "data_source_static.h"
 #include <dns/cpp/rrttl.h>
 #include <dns/cpp/rdata.h>
+
+#include <iostream>
 
 namespace isc {
 namespace dns {
@@ -37,7 +39,7 @@
     if (version_cmp == NameComparisonResult::EQUAL ||
         version_cmp == NameComparisonResult::SUBDOMAIN) {
         NameComparisonResult::NameRelation sub_cmp = 
-           container.compare(version_name).getRelation();
+           version_name.compare(container).getRelation();
 
         if (sub_cmp == NameComparisonResult::SUBDOMAIN) {
             container = authors_name;
@@ -57,7 +59,7 @@
     if (authors_cmp == NameComparisonResult::EQUAL ||
         authors_cmp == NameComparisonResult::SUBDOMAIN) {
         NameComparisonResult::NameRelation sub_cmp = 
-            container.compare(authors_name).getRelation();
+            authors_name.compare(container).getRelation();
 
         if (sub_cmp == NameComparisonResult::SUBDOMAIN) {
             container = authors_name;