Changeset 14274 for lang/python

Timestamp:

06/20/08 00:25:01 (5 months ago)

Author:

ayu

Message:

• added swig IF.
  

Location:

lang/python/incsearch

Files:

• include/DocDb.h (modified) (1 diff)
• incsearch/__init__.py (added)
• incsearch/incsearch.i (modified) (1 diff)
• setup.py (added)
• src/DocDb.cpp (modified) (3 diffs)
• src/test.cpp (modified) (1 diff)

lang/python/incsearch/include/DocDb.h

@@ -6 +6 @@
 #include <vector>
 
-using namespace qdbm;
-
 namespace incsearch{
 
 class DocDbWriter{
 private:
-  Villa villa;
+  qdbm::Villa villa;
 public:
   DocDbWriter(const std::string& dbname);
   ~DocDbWriter();
-  void put(const std::string& word, const std::string& fname, const std::string& name);
+  void put(const std::string& word, const std::string& data);
 };
 
 class DocDbReader{
 private:
-  Villa villa;
+  qdbm::Villa villa;
   boost::mutex mtx;
 public:

lang/python/incsearch/incsearch/incsearch.i

@@ -1 @@
-%module 
+%module db
 
 %include "std_vector.i"
+%include "std_string.i"
 %{
 #include <vector>
-#include "ward.h"
-#include "wardupdator.h"
+#include <string>
+#include <boost/thread/thread.hpp>
+#include <xvilla.h>
+#include "DocDb.h"
 %}
-%include "ward.h"
+%include "DocDb.h"
 
-%template(SizeVec) std::vector<std::size_t>;
-%template(DoubleVec) std::vector<double>;
-%template(Matrix) std::vector<std::vector<double> >;
-%template(Histories) std::vector<History>;
+%template(StringVec) std::vector<std::string>;
  

lang/python/incsearch/src/DocDb.cpp

@@ -5 +5 @@
 
 #include "DocDb.h"
-using namespace qdbm;
 
 namespace incsearch{
-  DocDbWriter::DocDbWriter(const std::string& dbname): villa(dbname.c_str(), Villa::OWRITER | Villa::OCREAT)
+  DocDbWriter::DocDbWriter(const std::string& dbname): villa(dbname.c_str(), qdbm::Villa::OWRITER | qdbm::Villa::OCREAT)
   {}
 
@@ -16 +15 @@
   }
 
-  void DocDbWriter::put(const std::string& word, const std::string& fname, const std::string& name){
-    std::string val = fname+"\t"+name;
-    villa.put(word.c_str(), word.size()+1, val.c_str(), val.size()+1, Villa::DDUP);
+  void DocDbWriter::put(const std::string& word, const std::string& data){
+    villa.put(word.c_str(), word.size()+1, data.c_str(), data.size()+1, qdbm::Villa::DDUP);
   }
 
-  DocDbReader::DocDbReader(const std::string& dbname): villa(dbname.c_str(), Villa::OREADER), mtx()
+  DocDbReader::DocDbReader(const std::string& dbname): villa(dbname.c_str(), qdbm::Villa::OREADER), mtx()
   {}
 
@@ -55 +53 @@
         villa.curnext();
       }
-    }catch(Villa_error& e){
-      if(e.code() != Villa::ENOITEM) throw e;
+    }catch(qdbm::Villa_error& e){
+      if(e.code() != qdbm::Villa::ENOITEM) throw e;
     }
   }

lang/python/incsearch/src/test.cpp

@@ -19 +19 @@
   {//このスコープでDB作成
     DocDbWriter d("sample");
-    d.put("ABC", "FF1", "NN1");
-    d.put("ABD", "FF2", "NN2");
-    d.put("AB", "FF3", "NN3");
-    d.put("XYZ", "FF4", "NN4");
-    d.put("XYX", "FF5", "NN5");
-    d.put("XAB", "FF6", "NN6");
+    d.put("ABC", "FF1\tNN1");
+    d.put("ABD", "FF2\tNN2");
+    d.put("AB", "FF3\tNN3");
+    d.put("XYZ", "FF4\tNN4");
+    d.put("XYX", "FF5\tNN5");
+    d.put("XAB", "FF6\tNN6");
   }