adopted vocabulary usage within anotation/naviagtion feature of search

to new SimpleVocabulary class

source/net/yacy/search/query/QueryParams.java

@@ -44,8 +44,8 @@ import net.yacy.cora.document.Classification;
 import net.yacy.cora.document.Classification.ContentDomain;
 import net.yacy.cora.document.MultiProtocolURI;
 import net.yacy.cora.document.UTF8;
+import net.yacy.cora.lod.SimpleVocabulary;
 import net.yacy.cora.services.federated.yacy.CacheStrategy;
-import net.yacy.document.Autotagging;
 import net.yacy.document.Condenser;
 import net.yacy.document.parser.html.AbstractScraper;
 import net.yacy.document.parser.html.CharacterCoding;
@@ -115,7 +115,7 @@ public final class QueryParams {
     public final boolean urlMask_isCatchall, prefer_isMatchnothing;
     public final Classification.ContentDomain contentdom;
     public final String targetlang;
-    public final Collection<Autotagging.Metatag> metatags;
+    public final Collection<SimpleVocabulary.Metatag> metatags;
     public final String navigators;
     public final Searchdom domType;
     public final int zonecode;
@@ -180,7 +180,7 @@ public final class QueryParams {
         this.itemsPerPage = itemsPerPage;
         this.offset = 0;
         this.targetlang = "en";
-        this.metatags = new ArrayList<Autotagging.Metatag>(0);
+        this.metatags = new ArrayList<SimpleVocabulary.Metatag>(0);
         this.domType = Searchdom.LOCAL;
         this.zonecode = DigestURI.TLD_any_zone_filter;
         this.domMaxTargets = 0;
@@ -213,7 +213,7 @@ public final class QueryParams {
         final String modifier,
         final int maxDistance, final String prefer, final ContentDomain contentdom,
         final String language,
-        final Collection<Autotagging.Metatag> metatags,
+        final Collection<SimpleVocabulary.Metatag> metatags,
         final String navigators,
         final CacheStrategy snippetCacheStrategy,
         final int itemsPerPage, final int offset, final String urlMask,

source/net/yacy/search/query/RWIProcess.java

@@ -42,6 +42,7 @@ import net.yacy.cora.document.ASCII;
 import net.yacy.cora.document.Classification;
 import net.yacy.cora.document.Classification.ContentDomain;
 import net.yacy.cora.document.MultiProtocolURI;
+import net.yacy.cora.lod.SimpleVocabulary;
 import net.yacy.cora.protocol.Scanner;
 import net.yacy.cora.sorting.ClusteredScoreMap;
 import net.yacy.cora.sorting.ConcurrentScoreMap;
@@ -49,7 +50,6 @@ import net.yacy.cora.sorting.ScoreMap;
 import net.yacy.cora.sorting.WeakPriorityBlockingQueue;
 import net.yacy.cora.sorting.WeakPriorityBlockingQueue.ReverseElement;
 import net.yacy.document.Autotagging;
-import net.yacy.document.Autotagging.Metatag;
 import net.yacy.document.Condenser;
 import net.yacy.document.LibraryProvider;
 import net.yacy.kelondro.data.meta.DigestURI;
@@ -646,7 +646,7 @@ public final class RWIProcess extends Thread
             final String[] taglist = tags == null || tags.length() == 0 ? new String[0] : SPACE_PATTERN.split(page.dc_subject());
             if (this.query.metatags != null && this.query.metatags.size() > 0) {
                 // all metatags must appear in the tags list
-                for (Metatag metatag: this.query.metatags) {
+                for (SimpleVocabulary.Metatag metatag: this.query.metatags) {
                     if (!Autotagging.metatagAppearIn(metatag, taglist)) {
                         this.sortout++;
                         //Log.logInfo("RWIProcess", "sorted out " + page.url());
@@ -714,7 +714,7 @@ public final class RWIProcess extends Thread
             tagharvest: for (String tag: taglist) {
                 if (tag.length() < 1 || tag.charAt(0) != LibraryProvider.tagPrefix) continue tagharvest;
                 try {
-                    Metatag metatag = LibraryProvider.autotagging.metatag(tag);
+                	SimpleVocabulary.Metatag metatag = LibraryProvider.autotagging.metatag(tag);
                     ScoreMap<String> voc = this.vocabularyNavigator.get(metatag.getVocabularyName());
                     if (voc == null) {
                         voc = new ConcurrentScoreMap<String>();

source/net/yacy/search/query/SnippetProcess.java

@@ -208,13 +208,12 @@ public class SnippetProcess {
         // finally, if there is something, return the result
         if (entry == null) {
             EventTracker.update(EventTracker.EClass.SEARCH, new ProfilingGraph.EventSearch(this.query.id(true), SearchEvent.Type.ONERESULT, "not found, item = " + item + ", available = " + this.result.sizeAvailable(), 0, 0), false);
-            //Log.logInfo("SnippetProcess", "NO ENTRY computed; anyWorkerAlive=" + anyWorkerAlive() + "; this.rankingProcess.isAlive() = " + this.rankingProcess.isAlive() + "; this.rankingProcess.feedingIsFinished() = " + this.rankingProcess.feedingIsFinished() + "; this.result.sizeAvailable() = " + this.result.sizeAvailable() + ", this.rankingProcess.sizeQueue() = " + this.rankingProcess.sizeQueue());
+            //Log.logInfo("SnippetProcess", "NO ENTRY computed (possible timeout); anyWorkerAlive=" + anyWorkerAlive() + "; this.rankingProcess.isAlive() = " + this.rankingProcess.isAlive() + "; this.rankingProcess.feedingIsFinished() = " + this.rankingProcess.feedingIsFinished() + "; this.result.sizeAvailable() = " + this.result.sizeAvailable() + ", this.rankingProcess.sizeQueue() = " + this.rankingProcess.sizeQueue());
             return null;
         }
         final ResultEntry re = entry.getElement();
         EventTracker.update(EventTracker.EClass.SEARCH, new ProfilingGraph.EventSearch(this.query.id(true), SearchEvent.Type.ONERESULT, "retrieved, item = " + item + ", available = " + this.result.sizeAvailable() + ": " + re.urlstring(), 0, 0), false);
-        if (item == this.query.offset + this.query.itemsPerPage - 1)
+        if (item == this.query.offset + this.query.itemsPerPage - 1) {
-         {
             stopAllWorker(); // we don't need more
         }
         return re;