[svn] commit: r752 - in /branches/each-datasrc/src/lib/auth/cpp: data_source.cc data_source.h data_source_plot.cc data_source_plot.h data_source_static.cc

[BIND 10 source code commits]

Author: each
Date: Mon Feb  8 20:23:44 2010
New Revision: 752

Log:
checkpoint

Removed:
    branches/each-datasrc/src/lib/auth/cpp/data_source_plot.cc
    branches/each-datasrc/src/lib/auth/cpp/data_source_plot.h
Modified:
    branches/each-datasrc/src/lib/auth/cpp/data_source.cc
    branches/each-datasrc/src/lib/auth/cpp/data_source.h
    branches/each-datasrc/src/lib/auth/cpp/data_source_static.cc

Modified: branches/each-datasrc/src/lib/auth/cpp/data_source.cc
==============================================================================
--- branches/each-datasrc/src/lib/auth/cpp/data_source.cc (original)
+++ branches/each-datasrc/src/lib/auth/cpp/data_source.cc Mon Feb  8 20:23:44 2010
@@ -1,3 +1,5 @@
+#include <iostream>
+
 #include <dns/buffer.h>
 #include <dns/name.h>
 #include <dns/rrset.h>
@@ -15,6 +17,8 @@
     DSResult result;
     Name container(".");
     Message& m = q.message();
+
+    std::cerr << "entering runQuery()\n";
 
     while (!q.tasks().empty()) {
         RRsetList data, sigs;

Modified: branches/each-datasrc/src/lib/auth/cpp/data_source.h
==============================================================================
--- branches/each-datasrc/src/lib/auth/cpp/data_source.h (original)
+++ branches/each-datasrc/src/lib/auth/cpp/data_source.h Mon Feb  8 20:23:44 2010
@@ -21,6 +21,7 @@
 #include <dns/name.h>
 #include <dns/rrset.h>
 #include <auth/query.h>
+#include <iostream>
 
 namespace isc {
 namespace dns {
@@ -139,11 +140,13 @@
     }
 
     void findClosestEnclosure(NameMatch& match) const {
+        std::cerr << "in MDS::findClosestEnclosure()\n";
         BOOST_FOREACH (DataSrc* ds, data_sources) {
             if (getClass() != RRClass::ANY() && ds->getClass() != getClass()) {
                 continue;
             }
 
+            std::cerr << "trying a ds...\n";
             ds->findClosestEnclosure(match);
         }
     }
@@ -160,10 +163,12 @@
     ~NameMatch() {}
 
     void update(const DataSrc& new_source, const Name& container) {
+        std::cerr << "updating name\n";
         if (closest_name_ == NULL ||
             closest_name_->getLabelCount() < container.getLabelCount()) {
             closest_name_ = &container;
             best_source_ = &new_source;
+            std::cerr << container << "\n";
         }
     }
 

Modified: branches/each-datasrc/src/lib/auth/cpp/data_source_static.cc
==============================================================================
--- branches/each-datasrc/src/lib/auth/cpp/data_source_static.cc (original)
+++ branches/each-datasrc/src/lib/auth/cpp/data_source_static.cc Mon Feb  8 20:23:44 2010
@@ -50,18 +50,23 @@
 void
 StaticDataSrc::findClosestEnclosure(NameMatch& match) const {
     const Name& qname = match.qname();
+    std::cerr << "in SDS::findClosestEnclosure() with name " << qname << "\n";
 
     NameComparisonResult::NameRelation version_cmp = 
         qname.compare(version_name).getRelation();
 
     if (version_cmp == NameComparisonResult::EQUAL ||
         version_cmp == NameComparisonResult::SUBDOMAIN) {
-        NameComparisonResult::NameRelation sub_cmp = 
-           version_name.compare(*match.closestName()).getRelation();
+        if (match.closestName() == NULL) {
+            match.update(*this, version_name);
+        } else {
+            NameComparisonResult::NameRelation sub_cmp = 
+                version_name.compare(*match.closestName()).getRelation();
 
-        if (sub_cmp == NameComparisonResult::EQUAL || 
-            sub_cmp == NameComparisonResult::SUBDOMAIN) {
-            match.update(*this, version_name);
+            if (sub_cmp == NameComparisonResult::EQUAL || 
+                sub_cmp == NameComparisonResult::SUBDOMAIN) {
+                match.update(*this, version_name);
+            }
         }
     }
 
@@ -70,12 +75,16 @@
 
     if (authors_cmp == NameComparisonResult::EQUAL ||
         authors_cmp == NameComparisonResult::SUBDOMAIN) {
-        NameComparisonResult::NameRelation sub_cmp = 
-            authors_name.compare(*match.closestName()).getRelation();
-
-        if (sub_cmp == NameComparisonResult::EQUAL || 
-            sub_cmp == NameComparisonResult::SUBDOMAIN) {
+        if (match.closestName() == NULL) {
             match.update(*this, authors_name);
+        } else {
+            NameComparisonResult::NameRelation sub_cmp = 
+                authors_name.compare(*match.closestName()).getRelation();
+    
+            if (sub_cmp == NameComparisonResult::EQUAL || 
+                sub_cmp == NameComparisonResult::SUBDOMAIN) {
+                match.update(*this, authors_name);
+            }
         }
     }
 }