mirror of
https://github.com/yacy/yacy_search_server.git
synced 2024-09-19 00:01:41 +02:00
5bb8074150
- The indexing queue was a historic data structure that was introduced at the very beginning at the project as a part of the switchboard organisation object structure. Without the indexing queue the switchboard queue becomes also superfluous. It has been removed as well.
- Removing the switchboard queue requires that all servlets are called without a opaque generic ('<?>'). That caused that all serlets had to be modified.
- Many servlets displayed the indexing queue or the size of that queue. In the past months the indexer was so fast that mostly the indexing queue appeared empty, so there was no use of it any more. Because the queue has been removed, the display in the servlets had also to be removed.
- The surrogate work task had been a part of the indexing queue control structure. Without the indexing queue the surrogates needed its own task management. That has been integrated here.
- Because the indexing queue had a special queue entry object and properties attached to this object, the propterties had to be moved to the queue entry object which is part of the new indexing queue withing the blocking queue, the Response Object. That object has now also the new properties of the removed indexing queue entry object.
git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@6225 6c8d7289-2bf4-0310-a012-ef5d649a1542
91 lines
4.2 KiB
Java
91 lines
4.2 KiB
Java
// IndexImportWikimedia.java
|
|
// -------------------------
|
|
// (C) 2009 by Michael Peter Christen; mc@yacy.net
|
|
// first published 04.05.2009 on http://yacy.net
|
|
// Frankfurt, Germany
|
|
//
|
|
// $LastChangedDate: 2009-04-16 17:29:00 +0200 (Do, 16 Apr 2009) $
|
|
// $LastChangedRevision: 5812 $
|
|
// $LastChangedBy: orbiter $
|
|
//
|
|
// 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
|
|
|
|
import java.io.File;
|
|
import java.net.MalformedURLException;
|
|
|
|
import de.anomic.http.httpRequestHeader;
|
|
import de.anomic.plasma.plasmaSwitchboard;
|
|
import de.anomic.server.serverObjects;
|
|
import de.anomic.server.serverSwitch;
|
|
import de.anomic.tools.mediawikiIndex;
|
|
|
|
public class IndexImportWikimedia_p {
|
|
|
|
public static serverObjects respond(final httpRequestHeader header, final serverObjects post, final serverSwitch env) {
|
|
final serverObjects prop = new serverObjects();
|
|
final plasmaSwitchboard sb = (plasmaSwitchboard) env;
|
|
|
|
if (mediawikiIndex.job != null && mediawikiIndex.job.isAlive()) {
|
|
// one import is running, no option to insert anything
|
|
prop.put("import", 1);
|
|
prop.put("import_thread", "running");
|
|
prop.put("import_dump", mediawikiIndex.job.sourcefile.getName());
|
|
prop.put("import_count", mediawikiIndex.job.count);
|
|
prop.put("import_speed", mediawikiIndex.job.speed());
|
|
prop.put("import_runningHours", (mediawikiIndex.job.runningTime() / 60) / 60);
|
|
prop.put("import_runningMinutes", (mediawikiIndex.job.runningTime() / 60) % 60);
|
|
prop.put("import_remainingHours", (mediawikiIndex.job.remainingTime() / 60) / 60);
|
|
prop.put("import_remainingMinutes", (mediawikiIndex.job.remainingTime() / 60) % 60);
|
|
} else {
|
|
prop.put("import", 0);
|
|
if (post == null) {
|
|
prop.put("import_status", 0);
|
|
} else {
|
|
if (post.containsKey("file")) {
|
|
File sourcefile = new File(post.get("file"));
|
|
String name = sourcefile.getName(); // i.e. dewiki-20090311-pages-articles.xml.bz2
|
|
if (!name.endsWith("pages-articles.xml.bz2")) {
|
|
prop.put("import", 0);
|
|
prop.put("import_status", 1);
|
|
prop.put("import_status_message", "file name must end with 'pages-articles.xml.bz2'");
|
|
return prop;
|
|
}
|
|
String lang = name.substring(0, 2);
|
|
try {
|
|
mediawikiIndex.job = new mediawikiIndex(sourcefile, sb.surrogatesInPath, "http://" + lang + ".wikipedia.org/wiki/");
|
|
mediawikiIndex.job.start();
|
|
prop.put("import", 1);
|
|
prop.put("import_thread", "started");
|
|
prop.put("import_dump", mediawikiIndex.job.sourcefile.getName());
|
|
prop.put("import_count", 0);
|
|
prop.put("import_speed", 0);
|
|
prop.put("import_runningHours", 0);
|
|
prop.put("import_runningMinutes", 0);
|
|
prop.put("import_remainingHours", 0);
|
|
prop.put("import_remainingMinutes", 0);
|
|
} catch (MalformedURLException e) {
|
|
e.printStackTrace();
|
|
prop.put("import", 0);
|
|
prop.put("import_status", 1);
|
|
prop.put("import_status_message", e.getMessage());
|
|
}
|
|
}
|
|
return prop;
|
|
}
|
|
}
|
|
return prop;
|
|
}
|
|
}
|