rdbxml 0.6 → 0.7

data/README

@@ -7,7 +7,7 @@ progress.
 
 == Requirements
 * Rake[http://rake.rubyforge.org] >= 7.0
-* Berkely DBXML[http://dev.sleepycat.com/downloads/releasehistorybdbxml.html]
+* Oracle BDB XML[http://www.oracle.com/technology/products/berkeley-db/xml/index.html]
 
 == Installation
 
@@ -17,34 +17,22 @@ RDBXML is distributed as a Ruby Gem for easy installation, e.g.
   sudo gem install rdbxml
 
 This will attempt to find the DBXML libaries/headers in the standard paths (plus
-/usr/local/) and will use the interface files taken from the dbxml-2.2.13
+/usr/local/) and will use the interface files taken from the dbxml-2.3.10
 distribution (the latest version, at the time of this writing).
 
 === The Right Way
 
 Due to tight dependencies, it's recommended that you obtain, build, and install
-the latest version of the DBXML distribution (from
-Sleepycat[http://dev.sleepycat.com/downloads/releasehistorybdbxml.html]), e.g.:
-  # fetch and extract
-  cd /tmp
-  wget http://downloads.sleepycat.com/dbxml-2.2.13.tar.gz
-  tar -xvzf dbxml-2.2.13.tar.gz
-  cd dbxml-2.2.13
-
-  # build (see DBXML docs for further instructions)
-  ./buildall.sh
-
-  # install
-  sudo cp -a /tmp/dbxml-2.2.13/install /usr/local
-  sudo ldconfig
+the latest version of the DBXML distribution from
+Oracle[http://www.oracle.com/technology/software/products/berkeley-db/xml/index.html].
 
 This will ensure that you have the correct versions of the various BDB and
 BDBXML libraries, as well as the current SWIG Interface definitions included in
 the DBXML distribution.
 
 You then pass the location of the (built) DBXML distribution to the RDBXML build
-system:
-  DBXML_DIST=/tmp/dbxml-2.2.13 sudo gem install rdbxml
+system, e.g.:
+  DBXML_DIST=/tmp/dbxml-2.3.10 sudo gem install rdbxml
 
 This will build, test, and install the RDBXML gem.
 
@@ -76,5 +64,5 @@ any issues on the RDBXML Website[http://rubyforge.org/projects/rdbxml].
 Author::    Steve Sloan (mailto:steve@finagle.org)
 Website::   http://rdbxml.rubyforge.org
 Rubyforge:: http://rubyforge.org/projects/rdbxml
-Copyright:: Copyright (c) 2006 Steve Sloan
+Copyright:: Copyright (c) 2007 Steve Sloan
 License::   MIT

data/Rakefile

@@ -6,7 +6,7 @@ require 'rake/rdoctask'
 require 'rake/gempackagetask'
 require 'rake/contrib/rubyforgepublisher'
 
-GEM_VERSION = '0.6'
+GEM_VERSION = '0.7'
 
 dbxml_dist = ENV['DBXML_DIST']
 if dbxml_dist
@@ -36,7 +36,7 @@ desc "Build the BDBXML interface extension"
 Rake::SWIGExtensionTask.new :dbxml do |t|
   t.dir = 'ext'
   t.deps[:dbxml] << :dbxml_ruby
-  t.link_libs += ['db', 'db_cxx', 'dbxml', 'xquery', 'xerces-c', 'pathan']
+  t.link_libs += ['db', 'db_cxx', 'dbxml', 'xqilla', 'xerces-c']
 end
 
 task :test => :extensions
@@ -49,7 +49,7 @@ end
 
 task :install => [:test, :clean] do end
 
-rd = Rake::RDocTask.new :rdoc do |rdoc|
+docs = Rake::RDocTask.new :rdoc do |rdoc|
   rdoc.rdoc_dir = 'html'
   rdoc.title    = "RDBXML -- XML Databases for Ruby"
   rdoc.options += ['--line-numbers', '--inline-source', '--main', 'README', '--exclude', 'ext/*.c*']
@@ -59,7 +59,7 @@ rd = Rake::RDocTask.new :rdoc do |rdoc|
   rdoc.rdoc_files.include 'rake/**/*task.rb'
 end
 
-GEM_FILES = rd.rdoc_files + FileList[
+GEM_FILES = docs.rdoc_files + FileList[
   'Rakefile',
   'ext/**/*.i',
   'rake/**/*.rb',
@@ -83,8 +83,8 @@ spec = Gem::Specification.new do |s|
   s.require_paths << 'ext'
 
   s.has_rdoc = true
-  s.extra_rdoc_files = rd.rdoc_files.reject { |fn| fn =~ /\.rb$/ }.to_a
-  s.rdoc_options = rd.options
+  s.extra_rdoc_files = docs.rdoc_files.reject { |fn| fn =~ /\.rb$/ }.to_a
+  s.rdoc_options = docs.options
 end
 Rake::GemPackageTask.new spec  do |pkg|
   pkg.need_zip = true
@@ -95,5 +95,3 @@ task :default => :extensions
 task :all => :extensions
 
 load 'publish.rf' if File.exist? 'publish.rf'
-
-

data/ext/dbxml.i

@@ -56,6 +56,8 @@ public:
 #error "Unknown SWIG target language"
 #endif
 
+// DBXML_USEOVERLOADS -- defined when a language supports overloaded
+// functions.  If defined, the "OVERLOAD_NAME" macro is a no-op
 #if defined(SWIGJAVA) || defined(SWIGPYTHON) || defined(SWIGCSHARP) || defined(SWIGTCL8) || defined(SWIGRUBY)
 #define DBXML_USEOVERLOADS
 #endif
@@ -64,7 +66,7 @@ public:
 #define DBXML_USE_RESOLVER
 #endif
 
-typedef unsigned int u_int32_t;
+ //typedef unsigned int u_int32_t;
 typedef int int32_t;
 
 class XmlManager;
@@ -82,6 +84,9 @@ class XmlModify;
 class XmlTransaction;
 class XmlMetaDataIterator;
 class XmlStatistics;
+class XmlEventReader;
+class XmlEventWriter;
+class XmlEventReaderToWriter;
 #if defined(DBXML_USE_RESOLVER)
 class XmlResolver;
 #endif
@@ -98,8 +103,9 @@ class XmlResolver;
 #ifndef SWIGJAVA
 // For Java, this is done differently
 enum {
-	DB_CREATE, DB_DIRTY_READ, DB_EXCL,
-	DB_NOMMAP, DB_RDONLY, DB_THREAD,
+	DB_CREATE, DB_READ_UNCOMMITTED, DB_DIRTY_READ,
+	DB_EXCL, DB_NOMMAP, DB_RDONLY, DB_THREAD,
+	DB_READ_COMMITTED, DB_DEGREE_2,
 	DB_INIT_LOCK, DB_INIT_LOG, DB_INIT_MPOOL, DB_INIT_TXN,
 	DB_SALVAGE, DB_AGGRESSIVE
 };
@@ -111,6 +117,12 @@ enum {
 %javaconst(1);
 #endif
 
+// This directive will turn all instances of u_int32_t in
+// this file into int for the purposes of typemaps and typing.
+// For various reaons, as of SWIG 1.3.29, this works better,
+// and should not cause any actual failures anywhere.
+%apply int {u_int32_t};
+
 //
 // see DbXmlFwd.hpp for these enums
 //
@@ -119,17 +131,18 @@ enum {
 	DBXML_ADOPT_DBENV =        0x00000001,
 	DBXML_ALLOW_EXTERNAL_ACCESS = 0x00000002,
 	DBXML_ALLOW_AUTO_OPEN    = 0x00000004,
-	DBXML_ALLOW_VALIDATION  =  0x00100000,
-	DBXML_TRANSACTIONAL =      0x00200000,
-	DBXML_REVERSE_ORDER =      0x00100000,
-	DBXML_INDEX_VALUES =       0x00200000,
-	DBXML_CACHE_DOCUMENTS =    0x00400000,
-	DBXML_CHKSUM =             0x00400000,
-	DBXML_ENCRYPT =            0x00800000,
-	DBXML_NO_INDEX_NODES =     0x10000000,
-	DBXML_GEN_NAME =           0x20000000,
-	DBXML_LAZY_DOCS =          0x40000000,
-	DBXML_INDEX_NODES =        0x80000000
+	DBXML_ALLOW_VALIDATION      = 0x00100000,
+	DBXML_TRANSACTIONAL         = 0x00200000,
+	DBXML_CHKSUM                = 0x00400000,
+	DBXML_ENCRYPT               = 0x00800000,
+	DBXML_INDEX_NODES           = 0x01000000,
+	DBXML_NO_INDEX_NODES        = 0x02000000,
+	DBXML_REVERSE_ORDER         = 0x00100000,
+	DBXML_INDEX_VALUES          = 0x00200000,
+	DBXML_CACHE_DOCUMENTS       = 0x00400000,
+	DBXML_LAZY_DOCS             = 0x00800000,
+	DBXML_WELL_FORMED_ONLY      = 0x01000000,
+	DBXML_GEN_NAME              = 0x02000000
 };
 
 // LogLevel
@@ -257,10 +270,15 @@ void setLogCategory(enum LogCategory category, bool enabled) {
 #ifndef SWIGJAVA
 %newobject XmlContainer::getDocument(const std::string&);
 %newobject XmlContainer::getDocument(XmlTransaction&, const std::string&);
+%newobject XmlContainer::getNode(const std::string&);
+%newobject XmlContainer::getNode(XmlTransaction&, const std::string&);
 #endif
 %newobject XmlContainer::getDocument(const std::string&, u_int32_t);
 %newobject XmlContainer::getDocument(XmlTransaction&, const std::string&,
 				     u_int32_t);
+%newobject XmlContainer::getNode(const std::string&, u_int32_t);
+%newobject XmlContainer::getNode(XmlTransaction&, const std::string&,
+				 u_int32_t);
 %newobject XmlContainer::getAllDocuments(u_int32_t);
 %newobject XmlContainer::getAllDocuments(XmlTransaction&, u_int32_t);
 %newobject XmlContainer::lookupIndex(XmlQueryContext &, const std::string &,
@@ -370,6 +388,7 @@ void setLogCategory(enum LogCategory category, bool enabled) {
 %newobject XmlValue::getAttributes() const;
 %newobject XmlValue::getOwnerElement() const;
 %newobject XmlValue::asBinary() const;
+%newobject XmlValue::loadNodeHandle() const;
 
 %newobject XmlIndexSpecification::find(const std::string&, const std::string&);
 %newobject XmlIndexSpecification::next();
@@ -379,6 +398,7 @@ void setLogCategory(enum LogCategory category, bool enabled) {
 #if defined(DBXML_USE_RESOLVER)
 %newobject XmlResolver::resolveSchema(XmlTransaction*, XmlManager&, const std::string&, const std::string&) const;
 %newobject XmlResolver::resolveEntity(XmlTransaction*, XmlManager&, const std::string&, const std::string&) const;
+%newobject XmlResolver::resolveModule(XmlTransaction*, XmlManager&, const std::string&, const std::string&) const;
 #endif
 
 #ifdef SWIGJAVA
@@ -403,6 +423,7 @@ OVERLOAD_NAME(XmlManagerFromEnv)
 #ifndef SWIGJAVA
 	void setDefaultContainerFlags(u_int32_t flags);
 	u_int32_t getDefaultContainerFlags();
+	u_int32_t getFlags() const;
 #endif
 	void setDefaultPageSize(u_int32_t pageSize);
 	u_int32_t getDefaultPageSize();
@@ -418,6 +439,9 @@ OVERLOAD_NAME(XmlManagerFromEnv)
 	void registerResolver(const XmlResolver &resolver);
 #endif
 
+	int getImplicitTimezone() const;
+	void setImplicitTimezone(int tz);
+
 	int existsContainer(const std::string &name);
 	void removeContainer(const std::string &name);
 OVERLOAD_NAME(removeContainerWithTxn)
@@ -428,6 +452,14 @@ OVERLOAD_NAME(renameContainerWithTxn)
 	void renameContainer(XmlTransaction &txn, const std::string &oldName,
 			     const std::string &newName);
 	void upgradeContainer(const std::string &name, XmlUpdateContext &uc);
+	void compactContainer(const std::string &name, XmlUpdateContext &uc,
+			      u_int32_t flags = 0);
+	void compactContainer(XmlTransaction &txn, const std::string &name,
+			      XmlUpdateContext &uc, u_int32_t flags = 0);
+	void truncateContainer(const std::string &name, XmlUpdateContext &uc,
+			       u_int32_t flags = 0);
+	void truncateContainer(XmlTransaction &txn, const std::string &name,
+			       XmlUpdateContext &uc, u_int32_t flags = 0);
 	void reindexContainer(const std::string &name, XmlUpdateContext &uc,
 			      u_int32_t flags = 0);
 	void reindexContainer(XmlTransaction &txn, const std::string &name,
@@ -752,6 +784,11 @@ public:
 
 };
 
+#ifdef SWIGJAVA
+%ignore putDocument(const std::string &name, XmlEventReader &reader, XmlUpdateContext &context);
+%ignore putDocument(XmlTransaction &txn, const std::string &name, XmlEventReader &reader, XmlUpdateContext &context);
+#endif
+
 class XmlContainer
 {
 public:
@@ -769,13 +806,14 @@ public:
 	void sync();
 #ifndef SWIGJAVA
 	void close();
+	u_int32_t getFlags() const;
 #endif SWIGJAVA
 
 	bool addAlias(const std::string &alias);
 	bool removeAlias(const std::string &alias);
-
+#ifndef SWIGJAVA
 	XmlManager &getManager();
-
+#endif
 	const std::string &getName() const;
 	enum XmlContainer::ContainerType getContainerType() const;
 	bool getIndexNodes() const;
@@ -838,7 +876,14 @@ OVERLOAD_NAME(replaceDefaultIndexWithTxn)
 			 u_int32_t flags = 0);
 OVERLOAD_NAME(putDocumentAsString)
 	std::string putDocument(const std::string &name, const std::string &contents,
-			 XmlUpdateContext &context, u_int32_t flags = 0);
+				XmlUpdateContext &context, u_int32_t flags = 0);
+OVERLOAD_NAME(putDocumentAsEventReader)
+        std::string putDocument(const std::string &name, XmlEventReader &reader,
+				XmlUpdateContext &context, u_int32_t flags = 0);
+OVERLOAD_NAME(putDocumentAsEventWriter)
+        XmlEventWriter &putDocumentAsEventWriter(XmlDocument &document,
+						 XmlUpdateContext &context,
+						 u_int32_t flags = 0);
 	void deleteDocument(XmlDocument &document,
 			    XmlUpdateContext &context);
 OVERLOAD_NAME(deleteDocumentByName)
@@ -868,6 +913,17 @@ OVERLOAD_NAME(putDocumentAsStringWithTxn)
 				const std::string &contents,
 				XmlUpdateContext &context,
 				u_int32_t flags = 0);
+OVERLOAD_NAME(putDocumentAsEventReaderWithTxn)
+	std::string putDocument(XmlTransaction &txn,
+				const std::string &name,
+				XmlEventReader &reader,
+				XmlUpdateContext &context,
+				u_int32_t flags = 0);
+OVERLOAD_NAME(putDocumentAsEventWriterWithTxn)
+        XmlEventWriter &putDocumentAsEventWriter(XmlTransaction &txn,
+						 XmlDocument &document,
+						 XmlUpdateContext &context,
+						 u_int32_t flags = 0);
 OVERLOAD_NAME(deleteDocumentWithTxn)
 	void deleteDocument(XmlTransaction &txn, XmlDocument &document,
 			    XmlUpdateContext &context);
@@ -907,6 +963,14 @@ OVERLOAD_NAME(getDocumentWithTxn)
 	{
 		return new XmlDocument(self->getDocument(txn, name, 0));
 	}
+	XmlValue *getNode(const std::string &name) {
+		return new XmlValue(self->getNode(name, 0));
+	}
+OVERLOAD_NAME(getNodeWithTxn)
+	XmlValue *getNode(XmlTransaction &txn, const std::string &name)
+	{
+		return new XmlValue(self->getNode(txn, name, 0));
+	}
 #endif
 OVERLOAD_NAME(getDocumentWithFlags)
 	XmlDocument *getDocument(const std::string &name, u_int32_t flags) {
@@ -917,6 +981,16 @@ OVERLOAD_NAME(getDocumentWithFlagsAndTxn)
 				 u_int32_t flags) {
 		return new XmlDocument(self->getDocument(txn, name, flags));
 	}
+OVERLOAD_NAME(getNodeWithFlags)
+	XmlValue *getNode(const std::string &name, u_int32_t flags) {
+		return new XmlValue(self->getNode(name, flags));
+	}
+OVERLOAD_NAME(getNodeWithFlagsAndTxn)
+	XmlValue *getNode(XmlTransaction &txn, const std::string &name,
+				 u_int32_t flags) {
+		return new XmlValue(self->getNode(txn, name, flags));
+	}
+
 	XmlResults *getAllDocuments(u_int32_t flags) {
 		   return new XmlResults(self->getAllDocuments(flags));
 	}
@@ -1012,6 +1086,11 @@ OVERLOAD_NAME(lookupEdgeStatisticsWithTxn)
 } /* %extend */
 };
 
+#ifdef SWIGJAVA
+%rename(setContentAsXmlInputStream_java) XmlDocument::setContentAsXmlInputStream;
+%rename(setContentAsEventReader_java) XmlDocument::setContentAsEventReader;
+#endif
+
 class XmlDocument
 {
 public:
@@ -1038,8 +1117,14 @@ OVERLOAD_NAME(setContentWithXmlData)
 	// input stream is owned by caller
 	XmlInputStream *getContentAsXmlInputStream() const;
 	// input stream is donated to callee
+
 	void setContentAsXmlInputStream(XmlInputStream *adopted);
 
+	XmlEventReader &getContentAsEventReader() const;
+	void setContentAsEventReader(XmlEventReader &reader);
+
+	void getContentAsEventWriter(XmlEventWriter &writer);
+
 	void fetchAllData();
 	void setMetaData(const std::string &uri,
 			 const std::string &name, const XmlValue &value);
@@ -1072,6 +1157,9 @@ OVERLOAD_NAME(getMetaDataAsXmlData)
 	XmlMetaDataIterator *getMetaDataIterator() const {
 		return new XmlMetaDataIterator(self->getMetaDataIterator());
 	}
+	bool equals(const XmlDocument &other) const {
+		return (*self == other);
+	}
 }
 };
 
@@ -1151,6 +1239,9 @@ public:
 	enum XmlQueryContext::EvaluationType getEvaluationType() const;
 	void setDefaultCollection(const std::string &uri);
 	std::string getDefaultCollection() const;
+	void interruptQuery();
+	void setQueryTimeoutSeconds(u_int32_t secs);
+	u_int32_t getQueryTimeoutSeconds() const;
 
 %extend {
 	XmlValue *getVariableValue(const std::string &name) const {
@@ -1249,7 +1340,7 @@ public:
 	bool previous(XmlValue &value);
 	bool peek(XmlValue &value);
 #endif
-
+	enum XmlQueryContext::EvaluationType getEvaluationType() const;
 OVERLOAD_NAME(nextDocument)
 	bool next(XmlDocument &document);
 OVERLOAD_NAME(previousDocument)
@@ -1360,6 +1451,8 @@ OVERLOAD_NAME(XmlValueTypedFromXmlData)
 
 	~XmlValue();
 	enum XmlValue::Type getType() const;
+	std::string getTypeURI() const;
+	std::string getTypeName() const;
 	bool isNull() const;
 	bool isType(enum XmlValue::Type type) const;
 
@@ -1389,6 +1482,8 @@ OVERLOAD_NAME(asStringEncoded)
 	}
 }
 #endif
+	XmlEventReader &asEventReader() const;
+	std::string getNodeHandle() const;
 	bool equals(const XmlValue &value) const;
 
 	std::string getNodeName() const;
@@ -1607,15 +1702,23 @@ protected:
 public:
 	virtual ~XmlResolver();
 	virtual bool resolveDocument(XmlTransaction *txn,XmlManager &mgr,
-				     const std::string &uri, XmlValue &res) const;
+				     const std::string &uri,
+				     XmlValue &reslt) const;
 	virtual bool resolveCollection(XmlTransaction *txn, XmlManager &mgr,
-				       const std::string &uri, XmlResults &res) const;
+				       const std::string &uri,
+				       XmlResults &reslt) const;
 	virtual XmlInputStream *resolveSchema(XmlTransaction *txn, XmlManager &mgr,
 					      const std::string &schemaLocation,
 					      const std::string &nameSpace) const;
 	virtual XmlInputStream *resolveEntity(XmlTransaction *txn, XmlManager &mgr,
 					      const std::string &systemId,
 					      const std::string &publicId) const;
+
+	virtual bool resolveModuleLocation(
+		XmlTransaction *txn, XmlManager &mgr,
+		const std::string &nameSpace, XmlResults &reslt) const;
+	virtual XmlInputStream *resolveModule(XmlTransaction *txn, XmlManager &mgr,
+		const std::string &moduleLocation, const std::string &nameSpace) const;
 };
 #endif
 
@@ -1640,14 +1743,29 @@ public:
 				 enum XmlModify::XmlObject type,
 				 const std::string &name,
 				 const std::string &content);
+OVERLOAD_NAME(addInsertBeforeStepWithResults)
+	void addInsertBeforeStep(const XmlQueryExpression &selectionExpr,
+				 enum XmlModify::XmlObject type,
+				 const std::string &name,
+				 XmlResults &content);
 	void addInsertAfterStep(const XmlQueryExpression &selectionExpr,
 				enum XmlModify::XmlObject type,
 				const std::string &name,
 				const std::string &content);
+OVERLOAD_NAME(addInsertAfterStepWithResults)
+	void addInsertAfterStep(const XmlQueryExpression &selectionExpr,
+				enum XmlModify::XmlObject type,
+				const std::string &name,
+				XmlResults &content);
 	void addAppendStep(const XmlQueryExpression &selectionExpr,
 			   enum XmlModify::XmlObject type,
 			   const std::string &name,
 			   const std::string &content, int location = -1);
+OVERLOAD_NAME(addAppendStepWithResults)
+	void addAppendStep(const XmlQueryExpression &selectionExpr,
+			   enum XmlModify::XmlObject type,
+			   const std::string &name,
+			   XmlResults &content, int location = -1);
 	void addUpdateStep(const XmlQueryExpression &selectionExpr,
 			   const std::string &content);
 	void addRemoveStep(const XmlQueryExpression &selectionExpr);
@@ -1706,3 +1824,136 @@ public:
 	double getNumberOfUniqueKeys() const;
 	double getSumKeyValueSize() const;
 };
+
+#ifdef SWIGJAVA
+%rename(closeInternal) XmlEventReader::close;
+#endif
+
+class XmlEventReader
+{
+public:
+	enum { // XmlEventType
+		StartElement,
+		EndElement,
+		Characters,
+		CDATA,
+		Comment,
+		Whitespace,
+		StartDocument,
+		EndDocument,
+		StartEntityReference,
+		EndEntityReference,
+		ProcessingInstruction,
+		DTD
+	};
+	~XmlEventReader();
+	void close();
+
+	void setReportEntityInfo(bool value);
+	bool getReportEntityInfo() const;
+	void setExpandEntities(bool value);
+	bool getExpandEntities() const;
+
+	enum XmlEventReader::XmlEventType next();
+	enum XmlEventReader::XmlEventType nextTag();
+
+	bool hasNext() const;
+	enum XmlEventReader::XmlEventType getEventType() const;
+
+	const unsigned char *getNamespaceURI() const;
+	const unsigned char *getLocalName() const;
+	const unsigned char *getPrefix() const;
+// avoid the by-reference length parameter for non-C++, instead
+// add an explicit call
+%extend {
+	const unsigned char *getValue() const {
+		int len;
+		return self->getValue(len);
+	}
+}
+#ifndef SWIGJAVA
+// byte length is not useful for Java.  It may not
+// be for other languages -- need to check
+%extend {
+	int getValueLength() const {
+		int len;
+		(void)self->getValue(len);
+		return len;
+	}
+}
+#endif
+
+	int getAttributeCount() const;
+	bool isAttributeSpecified(int index) const;
+	const unsigned char *getAttributeLocalName(int index) const;
+	const unsigned char *getAttributeNamespaceURI(int index) const;
+	const unsigned char *getAttributePrefix(int index) const;
+	const unsigned char *getAttributeValue(int index) const;
+
+	const unsigned char *getEncoding() const;
+	const unsigned char *getVersion() const;
+	const unsigned char *getSystemId() const;
+	bool isStandalone() const;
+	bool standaloneSet() const;
+	bool encodingSet() const;
+
+	bool hasEntityEscapeInfo() const;
+	bool needsEntityEscape(int index = 0) const;
+	bool hasEmptyElementInfo() const;
+	bool isEmptyElement() const;
+	bool isWhiteSpace() const;
+};
+
+#ifdef SWIGJAVA
+%rename(closeInternal) XmlEventWriter::close;
+#endif
+
+class XmlEventWriter
+{
+public:
+	~XmlEventWriter();
+	void close();
+
+	void writeAttribute(const unsigned char *localName,
+			    const unsigned char *prefix,
+			    const unsigned char *uri,
+			    const unsigned char *value,
+			    bool isSpecified);
+
+	void writeText(enum XmlEventReader::XmlEventType type,
+		       const unsigned char *text,
+		       int length);
+
+	void writeProcessingInstruction(const unsigned char *target,
+					const unsigned char *data);
+
+	void writeStartElement(const unsigned char *localName,
+			       const unsigned char *prefix,
+			       const unsigned char *uri,
+			       int numAttributes,
+			       bool isEmpty);
+	void writeEndElement(const unsigned char *localName,
+			     const unsigned char *prefix,
+			     const unsigned char *uri);
+
+	void writeDTD(const unsigned char *dtd, int length);
+	void writeStartDocument(const unsigned char *version,
+				const unsigned char *encoding,
+				const unsigned char *standalone);
+	void writeEndDocument();
+
+	void writeStartEntity(const unsigned char *name,
+			      bool expandedInfoFollows);
+	void writeEndEntity(const unsigned char *name);
+};
+
+class XmlEventReaderToWriter
+{
+public:
+	XmlEventReaderToWriter(XmlEventReader &reader,
+			       XmlEventWriter &writer,
+			       bool ownsReader);
+	~XmlEventReaderToWriter();
+
+	void start();
+};

data/ext/dbxml_ruby.i

@@ -48,11 +48,13 @@ public:
     UNKNOWN_INDEX,  ///< The indexing strategy name is unknown.
     INVALID_VALUE, ///< An invalid parameter was passed.
     VERSION_MISMATCH, ///< The container version and the dbxml library version are not compatible.
-    UNUSED_2,         ///< Placeholder
+    EVENT_ERROR, ///< Error using the event reader
     CONTAINER_NOT_FOUND, ///< The specified container could not be found
     TRANSACTION_ERROR, ///< An XmlTransaction has already been committed or aborted
     UNIQUE_ERROR, ///< A uniqueness constraint has been violated
-    NO_MEMORY_ERROR ///< An operation was unable to allocate memory
+    NO_MEMORY_ERROR, ///< Unable to allocate memory
+    OPERATION_TIMEOUT, ///< An operation timed out
+    OPERATION_INTERRUPTED ///< An operation was explicitly interrupted
   };
 
   explicit XmlException(const DbException &e, const char *file = 0, int line = 0);

data/extconf.rb

@@ -1,37 +1,9 @@
 #!/usr/bin/env ruby
 DBXML_DIST=ENV['DBXML_DIST'] || './dbxml-2.2.13'
 
-# Build makefile that just calls rakefile
+# Build wrapper makefile that just calls rakefile
 File.open( 'Makefile', 'w' ) do |mk|
   targets = ['all', 'clean', 'test', 'install']
   mk.puts ".PHONY: #{targets.join(' ')}\n"
   targets.each { |t|  mk.puts "#{t}:\n\t@rake $@\n" }
 end
-
-
-=begin
-require 'mkmf2'
-
-MAKEFILE_CONFIG['CC'].gsub! 'gcc', 'g++'
-MAKEFILE_CONFIG['CPP'].gsub! 'gcc', 'g++'
-
-###############################################################################
-
-#b.libs += ['db-4.3', 'db_cxx-4.3', 'dbxml-2.2', 'xquery-1.2', 'xerces-c', 'pathan']
-
-add_include_path File.join( DBXML_DIST, 'install', 'include' )
-add_library_path File.join( DBXML_DIST, 'install', 'lib' )
-require_library 'db', 'db_version', 'db.h'
-require_library 'db_cxx', 'DbEnv::version', 'db_cxx.h'
-declare_binary_library 'db', 'db_wrap.cc'
-
-#add_include_path File.join( DBXML_DIST, 'install', 'include', 'dbxml' )
-require_library 'xerces-c', 'XERCES_VERSIONSTR', 'xercesc/util/XercesVersion.hpp'
-require_library 'pathan'
-require_library 'xquery'
-require_library 'dbxml', 'DBXML_VERSION_STRING', 'dbxml/DbXmlFwd.hpp'
-declare_binary_library 'dbxml', 'dbxml_wrap.cc'
-
-
-File.open( 'Makefile', 'a' ) { |mk|  mk.puts "DBXML_DIST=#{DBXML_DIST}", 'include Makefile.swig' }
-=end

data/lib/rdbxml.rb

@@ -163,6 +163,12 @@ class Dbxml::XmlDocument
       while i.next  do  s += 1  end
       s
     end
+
+    def inspect
+      all = {}
+      self.each { |n, v|  all[n] = v }
+      all.inspect
+    end
   end
 
   # Returns the document metadata[http://www.sleepycat.com/xmldocs/api_cxx/XmlDocument_getMetaData.html]
@@ -183,7 +189,7 @@ class Dbxml::XmlContainer
     begin
       getDocument name.to_s
     rescue Dbxml::XmlException => ex
-      raise unless ex.err == XmlException::DOCUMENT_NOT_FOUND
+      raise unless ex.err == Dbxml::XmlException::DOCUMENT_NOT_FOUND
       nil
     end
   end
@@ -209,7 +215,7 @@ class Dbxml::XmlContainer
     begin
       putDocument doc, ctx, 0
     rescue Dbxml::XmlException => ex
-      raise unless ex.err == XmlException::UNIQUE_ERROR
+      raise unless ex.err == Dbxml::XmlException::UNIQUE_ERROR
       d = self[doc.name]
       d.content = doc.content
       updateDocument d, ctx

data/rake/extensiontask.rb

@@ -2,6 +2,8 @@ require 'rake'
 require 'rake/clean'
 require 'rake/tasklib'
 
+# Rake tasks to build Ruby extensions
+
 module Rake
 
   # Create a build task that will generate a Ruby extension (e.g. .so) from one or more
@@ -69,7 +71,7 @@ module Rake
     # - link_libs: <none>
     def set_defaults
       @lib_name ||= name.to_sym
-      @objs ||= [name.to_sym]
+      @objs = [name.to_sym]  unless @objs and @objs.any?
       @dir ||= '.'
       @link_libs ||= []
     end
@@ -79,10 +81,11 @@ module Rake
       output_objs = @objs.collect { |obj| filepath obj, :objext }
       output_lib = filepath lib_name, :dlext
 
-      task name => output_lib  do end
+      task name => output_lib
+
       file output_lib => output_objs do |t|
-        sh_cmd :ldshared, {'-L' => :libdirs}, '-o', output_lib, output_objs,
-                          {'-l' => link_libs}, :libs #, :dldlibs, :librubyarg_shared
+        sh_cmd :ldshared, :dldflags, :ldflags, {'-L' => :libdirs}, '-o', output_lib, output_objs.join(' '),
+               link_libs.collect { |l| "-l#{l}" }.join(' '), :libs, :dldlibs, :librubyarg_shared
       end
 
       CLEAN.include output_objs
@@ -109,19 +112,23 @@ module Rake
 
     class << self
       # The default environment for all extensions.
+      @@DefaultEnv = {}
       def env
         @@DefaultEnv
       end
+      def env=(e)
+        @@DefaultEnv = e
+      end
 
+      Config::CONFIG.merge(ENV).each { |k, v| @@DefaultEnv[k.downcase.to_sym] = v }
       @@DefaultEnv = {
-        :cxx => ENV['CXX'] || 'c++',
-        :cxxflags => ENV['CXXFLAGS'] || '',
+        :cxx => 'c++',
+        :cxxflags => '',
         :c_exts => ['c'],
         :cpp_exts => ['cc', 'cxx', 'cpp'],
         :includedirs => [],
         :libdirs => [],
-      }
-      Config::CONFIG.each { |k, v| @@DefaultEnv[k.downcase.to_sym] = v }
+      }.update(@@DefaultEnv)
     end
 
   protected
@@ -153,7 +160,7 @@ module Rake
           else
             opt.to_s
         end
-      end.join(' ')
+      end.join(' ').squeeze(' ')
     end
 
     def sh_cmd( cmd, *opts )
@@ -178,4 +185,4 @@ module Rake
 
   end
 
-end
+end

data/rake/swigextensiontask.rb

@@ -41,10 +41,10 @@ module Rake
     # - link_libs: <none>
     def set_defaults
       super
-      @objs ||= []
       @ifaces ||= [name.to_sym]
       @deps ||= Hash.new []
-   end
+      @objs = []
+    end
 
     def define_tasks
       for iface in @ifaces
@@ -57,7 +57,6 @@ module Rake
           file src => deps.collect { |dep| filepath(dep, :swigext) } << iface
         end
         CLEAN.include src
-
         @objs << src.sub(/\.[^.]+$/, '.'+env[:objext])
       end
       super
@@ -75,13 +74,13 @@ module Rake
       end
     end
 
-    ExtensionTask.env.update(
+    ExtensionTask.env = {
       :swig => 'swig',
       :swigext => 'i',
       :swig_cppext => '_wrap.cc',
       :swig_flags => ['-ruby', '-c++'],
       :swig_includedirs => ['.']
-    )
+    }.update(ExtensionTask.env)
 
   protected
 
@@ -89,10 +88,11 @@ module Rake
     def verify_swig_version
       @@swig_version ||= IO.popen "#{env[:swig]} -version 2>&1" do |swig|
         banner = swig.readlines.reject { |l| l.strip.empty? }
-        banner[0].match(/SWIG Version ([^ ]+)/i)[1]
+        banner = banner[0].match(/swig version ([^ ]+)/i)
+        banner and banner[1]
       end
-      unless @@swig_version >= '1.3'
-        raise "Need SWIG version 1.3 or later (have #{@@swig_version[0]})"
+      unless @@swig_version and @@swig_version >= '1.3'
+        raise "Need SWIG version 1.3 or later (have #{@@swig_version || 'none'})"
       end
     end
   end

data/test/test_rdbxml.rb

@@ -38,7 +38,7 @@ class XmlValueTest < Test::Unit::TestCase
 
   def test_to_s
     assert_equal '123', XmlValue.new(123).to_s
-    assert_equal '456.789', XmlValue.new(456.789).to_s
+    assert_equal 456.789, XmlValue.new(456.789).to_s.to_f
     assert_equal 'foo', XmlValue.new('foo').to_s
   end
 

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.11
+rubygems_version: 0.9.2
 specification_version: 1
 name: rdbxml
 version: !ruby/object:Gem::Version 
-  version: "0.6"
-date: 2006-05-29 00:00:00 -07:00
+  version: "0.7"
+date: 2007-09-30 00:00:00 -07:00
 summary: Provides wrappers for the BDB XML C++ APIs, plus pure Ruby extensions
 require_paths: 
 - lib
@@ -26,26 +26,27 @@ required_ruby_version: !ruby/object:Gem::Version::Requirement
 platform: ruby
 signing_key: 
 cert_chain: 
+post_install_message: 
 authors: 
 - Steve Sloan
 files: 
 - README
 - MIT-LICENSE
 - lib/rdbxml.rb
-- docs/dbxml.rb
 - docs/db.rb
+- docs/dbxml.rb
 - rake/extensiontask.rb
 - rake/swigextensiontask.rb
 - Rakefile
 - ext/dbxml.i
 - ext/db.i
 - ext/dbxml_ruby.i
-- test/test_rdbxml.rb
 - test/test_db.rb
+- test/test_rdbxml.rb
 - test/test_dbxml.rb
 test_files: 
-- test/test_rdbxml.rb
 - test/test_db.rb
+- test/test_rdbxml.rb
 - test/test_dbxml.rb
 rdoc_options: 
 - --line-numbers