diff src/de/mpiwg/dwinter/fulltextSearchServer/SearchTicket.java @ 1:83e9a828e794

Version mit integrierter Suche ?ber XML-Volltexte
author dwinter
date Wed, 26 Jan 2011 14:41:34 +0100
parents db87c1b7eb6d
children
line wrap: on
line diff
--- a/src/de/mpiwg/dwinter/fulltextSearchServer/SearchTicket.java	Wed Nov 03 12:18:46 2010 +0100
+++ b/src/de/mpiwg/dwinter/fulltextSearchServer/SearchTicket.java	Wed Jan 26 14:41:34 2011 +0100
@@ -3,11 +3,14 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.util.List;
 import java.util.Properties;
 import java.util.concurrent.ConcurrentMap;
 
 import org.apache.log4j.Logger;
 import org.apache.lucene.index.CorruptIndexException;
+import org.apache.lucene.search.Query;
 import org.apache.lucene.store.LockObtainFailedException;
 import org.restlet.Context;
 import org.restlet.data.Form;
@@ -27,6 +30,9 @@
 
 
 import de.mpiwg.dwinter.fulltext.search.FulltextSearchDocsLines;
+import de.mpiwg.dwinter.fulltext.search.IFulltextSearchDocsLines;
+import de.mpiwg.dwinter.fulltext.search.utils.OCRDoc;
+import de.mpiwg.dwinter.fulltext.search.xmlsearchadapter.XMLSearchServerAdapter;
 import de.mpiwg.dwinter.fulltext.ticket.TicketWriter;
 import de.mpiwg.dwinter.fulltextSearchServer.Utils.ConfigurationManager;
 import de.mpiwg.dwinter.fulltextSearchServer.searchThreads.SearchInlinesThread;
@@ -103,7 +109,14 @@
 		
 		//String ticket = generateTicket();
 		String searchString=searchForm.getValues("searchString");
-		String languages=searchForm.getValues("languages"); // language der form la1_la2_la3___
+		String languages;
+		try {
+			languages = URLDecoder.decode(searchForm.getValues("languages"),"utf-8");
+		} catch (UnsupportedEncodingException e1) {
+			// TODO Auto-generated catch block
+			e1.printStackTrace();
+			languages="";
+		} // language der form la1_la2_la3___
 		String searchMetaData=searchForm.getValues("searchMetaData");
 		//no Searchstring
 		if (searchString==null || languages==null )
@@ -146,11 +159,14 @@
 		}
 		
 	
+		IFulltextSearchDocsLines[] fulltextSearchers = new IFulltextSearchDocsLines[]{fulltextSearcher, new XMLSearchServerAdapter()};
+			
+			
 		
 		String[] langs = languages.split("_");
 		
 		for (String lang: langs){
-		SearchInlinesThread st = new SearchInlinesThread(fulltextSearcher, searchString, searchMetaData,lang,ticket);
+		SearchInlinesThread st = new SearchInlinesThread(fulltextSearchers, searchString, searchMetaData,lang,ticket);
 		st.start();
 		}