boxtec
/
yacy_search_server
mirror of https://github.com/yacy/yacy_search_server
4
1
Fork 0
Code Issues Projects Releases Wiki Activity

refctoring

Browse Source
pull/1/head
orbiter 13 years ago
parent 48a82bc705
commit 479bfca571
5 changed files with 18 additions and 29 deletions
Show Stats Download Patch File Download Diff File

2
htroot/gsa/searchresult.java
Unescape View File

@ -27,12 +27,12 @@ import java.util.Map;
import net.yacy.cora.document.UTF8;
import net.yacy.cora.protocol.HeaderFramework;
import net.yacy.cora.protocol.RequestHeader;
import net.yacy.cora.services.federated.solr.EmbeddedSolrConnector;
import net.yacy.cora.services.federated.solr.GSAResponseWriter;
import net.yacy.kelondro.logging.Log;
import net.yacy.search.Switchboard;
import net.yacy.search.query.AccessTracker;
import net.yacy.search.query.SnippetProcess;
import net.yacy.search.solr.EmbeddedSolrConnector;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.params.CommonParams;

4
htroot/solr/select.java
Unescape View File

@ -30,15 +30,15 @@ import javax.servlet.ServletException;
import net.yacy.cora.document.UTF8;
import net.yacy.cora.protocol.HeaderFramework;
import net.yacy.cora.protocol.RequestHeader;
import net.yacy.cora.services.federated.solr.EmbeddedSolrConnector;
import net.yacy.cora.services.federated.solr.EnhancedXMLResponseWriter;
import net.yacy.cora.services.federated.solr.OpensearchResponseWriter;
import net.yacy.cora.services.federated.solr.SolrServlet;
import net.yacy.kelondro.logging.Log;
import net.yacy.search.Switchboard;
import net.yacy.search.SwitchboardConstants;
import net.yacy.search.query.AccessTracker;
import net.yacy.search.query.SnippetProcess;
import net.yacy.search.solr.EmbeddedSolrConnector;
import net.yacy.search.solr.SolrServlet;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.params.CommonParams;

34
source/net/yacy/search/solr/EmbeddedSolrConnector.java → source/net/yacy/cora/services/federated/solr/EmbeddedSolrConnector.java
Unescape View File

@ -19,23 +19,19 @@
*/
package net.yacy.search.solr;
package net.yacy.cora.services.federated.solr;
import java.io.File;
import java.io.IOException;
import javax.xml.parsers.ParserConfigurationException;
import net.yacy.cora.services.federated.solr.SolrServerConnector;
import net.yacy.cora.services.federated.solr.SolrConnector;
import net.yacy.cora.services.federated.solr.SolrDoc;
import net.yacy.kelondro.logging.Log;
import net.yacy.search.index.YaCySchema;
import org.apache.solr.client.solrj.embedded.EmbeddedSolrServer;
import org.apache.solr.common.SolrDocument;
import org.apache.solr.common.SolrDocumentList;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.SolrInputDocument;
import org.apache.solr.common.params.SolrParams;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.common.util.SimpleOrderedMap;
@ -79,7 +75,7 @@ public class EmbeddedSolrConnector extends SolrServerConnector implements SolrCo
try {
Files.copy(new File(source, cfl), new File(target, cfl));
} catch (IOException e) {
Log.logException(e);
e.printStackTrace();
}
}
} else {
@ -88,17 +84,11 @@ public class EmbeddedSolrConnector extends SolrServerConnector implements SolrCo
try {
Files.copy(source, target);
} catch (IOException e) {
Log.logException(e);
e.printStackTrace();
}
}
}
/*
try {
CheckIndex.main(new String[]{new File(new File(storagePath, "data"), "index").getAbsolutePath(), "-fix"});
} catch (InterruptedException e1) {
Log.logException(e1);
}
*/
try {
this.cores = new CoreContainer(storagePath.getAbsolutePath(), new File(solr_config, "solr.xml"));
} catch (ParserConfigurationException e) {
@ -171,13 +161,13 @@ public class EmbeddedSolrConnector extends SolrServerConnector implements SolrCo
storage.mkdirs();
try {
EmbeddedSolrConnector solr = new EmbeddedSolrConnector(storage, solr_config);
SolrDoc solrdoc = new SolrDoc();
solrdoc.addSolr(YaCySchema.id, "ABCD0000abcd");
solrdoc.addSolr(YaCySchema.title, "Lorem ipsum");
solrdoc.addSolr(YaCySchema.text_t, "Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.");
solr.add(solrdoc);
SolrInputDocument doc = new SolrInputDocument();
doc.addField("id", "ABCD0000abcd");
doc.addField("title", "Lorem ipsum");
doc.addField("text_t", "Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.");
solr.add(doc);
SolrServlet.startServer("/solr", 8091, solr);
SolrDocumentList searchresult = solr.query(YaCySchema.text_t.name() + ":tempor", 0, 10);
SolrDocumentList searchresult = solr.query("text_t:tempor", 0, 10);
for (SolrDocument d : searchresult) {
System.out.println(d.toString());
}
@ -185,7 +175,7 @@ public class EmbeddedSolrConnector extends SolrServerConnector implements SolrCo
try {Thread.sleep(1000 * 1000);} catch (InterruptedException e) {}
solr.close();
} catch (IOException e) {
Log.logException(e);
e.printStackTrace();
}
}

5
source/net/yacy/search/solr/SolrServlet.java → source/net/yacy/cora/services/federated/solr/SolrServlet.java
Unescape View File

@ -1,4 +1,4 @@
package net.yacy.search.solr;
package net.yacy.cora.services.federated.solr;
import java.io.IOException;
import java.io.InputStream;
@ -21,7 +21,6 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import net.yacy.cora.document.UTF8;
import net.yacy.kelondro.logging.Log;
import org.apache.lucene.document.Document;
import org.apache.solr.common.SolrException;
@ -200,7 +199,7 @@ public class SolrServlet implements Filter {
server.start();
waitForSolr(context, port);
} catch (Exception e) {
Log.logException(e);
e.printStackTrace();
}
}
return server;

2
source/net/yacy/search/index/Fulltext.java
Unescape View File

@ -36,6 +36,7 @@ import java.util.TreeSet;
import net.yacy.cora.document.ASCII;
import net.yacy.cora.document.MultiProtocolURI;
import net.yacy.cora.order.CloneableIterator;
import net.yacy.cora.services.federated.solr.EmbeddedSolrConnector;
import net.yacy.cora.services.federated.solr.MirrorSolrConnector;
import net.yacy.cora.services.federated.solr.SolrConnector;
import net.yacy.cora.sorting.ConcurrentScoreMap;
@ -56,7 +57,6 @@ import net.yacy.kelondro.order.MergeIterator;
import net.yacy.kelondro.table.SplitTable;
import net.yacy.kelondro.util.MemoryControl;
import net.yacy.search.Switchboard;
import net.yacy.search.solr.EmbeddedSolrConnector;
import org.apache.lucene.util.Version;
import org.apache.solr.client.solrj.util.ClientUtils;

Write Preview
Loading…
Cancel
Save