Changeset 285

Timestamp:

02/19/08 04:18:18 (9 months ago)

Author:

jake

Message:

Throxy, unfinished, checkpoint

Location:

trunk

Files:

• throxy (added)
• throxy/Makefile.am (added)
• throxy/bootstrap.sh (added)
• throxy/configure.in (added)
• throxy/src (added)
• throxy/src/Makefile.am (added)
• throxy/src/Makefile.in (added)
• throxy/src/ServiceMonitor.cpp (added)
• throxy/src/ServiceMonitor.h (added)
• throxy/src/SpreadMonitor.h (added)
• throxy/src/StaticServiceMonitor.cpp (added)
• throxy/src/StaticServiceMonitor.h (added)
• throxy/src/ThrudocHandler.cpp (added)
• throxy/src/ThrudocHandler.h (added)
• throxy/src/main.cpp (added)
• throxy/src/static.conf (added)
• throxy/src/throxy.conf (added)
• throxy/throxy_config.h.in (added)
• thrudex/src/CLuceneBackend.cpp (modified) (1 diff)
• thrudoc/src/thrudoc_bench.cpp (modified) (1 diff)
• tutorial/rb/BookmarkExample.rb (modified) (12 diffs)

trunk/thrudex/src/CLuceneBackend.cpp

@@ -27 +27 @@
     }
 
-
     analyzer = boost::shared_ptr<lucene::analysis::Analyzer>(new lucene::analysis::standard::StandardAnalyzer());
 
     //grab the list of current indices
-    boost::filesystem::directory_iterator i(idx_root);
     boost::filesystem::directory_iterator end;
 
-    if (i != end && is_directory (i->status ()))
-    {
-        this->addIndex( i->path().leaf() );
-    }
-
+    for(boost::filesystem::directory_iterator i(idx_root); i != end; ++i){
+
+        if(is_directory (i->status ()))
+        {
+            //skip hidden dirs (.)
+            if(i->path().leaf().substr(0,1) == ".")
+                continue;
+
+            this->addIndex( i->path().leaf() );
+
+            LOG4CXX_INFO(logger, "Added "+i->path().leaf() );
+        }
+    }
 }
 

trunk/thrudoc/src/thrudoc_bench.cpp

@@ -12 +12 @@
 #endif
 /* hack to work around thrift and log4cxx installing config.h's */
-#undef HAVE_CONFIG_H 
+#undef HAVE_CONFIG_H
 
 #include <concurrency/ThreadManager.h>

trunk/tutorial/rb/BookmarkExample.rb

@@ -19 +19 @@
 THRUDOC_BUCKET = "bookmarks";
 
-THRUDEX_DOMAIN = "tutorial";
 THRUDEX_INDEX  = "bookmarks";
 
@@ -47 +46 @@
 
           transport.open()
+
+          @thrudex.admin("create_index", THRUDEX_INDEX);
       end
 
@@ -82 +83 @@
                 add_bookmark(b)
           }
-
-
-          @thrudex.commitAll()
 
           t1 = Time.new()
@@ -121 +119 @@
          #bookmark object to a Thrudex Document
          #
-         doc  = DocMsg.new()
-
-         doc.docid  = id
-         doc.domain = THRUDEX_DOMAIN
+         doc  = Document.new()
+
+         doc.key    = id
          doc.index  = THRUDEX_INDEX
          doc.fields = []
@@ -130 +127 @@
          field = Field.new()
 
-
          #title
-         field.name    = "title"
+         field.key     = "title"
          field.value   = b.title
          field.sortable= true
@@ -139 +135 @@
          #tags
          field = Field.new()
-         field.name    = "tags"
+         field.key     = "tags"
          field.value   = b.tags
          doc.fields << field
 
-         @thrudex.add( doc )
+         @thrudex.put( doc )
      end
 
@@ -158 +154 @@
 
                 response.elements.each { |r|
-                   rm = RemoveMsg.new()
-                   rm.domain = THRUDEX_DOMAIN
+                   rm = Element.new()
                    rm.index  = THRUDEX_INDEX
-                   rm.docid  = r.key
+                   rm.key    = r.key
 
                    docs << rm
@@ -170 +165 @@
                 @thrudoc.removeList(response.elements)
 
-
-                @thrudex.commitAll()
-
-
                 seed = response.seed
 
         end while response.elements.length == limit
-
 
         t1 = Time.new
@@ -193 +183 @@
         t0 = Time.new()
 
-        q  = QueryMsg.new();
-
-        q.domain = THRUDEX_DOMAIN
+        q  = SearchQuery.new();
+
         q.index  = THRUDEX_INDEX
         q.query  = terms
@@ -210 +199 @@
         end
 
-        ids = @thrudex.query( q )
+        ids = @thrudex.search( q )
 
         if ids == nil
@@ -218 +207 @@
         print "Found "+ids.total.to_s+" bookmarks\n"
 
-        if ids.ids.length > 0
-
-           doc_list = @thrudoc.getList( create_doc_list(ids.ids) )
+        if ids.elements.length > 0
+
+           doc_list = @thrudoc.getList( create_doc_list(ids.elements) )
            bms      = []
            doc_list.each{ |doc|
@@ -243 +232 @@
               doc        = Element.new()
               doc.bucket = THRUDOC_BUCKET
-              doc.key    = id
+              doc.key    = id.key
 
               docs << doc