debian/cdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix dtinfo search engine

Browse Source
This commit is contained in:
Ulrich Wilkens
2014-04-01 04:45:33 +02:00
committed by Jon Trulson
parent 0254ebc0b4
commit 38dfc9e235
68 changed files with 252 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cde/programs/dtinfo/DtMmdb/index/fast_mphf.C
View File

@@ -135,7 +135,7 @@ void fast_mphf::init_persistent_info(persistent_info* x)
r = 0;
v_seed = 0;
t = 0;
hash::init_data_member();
ihash::init_data_member();
}
}
@@ -495,14 +495,14 @@ int fast_mphf::print_bits(unsigned x, ostream& out)
int fast_mphf::cdr_sizeof()
{
return long_pstring::cdr_sizeof() + hash::cdr_sizeof() +
return long_pstring::cdr_sizeof() + ihash::cdr_sizeof() +
6*sizeof(unsigned int);
}
io_status fast_mphf::cdrOut(buffer& buf)
{
long_pstring::cdrOut(buf);
hash::cdrOut(buf);
ihash::cdrOut(buf);
buf.put(v_no_ps);
buf.put(v_p1);
@@ -517,7 +517,7 @@ io_status fast_mphf::cdrOut(buffer& buf)
io_status fast_mphf::cdrIn(buffer& buf)
{
long_pstring::cdrIn(buf);
hash::cdrIn(buf);
ihash::cdrIn(buf);
buf.get(v_no_ps);
buf.get(v_p1);

2
cde/programs/dtinfo/DtMmdb/index/fast_mphf.h
View File

@@ -102,7 +102,7 @@ public:
friend class fast_mphf;
};
class fast_mphf : public long_pstring, public hash
class fast_mphf : public long_pstring, public ihash
{
public:

16
cde/programs/dtinfo/DtMmdb/index/hash.C
View File

@@ -51,16 +51,16 @@
#include <stdio.h>
#include "index/hash.h"
hash::hash() : v_key_set_sz(0), v_hash_func_sz(0), v_hash_tbl_sz(0)
ihash::ihash() : v_key_set_sz(0), v_hash_func_sz(0), v_hash_tbl_sz(0)
{
}
hash::~hash()
ihash::~ihash()
{
}
void
hash::init_data_member(unsigned int a, unsigned int b, unsigned int c)
ihash::init_data_member(unsigned int a, unsigned int b, unsigned int c)
{
v_key_set_sz = a;
v_hash_func_sz = b;
@@ -68,15 +68,15 @@ hash::init_data_member(unsigned int a, unsigned int b, unsigned int c)
}
int hash::cdr_sizeof()
int ihash::cdr_sizeof()
{
return sizeof(v_key_set_sz) + sizeof(v_hash_func_sz) + sizeof(v_hash_tbl_sz);
}
io_status hash::cdrOut(buffer& buf)
io_status ihash::cdrOut(buffer& buf)
{
/*
MESSAGE(cerr, "hash::cdrOut");
MESSAGE(cerr, "ihash::cdrOut");
debug(cerr, v_hash_tbl_sz);
debug(cerr, v_key_set_sz);
*/
@@ -86,9 +86,9 @@ debug(cerr, v_key_set_sz);
return done;
}
io_status hash::cdrIn(buffer& buf)
io_status ihash::cdrIn(buffer& buf)
{
//MESSAGE(cerr, "hash::cdrIn");
//MESSAGE(cerr, "ihash::cdrIn");
buf.get(v_key_set_sz);
buf.get(v_hash_func_sz);

6
cde/programs/dtinfo/DtMmdb/index/hash.h
View File

@@ -55,12 +55,12 @@
#include "utility/buffer.h"
#include "utility/key.h"
class hash
class ihash
{
public:
hash();
virtual ~hash() ;
ihash();
virtual ~ihash() ;
virtual void init_data_member(unsigned int v_key_set_sz = 0,
unsigned int v_hash_func_sz = 0,