- added prototype for navigation index

- refactoring of word index prototype
(no functional changes so far)

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@5965 6c8d7289-2bf4-0310-a012-ef5d649a1542
pull/1/head
orbiter 16 years ago
parent 47fd226bdb
commit a2f48863fc

@ -39,8 +39,6 @@ public interface Reference {
public long lastModified();
public String toString();
public boolean isNewer(Reference other);
public boolean isOlder(Reference other);
@ -56,8 +54,6 @@ public interface Reference {
public int position(int p);
public void addPosition(int position);
public int distance();
}

@ -24,7 +24,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
package de.anomic.kelondro.text.referencePrototype;
package de.anomic.kelondro.text.citationPrototype;
import de.anomic.kelondro.index.Column;
import de.anomic.kelondro.index.Row;

@ -0,0 +1,54 @@
// NavigationReference.java
// (C) 2009 by Michael Peter Christen; mc@yacy.net, Frankfurt a. M., Germany
// first published 19.05.2009 on http://yacy.net
//
// This is a part of YaCy, a peer-to-peer based web search engine
//
// $LastChangedDate: 2009-04-03 15:23:45 +0200 (Fr, 03 Apr 2009) $
// $LastChangedRevision: 5777 $
// $LastChangedBy: orbiter $
//
// LICENSE
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
package de.anomic.kelondro.text.navigationPrototype;
import de.anomic.kelondro.index.Row.Entry;
import de.anomic.kelondro.text.Reference;
public interface NavigationReference extends Reference {
public String toPropertyForm();
public Entry toKelondroEntry();
public String navigationHash();
public String metadataHash();
public String termHash();
public int hitcount();
public int position(int p);
public byte flags();
public String toString();
public int hashCode();
}

@ -0,0 +1,43 @@
// NavigationReferenceFactory.java
// (C) 2009 by Michael Peter Christen; mc@yacy.net, Frankfurt a. M., Germany
// first published 19.05.2009 on http://yacy.net
//
// This is a part of YaCy, a peer-to-peer based web search engine
//
// $LastChangedDate: 2009-04-03 15:23:45 +0200 (Fr, 03 Apr 2009) $
// $LastChangedRevision: 5777 $
// $LastChangedBy: orbiter $
//
// LICENSE
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
package de.anomic.kelondro.text.navigationPrototype;
import de.anomic.kelondro.index.Row.Entry;
import de.anomic.kelondro.text.ReferenceFactory;
public class NavigationReferenceFactory implements ReferenceFactory<NavigationReference> {
public NavigationReference produceSlow(Entry e) {
return new NavigationReferenceRow(e);
}
public NavigationReference produceFast(NavigationReference r) {
if (r instanceof NavigationReferenceVars) return r;
return new NavigationReferenceVars(r);
}
}

@ -0,0 +1,169 @@
// NavigationReferenceRow.java
// (C) 2009 by Michael Peter Christen; mc@yacy.net, Frankfurt a. M., Germany
// first published 19.05.2009 on http://yacy.net
//
// This is a part of YaCy, a peer-to-peer based web search engine
//
// $LastChangedDate: 2009-03-20 16:44:59 +0100 (Fr, 20 Mrz 2009) $
// $LastChangedRevision: 5736 $
// $LastChangedBy: borg-0300 $
//
// LICENSE
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
package de.anomic.kelondro.text.navigationPrototype;
import de.anomic.kelondro.index.Column;
import de.anomic.kelondro.index.Row;
import de.anomic.kelondro.index.Row.Entry;
import de.anomic.kelondro.order.Base64Order;
import de.anomic.kelondro.text.AbstractReference;
import de.anomic.kelondro.text.Reference;
import de.anomic.yacy.yacySeedDB;
public final class NavigationReferenceRow extends AbstractReference implements NavigationReference, Cloneable {
/*
* A Navigation Reference is a index that stores the occurrences of Words from a specific Domain
* (when words in documents occur in spcial categories or in a dictionary) in relation to a normal
* word index of documents. The navigation index is like a property addition to the word index.
* Example: Navigation for Author name Occurrences. The dictionary for the navigation index contains
* names of Authors. Consider that a document is indexed, and the Word 'Goethe' appears in a author field.
* Then an reference entry in the Author Navigation index is made. The reference entry must contain the following
* entities:
* - reference to document (like in the RWI; this is the primary key of the reference entry)
* - matching word (in this case: term hash of 'Goethe')
* - flag to see where the tag appeared (in a qualified field for authors or anywhere in the text)
* - number of occurrences
*/
public static final Row navEntryRow = new Row(new Column[]{
new Column("n", Column.celltype_string, Column.encoder_bytes, yacySeedDB.commonHashLength * 2, "navhash"), // hash of the navigation term plus document reference hash
new Column("c", Column.celltype_cardinal, Column.encoder_b256, 1, "hitcount"), // number of occurrences of navigation term
new Column("p", Column.celltype_cardinal, Column.encoder_b256, 2, "posintext"), // position of navigation term in document
new Column("f", Column.celltype_cardinal, Column.encoder_b256, 1, "reserve") // reserve for flags etc
},
Base64Order.enhancedCoder
);
// static properties
private static final int col_navhash = 0; // n 24 the navigation hash and reference hash b64-encoded
private static final int col_count = 1; // c the number of occurences
private static final int col_pos = 2; // p the position of the first occurence
private static final int col_flags = 3; // f reserve, may be used for flags
// appearance flags, used in RWI entry
// some names are derived from the Dublin Core Metadata tag set
public static final int flag_app_dc_description= 1; // word appears in anchor description text (the reference to an url), or any alternative text field of a link
public static final int flag_app_dc_title = 2; // word appears in title or headline or any description part
public static final int flag_app_dc_creator = 3; // word appears in author
public static final int flag_app_dc_subject = 4; // word appears in header tags or other descriptive part
public static final int flag_app_dc_identifier = 5; // word appears in url or document identifier
public static final int flag_app_emphasized = 6; // word is emphasized in text (i.e. bold, italics, special size)
private final Row.Entry entry;
public NavigationReferenceRow(
final String termhash,
final String refhash,
final int count,
final int pos,
final byte flags
) {
assert (termhash.length() == 12) : "termhash = " + termhash;
assert (refhash.length() == 12) : "refhash = " + refhash;
this.entry = navEntryRow.newEntry();
this.entry.setCol(col_navhash, termhash + refhash, null);
this.entry.setCol(col_count, count);
this.entry.setCol(col_pos, pos);
this.entry.setCol(col_flags, flags);
}
public NavigationReferenceRow(final byte[] row) {
this.entry = navEntryRow.newEntry(row);
}
public NavigationReferenceRow(Row.Entry entry) {
this.entry = entry;
}
public NavigationReferenceRow clone() {
final byte[] b = new byte[navEntryRow.objectsize];
System.arraycopy(entry.bytes(), 0, b, 0, navEntryRow.objectsize);
return new NavigationReferenceRow(b);
}
public String toPropertyForm() {
return entry.toPropertyForm(true, true, false);
}
public Entry toKelondroEntry() {
return this.entry;
}
public String navigationHash() {
return this.entry.getColString(col_navhash, null);
}
public String metadataHash() {
return navigationHash().substring(12);
}
public String termHash() {
return navigationHash().substring(0, 12);
}
public int hitcount() {
return (int) this.entry.getColLong(col_count);
}
public int position(int p) {
assert p == 0 : "p = " + p;
return (int) this.entry.getColLong(col_pos);
}
public byte flags() {
return (byte) this.entry.getColLong(col_flags);
}
public String toString() {
return toPropertyForm();
}
public int hashCode() {
return this.navigationHash().hashCode();
}
public boolean isOlder(Reference other) {
return false;
}
// unsupported operations:
public void join(Reference oe) {
throw new UnsupportedOperationException();
}
public long lastModified() {
throw new UnsupportedOperationException();
}
public int positions() {
throw new UnsupportedOperationException();
}
}

@ -0,0 +1,141 @@
// NavigationReferenceVars.java
// (C) 2009 by Michael Peter Christen; mc@yacy.net, Frankfurt a. M., Germany
// first published 19.05.2009 on http://yacy.net
//
// This is a part of YaCy, a peer-to-peer based web search engine
//
// $LastChangedDate: 2009-03-20 16:44:59 +0100 (Fr, 20 Mrz 2009) $
// $LastChangedRevision: 5736 $
// $LastChangedBy: borg-0300 $
//
// LICENSE
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
package de.anomic.kelondro.text.navigationPrototype;
import de.anomic.kelondro.index.Row.Entry;
import de.anomic.kelondro.text.AbstractReference;
import de.anomic.kelondro.text.Reference;
public class NavigationReferenceVars extends AbstractReference implements NavigationReference, Reference, Cloneable {
public String refhash, termhash;
public int hitcount, position;
byte flags;
public NavigationReferenceVars(
final String termhash,
final String refhash,
final int count,
final int pos,
final byte flags
) {
this.refhash = refhash;
this.termhash = termhash;
this.hitcount = count;
this.position = pos;
this.flags = flags;
}
public NavigationReferenceVars(final NavigationReference e) {
this.refhash = e.metadataHash();
this.termhash = e.termHash();
this.hitcount = e.hitcount();
this.position = e.position(0);
this.flags = e.flags();
}
public NavigationReferenceVars clone() {
final NavigationReferenceVars c = new NavigationReferenceVars(
this.termhash,
this.refhash,
this.hitcount,
this.position,
this.flags
);
return c;
}
public NavigationReferenceRow toRowEntry() {
return new NavigationReferenceRow(
this.termhash,
this.refhash,
this.hitcount,
this.position,
this.flags);
}
public String toPropertyForm() {
return toRowEntry().toPropertyForm();
}
public Entry toKelondroEntry() {
return toRowEntry().toKelondroEntry();
}
public String navigationHash() {
return this.termhash + this.refhash;
}
public String metadataHash() {
return this.refhash;
}
public String termHash() {
return this.termhash;
}
public int hitcount() {
return this.hitcount;
}
public int position(int p) {
assert p == 0 : "p = " + p;
return this.position;
}
public byte flags() {
return this.flags;
}
public String toString() {
return toPropertyForm();
}
public int hashCode() {
return this.navigationHash().hashCode();
}
public boolean isOlder(Reference other) {
return false;
}
// unsupported operations:
public void join(Reference oe) {
throw new UnsupportedOperationException();
}
public long lastModified() {
throw new UnsupportedOperationException();
}
public int positions() {
throw new UnsupportedOperationException();
}
}

@ -255,11 +255,6 @@ public final class WordReferenceRow extends AbstractReference implements WordRef
return (int) this.entry.getColLong(col_posintext);
}
public void addPosition(int position) {
throw new UnsupportedOperationException("");
}
public int posinphrase() {
return (int) this.entry.getColLong(col_posinphrase);
}
@ -316,12 +311,6 @@ public final class WordReferenceRow extends AbstractReference implements WordRef
return toPropertyForm();
}
public boolean isNewer(final Reference other) {
if (other == null) return true;
if (this.lastModified() > other.lastModified()) return true;
return false;
}
public boolean isOlder(final Reference other) {
if (other == null) return false;
if (this.lastModified() < other.lastModified()) return true;

@ -168,11 +168,6 @@ public class WordReferenceVars extends AbstractReference implements WordReferen
return hitcount;
}
public boolean isNewer(final Reference other) {
assert false; // should not be used
return false;
}
public boolean isOlder(final Reference other) {
assert false; // should not be used
return false;

Loading…
Cancel
Save