[Zope3-checkins] CVS: Zope3/src/zodb/btrees - BTreeModuleTemplate.c:1.4 BTreeTemplate.c:1.7 BucketTemplate.c:1.9

[Tim Peters]

Update of /cvs-repository/Zope3/src/zodb/btrees
In directory cvs.zope.org:/tmp/cvs-serv29263/src/zodb/btrees

Modified Files:
	BTreeModuleTemplate.c BTreeTemplate.c BucketTemplate.c 
Log Message:
Range searches now crack the optional new excludemin and excludemax
arguments, but don't yet honor them:  nothing useful has changed yet.


=== Zope3/src/zodb/btrees/BTreeModuleTemplate.c 1.3 => 1.4 ===
--- Zope3/src/zodb/btrees/BTreeModuleTemplate.c:1.3	Fri Feb 21 12:33:01 2003
+++ Zope3/src/zodb/btrees/BTreeModuleTemplate.c	Fri Feb 21 22:40:22 2003
@@ -335,7 +335,9 @@
 /* Shared keyword-argument list for BTree/Bucket
  * (iter)?(keys|values|items)
  */
-static char *search_keywords[] = {"min", "max", 0};
+static char *search_keywords[] = {"min", "max",
+				  "excludemin", "excludemax",
+				  0};
 
 #include "BTreeItemsTemplate.c"
 #include "BucketTemplate.c"


=== Zope3/src/zodb/btrees/BTreeTemplate.c 1.6 => 1.7 ===
--- Zope3/src/zodb/btrees/BTreeTemplate.c:1.6	Fri Feb 21 18:24:14 2003
+++ Zope3/src/zodb/btrees/BTreeTemplate.c	Fri Feb 21 22:40:22 2003
@@ -1382,6 +1382,8 @@
 {
   PyObject *min = Py_None;
   PyObject *max = Py_None;
+  int excludemin = 0;
+  int excludemax = 0;
   int rc;
   Bucket *lowbucket = NULL;
   Bucket *highbucket = NULL;
@@ -1390,9 +1392,11 @@
   PyObject *result;
 
   if (args) {
-      if (! PyArg_ParseTupleAndKeywords(args, kw, "|OO",
-					search_keywords,
-					&min, &max))
+      if (! PyArg_ParseTupleAndKeywords(args, kw, "|OOii", search_keywords,
+					&min,
+					&max,
+					&excludemin,
+					&excludemax))
  	  return NULL;
   }
 


=== Zope3/src/zodb/btrees/BucketTemplate.c 1.8 => 1.9 ===
--- Zope3/src/zodb/btrees/BucketTemplate.c:1.8	Fri Feb 21 18:24:14 2003
+++ Zope3/src/zodb/btrees/BucketTemplate.c	Fri Feb 21 22:40:22 2003
@@ -726,11 +726,16 @@
 {
   PyObject *min = Py_None;
   PyObject *max = Py_None;
+  int excludemin = 0;
+  int excludemax = 0;
   int rc;
 
   if (args) {
-      if (! PyArg_ParseTupleAndKeywords(args, kw, "|OO", search_keywords,
-      					&min,  &max))
+      if (! PyArg_ParseTupleAndKeywords(args, kw, "|OOii", search_keywords,
+      					&min,
+      					&max,
+      					&excludemin,
+      					&excludemax))
       return -1;
   }