Changeset 2112 for libswish3/trunk/src/xapian

Timestamp:

04/07/08 21:48:43 (8 months ago)

Author:

karpet

Message:

make output a little more swish-like

Files:

• libswish3/trunk/src/xapian/swish_xapian.cpp (modified) (23 diffs)
• libswish3/trunk/src/xapian/test.pl (modified) (1 diff)

libswish3/trunk/src/xapian/swish_xapian.cpp

@@ -73 +73 @@
-/* global vars */
-static int debug = 0;
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-static struct option
@@ -183 +201 @@
-}
-
-
+
+
-binary_string_to_int(
-    const std::string & s
@@ -190 +209 @@
-    if (s.size() != 4)
-        return (uint32_t) - 1;
-
-
+
-    memcpy(&v, s.data(), 4);
-    return ntohl(v);
-}
-
-
-
+
-int_to_binary_string(
-    uint32_t v
@@ -206 +223 @@
-}
-
-
+
+
-get_prefix(
-    xmlChar *metaname,
@@ -212 +230 @@
-)
-{
-
-
-
+
+
+
+
-    prefix = int_to_string(meta->id);
-
+ 
-}
-
-static void
-add_prefix(
-     
+
-    Xapian::QueryParser qp,
-            
-
-
-*)name), 
-       int_to_string(meta->id) + string((const char
+
+
+
+ *)name),
+int_to_string(meta->id) + string((const char 
-}
-
@@ -236 +255 @@
-)
-{
-
-
-
+
+
+
+
-    return meta->bias > 0 ? meta->bias : 1;     // TODO need to account for negative values.
-}
@@ -250 +270 @@
-{
-    // lookup weight and prefix
-
-
+
+
+
+
-    indexer.index_text((const char *)xmlBufferContent(buffer), weight, prefix);
+    // index swishdefault and swishtitle without any prefix too
+    if (xmlStrEqual(metaname, BAD_CAST SWISH_DEFAULT_METANAME)
+        || xmlStrEqual(metaname, BAD_CAST SWISH_TITLE_METANAME)
+        ) {
+        indexer.index_text((const char *)xmlBufferContent(buffer), weight);
+    }
-}
-
@@ -262 +290 @@
-)
-{
-
+
+
-    prop = (swish_Property *)swish_hash_fetch(s3->config->properties, name);
-    //SWISH_DEBUG_MSG("adding property %s [%d]: %s", name, prop->id,
@@ -285 +314 @@
-    }
-    if (SWISH_DEBUG & SWISH_DEBUG_NAMEDBUFFER) {
-(xmlChar *)
-(xmlChar *)
+BAD_CAST 
+BAD_CAST 
-    }
-
-    // Put the data in the document
-    Xapian::Document newdocument;
-title =
-(xmlChar *)
-(xmlChar *)
+
+title = BAD_CAST 
+        BAD_CAST 
-    //printf("title = %s", (char *)title);
-
-
+
+
+
+
-    record += "\ntitle=" + string((const char *)title);
-    record += "\ntype=" + string((const char *)parser_data->docinfo->mime);
@@ -310 +341 @@
-    newdocument.add_term(unique_id);
-
-
-
-
+
+
+
+
-    newdocument.add_term(date_term);    // Date (YYYYMMDD)
-    date_term.resize(7);
@@ -339 +371 @@
-    // add all metanames and properties
-    xmlHashScan(parser_data->metanames->hash, (xmlHashScanner)add_metanames, s3->config);
-
-
+
-
-    if (!skip_duplicates) {
@@ -373 +404 @@
-)
-{
-
-
+
+
+
+
-    try {
-        if (!overwrite) {
@@ -388 +421 @@
-
-        indexer.set_stemmer(stemmer);
-
+
-        // read header if it exists
- dbpath + 
-        string((const char*)SWISH_PATH_SEP) + 
-        string((const char
-(xmlChar*)
-
+
+dbpath + string((const char *)SWISH_PATH_SEP) +
+string((const char 
+BAD_CAST 
+ 
-        }
-
@@ -426 +459 @@
-)
-{
-
-
+
+
+
+
-    try {
-        rdb = Xapian::Database::Database(dbpath);
-
- dbpath + 
-        string((const char*)SWISH_PATH_SEP) + 
-        string((const char
-(xmlChar*)
-
+
+
+dbpath + string((const char *)SWISH_PATH_SEP) +
+string((const char 
+BAD_CAST 
+ 
-        }
-
@@ -464 +499 @@
-)
-{
-
-
-
+
+
+
+
-    Xapian::QueryParser qparser;
-       
+
-    Xapian::MSetIterator iterator;
-   
-
+
+
-    total_matches = 0;
-
+   
-    qparser.set_database(rdb);
-
+
-    // map all human metanames to internal prefix
-    xmlHashScan(s3->config->metanames, (xmlHashScanner)add_prefix, &qparser);
-
+
-    // TODO boolean_prefix?
-
+
-    try {
-        query = qparser.parse_query(string(qstr));
-    }
- (Xapian::QueryParserError &
+(Xapian::QueryParserError & 
-        SWISH_CROAK("query parser error: %s", e.get_msg().c_str());
-    }
-
+
+
-    enquire = new Xapian::Enquire(rdb);
-    enquire->set_query(query);
-    mset = enquire->get_mset(0, 100);
+    printf("# %d estimated matches\n", mset.get_matches_estimated());
+    cout << "# " + query.get_description() << endl;
-    iterator = mset.begin();
-
+
+
+
+
-        doc = iterator.get_document();
-
-
+
+
+
+
+
-        total_matches++;
-    }
-
+
+
-}
-
@@ -506 +552 @@
-{
-
-
+
+
-    printf("swish_xapian [opts] [- | file(s)]\n");
-    printf("opts:\n --config conf_file.xml\n --query <query>\n --debug [lvl]\n --help\n");
@@ -520 +567 @@
-)
-{
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    config_file = NULL;
-    option_index = 0;
@@ -554 +613 @@
-        case 'c':
-            //printf("optarg = %s\n", optarg);
-(xmlChar *)
+BAD_CAST 
-            break;
-
@@ -571 +630 @@
-
-        case 'i':
-(xmlChar *)
+BAD_CAST 
-            break;
-
@@ -579 +638 @@
-
-        case 'q':
-(xmlChar *)
+BAD_CAST 
-            break;
-
@@ -611 +670 @@
-
-    if (!dbpath) {
-(xmlChar *)
+BAD_CAST 
-    }
-
-    // indexing mode
-    if (!query) {
-
+
-        open_writeable_index(dbpath);
-
+
-        for (; i < argc; i++) {
-            if (argv[i][0] != '-') {
@@ -641 +700 @@
-        // but also if it is not (defaults).
-        // so we re-write every time we have a writeable db.
- dbpath + 
-        string((const char*)SWISH_PATH_SEP) + 
-        string((const char
-
+
+dbpath + string((const char *)SWISH_PATH_SEP) +
+string((const char 
+ 
-
-    }
@@ -656 +715 @@
-
-    etime = swish_print_time(swish_time_elapsed() - start_time);
-
+# 
-    swish_xfree(etime);
-    swish_xfree(dbpath);

libswish3/trunk/src/xapian/test.pl

@@ -11 +11 @@
-
-# searching
-total
+estimated
-    'search swishtitle:foobar' );
-