[svn] commit: r759 - in /branches/each-ds/src/lib/auth/cpp: Makefile.am Makefile.in data_source.h data_source_sqlite3.cc data_source_sqlite3.h data_source_static.cc

[BIND 10 source code commits]

Author: each
Date: Tue Feb  9 01:42:35 2010
New Revision: 759

Log:
checkpoint

Added:
    branches/each-ds/src/lib/auth/cpp/Makefile.in
    branches/each-ds/src/lib/auth/cpp/data_source_sqlite3.cc
    branches/each-ds/src/lib/auth/cpp/data_source_sqlite3.h
Modified:
    branches/each-ds/src/lib/auth/cpp/Makefile.am
    branches/each-ds/src/lib/auth/cpp/data_source.h
    branches/each-ds/src/lib/auth/cpp/data_source_static.cc

Modified: branches/each-ds/src/lib/auth/cpp/Makefile.am
==============================================================================
--- branches/each-ds/src/lib/auth/cpp/Makefile.am (original)
+++ branches/each-ds/src/lib/auth/cpp/Makefile.am Tue Feb  9 01:42:35 2010
@@ -5,5 +5,7 @@
 lib_LTLIBRARIES = libauth.la
 libauth_la_SOURCES = data_source.h data_source.cc
 libauth_la_SOURCES += data_source_static.h data_source_static.cc
+libauth_la_SOURCES += data_source_sqlite3.h data_source_sqlite3.cc
 #libauth_la_SOURCES += data_source_plot.h data_source_plot.cc
 libauth_la_SOURCES += query.h query.cc
+libauth_la_SOURCES += db_sqlite3.h db_sqlite3.cc

Modified: branches/each-ds/src/lib/auth/cpp/data_source.h
==============================================================================
--- branches/each-ds/src/lib/auth/cpp/data_source.h (original)
+++ branches/each-ds/src/lib/auth/cpp/data_source.h Tue Feb  9 01:42:35 2010
@@ -188,8 +188,16 @@
     ~NameMatch() {}
 
     void update(const DataSrc& new_source, const Name& container) {
-        if (closest_name_ == NULL ||
-            closest_name_->getLabelCount() < container.getLabelCount()) {
+        if (closest_name_ == NULL) {
+            closest_name_ = &container;
+            best_source_ = &new_source;
+            return;
+        }
+
+        NameComparisonResult::NameRelation cmp = 
+            container.compare(*closest_name_).getRelation();
+
+        if (cmp == NameComparisonResult::SUBDOMAIN) {
             closest_name_ = &container;
             best_source_ = &new_source;
         }

Modified: branches/each-ds/src/lib/auth/cpp/data_source_static.cc
==============================================================================
--- branches/each-ds/src/lib/auth/cpp/data_source_static.cc (original)
+++ branches/each-ds/src/lib/auth/cpp/data_source_static.cc Tue Feb  9 01:42:35 2010
@@ -50,41 +50,20 @@
 void
 StaticDataSrc::findClosestEnclosure(NameMatch& match) const {
     const Name& qname = match.qname();
+    NameComparisonResult::NameRelation cmp;
 
-    NameComparisonResult::NameRelation version_cmp = 
-        qname.compare(version_name).getRelation();
-
-    if (version_cmp == NameComparisonResult::EQUAL ||
-        version_cmp == NameComparisonResult::SUBDOMAIN) {
-        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);
-            }
-        }
+    cmp = qname.compare(version_name).getRelation();
+    if (cmp == NameComparisonResult::EQUAL ||
+        cmp == NameComparisonResult::SUBDOMAIN) {
+        match.update(*this, version_name);
+        return;
     }
 
-    NameComparisonResult::NameRelation authors_cmp = 
-        qname.compare(authors_name).getRelation();
-
-    if (authors_cmp == NameComparisonResult::EQUAL ||
-        authors_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);
-            }
-        }
+    cmp = qname.compare(authors_name).getRelation();
+    if (cmp == NameComparisonResult::EQUAL ||
+        cmp == NameComparisonResult::SUBDOMAIN) {
+        match.update(*this, authors_name);
+        return;
     }
 }