Add netblock examples and documantion

Also, remove a missing debugging print statement.

diff --git a/README b/README
index e5bd075..ea49d73 100644 (file)
--- a/README
+++ b/README
@@ -13,9 +13,14 @@ the found subnets at or below the specified network will be returned.
 Ending a IP or CIDR query with a single "*" will result in a
 "supernet" search.
 
+It supports (as of v0.4) IPv6 CIDR networks and network blocks, and
+supports indexing network-block type values.  That is, you can index
+values like "10.131.10.0 - 10.131.11.255" and "3ffe:4:5::0 -
+3ffe:4:6::ffff".
+
 REQUIREMENTS
 
-python 2.4 or later
+python 2.2 or later.
 
 INSTALL
 
@@ -76,9 +81,6 @@ following differences, however:
 
 * This server does not support attribute "aliases".
 
-* It doesn't quite support indexing network blocks (i.e., values like
-  "10.1.42.0 - 10.1.42.255").
-
 It should be noted that this server in small ways violates the
 description put forth by RFC 2167.  In particular, it does not
 establish independent schemas for each authority area.  There may be

diff --git a/rwhoisd/QueryProcessor.py b/rwhoisd/QueryProcessor.py
index 1297965..8947d41 100644 (file)
--- a/rwhoisd/QueryProcessor.py
+++ b/rwhoisd/QueryProcessor.py
@@ -250,8 +250,6 @@ class QueryProcessor:
         max = session.limit
         if max: max += 1
 
-        print "process_query: max =", max
-        
         query_result = self.process_full_query(query, max)
 
         objects   = query_result.objects()

diff --git a/sample_data/example_data b/sample_data/example_data
index 2b49200..0f19c37 100644 (file)
--- a/sample_data/example_data
+++ b/sample_data/example_data
@@ -34,6 +34,18 @@ Created: 20040315
 Updated: 20050704
 Updated-By: hostmaster@a.com
 
+ID: LOCAL-BLOCK-1.a.com
+Class-Name: network
+Auth-Area: a.com
+Network-Block: 192.168.1.0 - 192.168.2.255
+Network-Name: LOCAL-BLOCK-1
+Organization: 777.a.com
+Tech-Contact: 222.a.com
+Admin-Contact: 222.a.com
+Created: 20011224
+Updated: 20030505
+Updated-By: hostmaster@a.com
+
 ID:333.a.com
 Auth-Area:a.com
 Class-Name: domain

diff --git a/sample_data/example_schema b/sample_data/example_schema
index d14beca..98f2a71 100644 (file)
--- a/sample_data/example_schema
+++ b/sample_data/example_schema
@@ -5,12 +5,13 @@
 ##   C = cidr index (for ip addresses and netblocks)
 ##   A = all, both a normal and a cidr index
 
-domain-name  = N
-email        = N
-host-name    = N
-ip-address   = C
-ip-network   = C
-last-name    = N
-name         = N
-network-name = N
-org-name     = N
+domain-name   = N
+email         = N
+host-name     = N
+ip-address    = C
+ip-network    = C
+network-block = C
+last-name     = N
+name          = N
+network-name  = N
+org-name      = N