mirror of
https://github.com/yacy/yacy_search_server.git
synced 2024-09-19 00:01:41 +02:00
- added source to J7Zip-modifed.jar and it's license (changelog is still to come)
- moved HTML-*replace-methods from wikiCode to de.anomic.data.htmlTools - prepared use of different wiki parsers as suggested here: http://www.yacy-forum.de/viewtopic.php?p=34444#34444 git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@3741 6c8d7289-2bf4-0310-a012-ef5d649a1542
This commit is contained in:
parent
0a64047081
commit
601fc7d1c5
|
@ -256,7 +256,7 @@ public class Bookmarks {
|
|||
while(count<max_count && it.hasNext()){
|
||||
bookmark=switchboard.bookmarksDB.getBookmark((String)it.next());
|
||||
if(bookmark!=null){
|
||||
prop.put("bookmarks_"+count+"_link", de.anomic.data.wikiCode.replaceXMLEntities(bookmark.getUrl()));
|
||||
prop.put("bookmarks_"+count+"_link", de.anomic.data.htmlTools.replaceXMLEntities(bookmark.getUrl()));
|
||||
prop.put("bookmarks_"+count+"_title", bookmark.getTitle());
|
||||
prop.put("bookmarks_"+count+"_description", bookmark.getDescription());
|
||||
prop.put("bookmarks_"+count+"_date", serverDate.dateToiso8601(new Date(bookmark.getTimeStamp())));
|
||||
|
|
|
@ -159,7 +159,7 @@ public class CacheAdmin_p {
|
|||
formatAnchor(prop, document.getEmaillinks(), "email");
|
||||
|
||||
prop.put("info_type_text",
|
||||
de.anomic.data.wikiCode.replaceXMLEntities(new String(scraper.getText())));
|
||||
de.anomic.data.htmlTools.replaceXMLEntities(new String(scraper.getText())));
|
||||
|
||||
i = 0;
|
||||
final Iterator sentences = document.getSentences(false);
|
||||
|
@ -266,9 +266,9 @@ public class CacheAdmin_p {
|
|||
descr = ((String) entry.getValue()).trim();
|
||||
if (descr.length() == 0) { descr = "-"; }
|
||||
prop.put("info_type_use." + extension + "_" + extension + "_" + i + "_name",
|
||||
de.anomic.data.wikiCode.replaceXMLEntities(descr.replaceAll("\n", "").trim()));
|
||||
de.anomic.data.htmlTools.replaceXMLEntities(descr.replaceAll("\n", "").trim()));
|
||||
prop.put("info_type_use." + extension + "_" + extension + "_" + i + "_link",
|
||||
de.anomic.data.wikiCode.replaceXMLEntities(entry.getKey().toString()));
|
||||
de.anomic.data.htmlTools.replaceXMLEntities(entry.getKey().toString()));
|
||||
i++;
|
||||
}
|
||||
prop.put("info_type_use." + extension, (i == 0) ? 0 : 1);
|
||||
|
@ -283,7 +283,7 @@ public class CacheAdmin_p {
|
|||
ie = (htmlFilterImageEntry) iter.next();
|
||||
prop.put("info_type_use.images_images_" + i + "_name", ie.alt().replaceAll("\n", "").trim());
|
||||
prop.put("info_type_use.images_images_" + i + "_link",
|
||||
de.anomic.data.wikiCode.replaceXMLEntities(ie.url().toNormalform()));
|
||||
de.anomic.data.htmlTools.replaceXMLEntities(ie.url().toNormalform()));
|
||||
i++;
|
||||
}
|
||||
prop.put("info_type_use.images", (i == 0) ? 0 : 1);
|
||||
|
|
|
@ -152,7 +152,7 @@ public class CrawlProfileEditor_p {
|
|||
prop.put("edit_entries_" + count + "_readonly_label", ee.label);
|
||||
prop.put("edit_entries_" + count + "_readonly_type", ee.type);
|
||||
if (ee.type == eentry.BOOLEAN) {
|
||||
prop.put("edit_entries_" + count + "_readonly_type_checked", Boolean.getBoolean((String)val) ? 1 : 0);
|
||||
prop.put("edit_entries_" + count + "_readonly_type_checked", Boolean.valueOf((String)val).booleanValue() ? 1 : 0);
|
||||
} else {
|
||||
prop.put("edit_entries_" + count + "_readonly_type_value", val);
|
||||
}
|
||||
|
|
|
@ -47,7 +47,7 @@ import java.io.IOException;
|
|||
import java.text.DecimalFormat;
|
||||
import java.util.ArrayList;
|
||||
|
||||
import de.anomic.data.wikiCode;
|
||||
import de.anomic.data.htmlTools;
|
||||
import de.anomic.http.httpHeader;
|
||||
import de.anomic.net.URL;
|
||||
import de.anomic.plasma.plasmaCrawlZURL;
|
||||
|
@ -151,11 +151,11 @@ public class IndexCreateIndexingQueue_p {
|
|||
totalSize += entrySize;
|
||||
initiator = yacyCore.seedDB.getConnected(pcentry.initiator());
|
||||
prop.put("indexing-queue_list_"+entryCount+"_dark", (inProcess)? 2: ((dark) ? 1 : 0));
|
||||
prop.put("indexing-queue_list_"+entryCount+"_initiator", ((initiator == null) ? "proxy" : wikiCode.replaceHTML(initiator.getName())));
|
||||
prop.put("indexing-queue_list_"+entryCount+"_initiator", ((initiator == null) ? "proxy" : htmlTools.replaceHTML(initiator.getName())));
|
||||
prop.put("indexing-queue_list_"+entryCount+"_depth", pcentry.depth());
|
||||
prop.put("indexing-queue_list_"+entryCount+"_modified", pcentry.getModificationDate());
|
||||
prop.put("indexing-queue_list_"+entryCount+"_anchor", (pcentry.anchorName()==null)?"":wikiCode.replaceHTML(pcentry.anchorName()));
|
||||
prop.put("indexing-queue_list_"+entryCount+"_url", wikiCode.replaceHTML(pcentry.normalizedURLString()));
|
||||
prop.put("indexing-queue_list_"+entryCount+"_anchor", (pcentry.anchorName()==null)?"":htmlTools.replaceHTML(pcentry.anchorName()));
|
||||
prop.put("indexing-queue_list_"+entryCount+"_url", htmlTools.replaceHTML(pcentry.normalizedURLString()));
|
||||
prop.put("indexing-queue_list_"+entryCount+"_size", bytesToString(entrySize));
|
||||
prop.put("indexing-queue_list_"+entryCount+"_inProcess", (inProcess)?1:0);
|
||||
prop.put("indexing-queue_list_"+entryCount+"_inProcess_hash", pcentry.urlHash());
|
||||
|
@ -199,9 +199,9 @@ public class IndexCreateIndexingQueue_p {
|
|||
executorHash = entry.executor();
|
||||
initiatorSeed = yacyCore.seedDB.getConnected(initiatorHash);
|
||||
executorSeed = yacyCore.seedDB.getConnected(executorHash);
|
||||
prop.put("rejected_list_"+j+"_initiator", ((initiatorSeed == null) ? "proxy" : wikiCode.replaceHTML(initiatorSeed.getName())));
|
||||
prop.put("rejected_list_"+j+"_executor", ((executorSeed == null) ? "proxy" : wikiCode.replaceHTML(executorSeed.getName())));
|
||||
prop.put("rejected_list_"+j+"_url", wikiCode.replaceHTML(url.toString()));
|
||||
prop.put("rejected_list_"+j+"_initiator", ((initiatorSeed == null) ? "proxy" : htmlTools.replaceHTML(initiatorSeed.getName())));
|
||||
prop.put("rejected_list_"+j+"_executor", ((executorSeed == null) ? "proxy" : htmlTools.replaceHTML(executorSeed.getName())));
|
||||
prop.put("rejected_list_"+j+"_url", htmlTools.replaceHTML(url.toString()));
|
||||
prop.put("rejected_list_"+j+"_failreason", entry.anycause());
|
||||
prop.put("rejected_list_"+j+"_dark", ((dark) ? 1 : 0));
|
||||
dark = !dark;
|
||||
|
|
|
@ -43,7 +43,7 @@
|
|||
// javac -classpath .:../classes IndexCreate_p.java
|
||||
// if the shell's current path is HTROOT
|
||||
|
||||
import de.anomic.data.wikiCode;
|
||||
import de.anomic.data.htmlTools;
|
||||
import de.anomic.http.httpHeader;
|
||||
import de.anomic.plasma.plasmaCrawlLoaderMessage;
|
||||
import de.anomic.plasma.plasmaSwitchboard;
|
||||
|
@ -80,9 +80,9 @@ public class IndexCreateLoaderQueue_p {
|
|||
|
||||
initiator = yacyCore.seedDB.getConnected(theMsg.initiator);
|
||||
prop.put("loader-set_list_"+count+"_dark", ((dark) ? 1 : 0) );
|
||||
prop.put("loader-set_list_"+count+"_initiator", ((initiator == null) ? "proxy" : wikiCode.replaceHTML(initiator.getName())) );
|
||||
prop.put("loader-set_list_"+count+"_initiator", ((initiator == null) ? "proxy" : htmlTools.replaceHTML(initiator.getName())) );
|
||||
prop.put("loader-set_list_"+count+"_depth", theMsg.depth );
|
||||
prop.put("loader-set_list_"+count+"_url", wikiCode.replaceHTML(theMsg.url.toString())); // null pointer exception here !!! maybe url = null; check reason.
|
||||
prop.put("loader-set_list_"+count+"_url", htmlTools.replaceHTML(theMsg.url.toString())); // null pointer exception here !!! maybe url = null; check reason.
|
||||
dark = !dark;
|
||||
count++;
|
||||
}
|
||||
|
|
|
@ -47,7 +47,7 @@ import java.text.SimpleDateFormat;
|
|||
import java.util.Date;
|
||||
import java.util.Locale;
|
||||
|
||||
import de.anomic.data.wikiCode;
|
||||
import de.anomic.data.htmlTools;
|
||||
import de.anomic.http.httpHeader;
|
||||
import de.anomic.plasma.plasmaCrawlEntry;
|
||||
import de.anomic.plasma.plasmaCrawlNURL;
|
||||
|
@ -120,12 +120,12 @@ public class IndexCreateWWWGlobalQueue_p {
|
|||
profileHandle = urle.profileHandle();
|
||||
profileEntry = (profileHandle == null) ? null : switchboard.profiles.getEntry(profileHandle);
|
||||
prop.put("crawler-queue_list_"+showNum+"_dark", ((dark) ? 1 : 0) );
|
||||
prop.put("crawler-queue_list_"+showNum+"_initiator", ((initiator == null) ? "proxy" : wikiCode.replaceHTML(initiator.getName())) );
|
||||
prop.put("crawler-queue_list_"+showNum+"_profile", ((profileEntry == null) ? "unknown" : wikiCode.replaceHTML(profileEntry.name())));
|
||||
prop.put("crawler-queue_list_"+showNum+"_initiator", ((initiator == null) ? "proxy" : htmlTools.replaceHTML(initiator.getName())) );
|
||||
prop.put("crawler-queue_list_"+showNum+"_profile", ((profileEntry == null) ? "unknown" : htmlTools.replaceHTML(profileEntry.name())));
|
||||
prop.put("crawler-queue_list_"+showNum+"_depth", urle.depth());
|
||||
prop.put("crawler-queue_list_"+showNum+"_modified", daydate(urle.loaddate()) );
|
||||
prop.put("crawler-queue_list_"+showNum+"_anchor", wikiCode.replaceHTML(urle.name()));
|
||||
prop.put("crawler-queue_list_"+showNum+"_url", wikiCode.replaceHTML(urle.url().toString()));
|
||||
prop.put("crawler-queue_list_"+showNum+"_anchor", htmlTools.replaceHTML(urle.name()));
|
||||
prop.put("crawler-queue_list_"+showNum+"_url", htmlTools.replaceHTML(urle.url().toString()));
|
||||
prop.put("crawler-queue_list_"+showNum+"_hash", urle.urlhash());
|
||||
dark = !dark;
|
||||
showNum++;
|
||||
|
|
|
@ -51,7 +51,7 @@ import java.util.regex.Matcher;
|
|||
import java.util.regex.Pattern;
|
||||
import java.util.regex.PatternSyntaxException;
|
||||
|
||||
import de.anomic.data.wikiCode;
|
||||
import de.anomic.data.htmlTools;
|
||||
import de.anomic.http.httpHeader;
|
||||
import de.anomic.plasma.plasmaCrawlEntry;
|
||||
import de.anomic.plasma.plasmaCrawlNURL;
|
||||
|
@ -124,7 +124,7 @@ public class IndexCreateWWWLocalQueue_p {
|
|||
} else if ((option.equals("Depth"))) {
|
||||
value = Integer.toString(entry.depth());
|
||||
} else if ((option.equals("Initiator"))) {
|
||||
value = (entry.initiator()==null)?"proxy":wikiCode.replaceHTML(entry.initiator());
|
||||
value = (entry.initiator()==null)?"proxy":htmlTools.replaceHTML(entry.initiator());
|
||||
} else if ((option.equals("ModifiedDate"))) {
|
||||
value = daydate(entry.loaddate());
|
||||
}
|
||||
|
@ -172,12 +172,12 @@ public class IndexCreateWWWLocalQueue_p {
|
|||
profileHandle = urle.profileHandle();
|
||||
profileEntry = (profileHandle == null) ? null : switchboard.profiles.getEntry(profileHandle);
|
||||
prop.put("crawler-queue_list_"+showNum+"_dark", ((dark) ? 1 : 0) );
|
||||
prop.put("crawler-queue_list_"+showNum+"_initiator", ((initiator == null) ? "proxy" : wikiCode.replaceHTML(initiator.getName())) );
|
||||
prop.put("crawler-queue_list_"+showNum+"_initiator", ((initiator == null) ? "proxy" : htmlTools.replaceHTML(initiator.getName())) );
|
||||
prop.put("crawler-queue_list_"+showNum+"_profile", ((profileEntry == null) ? "unknown" : profileEntry.name()));
|
||||
prop.put("crawler-queue_list_"+showNum+"_depth", urle.depth());
|
||||
prop.put("crawler-queue_list_"+showNum+"_modified", daydate(urle.loaddate()) );
|
||||
prop.put("crawler-queue_list_"+showNum+"_anchor", wikiCode.replaceHTML(urle.name()));
|
||||
prop.put("crawler-queue_list_"+showNum+"_url", wikiCode.replaceHTML(urle.url().toString()));
|
||||
prop.put("crawler-queue_list_"+showNum+"_anchor", htmlTools.replaceHTML(urle.name()));
|
||||
prop.put("crawler-queue_list_"+showNum+"_url", htmlTools.replaceHTML(urle.url().toString()));
|
||||
prop.put("crawler-queue_list_"+showNum+"_hash", urle.urlhash());
|
||||
dark = !dark;
|
||||
showNum++;
|
||||
|
|
|
@ -150,7 +150,7 @@ public class Surftips {
|
|||
prop.put("surftips_results_" + i + "_authorized_recommend_showScore", (showScore ? 1 : 0));
|
||||
|
||||
prop.put("surftips_results_" + i + "_authorized_urlhash", urlhash);
|
||||
prop.put("surftips_results_" + i + "_url", de.anomic.data.wikiCode.replaceXMLEntities(url));
|
||||
prop.put("surftips_results_" + i + "_url", de.anomic.data.htmlTools.replaceXMLEntities(url));
|
||||
prop.put("surftips_results_" + i + "_urlname", nxTools.shortenURLString(url, 60));
|
||||
prop.put("surftips_results_" + i + "_urlhash", urlhash);
|
||||
prop.put("surftips_results_" + i + "_title", (showScore) ? ("(" + ranking.getScore(urlhash) + ") " + title) : title);
|
||||
|
|
|
@ -53,7 +53,7 @@ import java.util.Iterator;
|
|||
import java.util.Map;
|
||||
import java.util.TreeSet;
|
||||
|
||||
import de.anomic.data.wikiCode;
|
||||
import de.anomic.data.htmlTools;
|
||||
import de.anomic.htmlFilter.htmlFilterImageEntry;
|
||||
import de.anomic.http.httpHeader;
|
||||
import de.anomic.http.httpc;
|
||||
|
@ -385,7 +385,7 @@ public class ViewFile {
|
|||
}
|
||||
|
||||
private static final String markup(String[] wordArray, String message) {
|
||||
message = wikiCode.replaceXMLEntities(message);
|
||||
message = htmlTools.replaceXMLEntities(message);
|
||||
if (wordArray != null)
|
||||
for (int j = 0; j < wordArray.length; j++) {
|
||||
String currentWord = wordArray[j].trim();
|
||||
|
|
|
@ -27,7 +27,7 @@ import java.util.Collections;
|
|||
import java.util.Iterator;
|
||||
import java.util.List;
|
||||
|
||||
import de.anomic.data.wikiCode;
|
||||
import de.anomic.data.htmlTools;
|
||||
import de.anomic.http.httpHeader;
|
||||
import de.anomic.server.serverObjects;
|
||||
import de.anomic.server.serverSwitch;
|
||||
|
@ -62,8 +62,8 @@ public class config_p {
|
|||
int count=0;
|
||||
while(keys.hasNext()){
|
||||
key = (String) keys.next();
|
||||
prop.put("options_"+count+"_key", wikiCode.replaceXMLEntities(key));
|
||||
prop.put("options_"+count+"_value", wikiCode.replaceXMLEntities(env.getConfig(key, "ERROR")));
|
||||
prop.put("options_"+count+"_key", htmlTools.replaceXMLEntities(key));
|
||||
prop.put("options_"+count+"_value", htmlTools.replaceXMLEntities(env.getConfig(key, "ERROR")));
|
||||
count++;
|
||||
}
|
||||
prop.put("options", count);
|
||||
|
|
|
@ -52,7 +52,7 @@ import java.util.ArrayList;
|
|||
import java.util.Date;
|
||||
import java.util.Locale;
|
||||
|
||||
import de.anomic.data.wikiCode;
|
||||
import de.anomic.data.htmlTools;
|
||||
import de.anomic.http.httpHeader;
|
||||
import de.anomic.plasma.plasmaCrawlEntry;
|
||||
import de.anomic.plasma.plasmaCrawlLoaderMessage;
|
||||
|
@ -123,10 +123,10 @@ public class queues_p {
|
|||
totalSize += entrySize;
|
||||
initiator = yacyCore.seedDB.getConnected(pcentry.initiator());
|
||||
prop.put("list-indexing_"+i+"_profile", (pcentry.profile() != null) ? pcentry.profile().name() : "deleted");
|
||||
prop.putSafeXML("list-indexing_"+i+"_initiator", ((initiator == null) ? "proxy" : wikiCode.replaceHTML(initiator.getName())));
|
||||
prop.putSafeXML("list-indexing_"+i+"_initiator", ((initiator == null) ? "proxy" : htmlTools.replaceHTML(initiator.getName())));
|
||||
prop.put("list-indexing_"+i+"_depth", pcentry.depth());
|
||||
prop.put("list-indexing_"+i+"_modified", pcentry.getModificationDate());
|
||||
prop.putSafeXML("list-indexing_"+i+"_anchor", (pcentry.anchorName()==null)?"":wikiCode.replaceHTML(pcentry.anchorName()));
|
||||
prop.putSafeXML("list-indexing_"+i+"_anchor", (pcentry.anchorName()==null)?"":htmlTools.replaceHTML(pcentry.anchorName()));
|
||||
prop.putSafeXML("list-indexing_"+i+"_url", pcentry.normalizedURLString());
|
||||
prop.put("list-indexing_"+i+"_size", entrySize);
|
||||
prop.put("list-indexing_"+i+"_inProcess", (inProcess)?1:0);
|
||||
|
|
|
@ -50,8 +50,8 @@ import java.net.MalformedURLException;
|
|||
import java.util.ArrayList;
|
||||
import java.util.Iterator;
|
||||
|
||||
import de.anomic.data.htmlTools;
|
||||
import de.anomic.data.robotsParser;
|
||||
import de.anomic.data.wikiCode;
|
||||
import de.anomic.http.httpHeader;
|
||||
import de.anomic.http.httpc;
|
||||
import de.anomic.net.URL;
|
||||
|
@ -92,7 +92,7 @@ public class getpageinfo_p {
|
|||
"<title>") + 7, line.toLowerCase().indexOf(
|
||||
"</title>"));
|
||||
// de-replace html entities
|
||||
title = wikiCode.deReplaceHTML(title);
|
||||
title = htmlTools.deReplaceHTML(title);
|
||||
prop.put("title", title);
|
||||
} catch (IndexOutOfBoundsException e) {
|
||||
}
|
||||
|
|
|
@ -53,8 +53,8 @@
|
|||
import java.io.File;
|
||||
|
||||
import de.anomic.data.URLFetcherStack;
|
||||
import de.anomic.data.htmlTools;
|
||||
import de.anomic.data.listManager;
|
||||
import de.anomic.data.wikiCode;
|
||||
import de.anomic.http.httpHeader;
|
||||
import de.anomic.net.URL;
|
||||
import de.anomic.plasma.plasmaSwitchboard;
|
||||
|
@ -122,7 +122,7 @@ public final class list {
|
|||
int cnt = 0;
|
||||
for (int i=0; i<count; i++) {
|
||||
if ((url = db.pop()) == null) continue;
|
||||
b.append(wikiCode.deReplaceHTMLEntities(url.toNormalform())).append("\n");
|
||||
b.append(htmlTools.deReplaceHTMLEntities(url.toNormalform())).append("\n");
|
||||
cnt++;
|
||||
}
|
||||
prop.put("list", b);
|
||||
|
|
Binary file not shown.
504
libx/J7Zip.License
Normal file
504
libx/J7Zip.License
Normal file
|
@ -0,0 +1,504 @@
|
|||
GNU LESSER GENERAL PUBLIC LICENSE
|
||||
Version 2.1, February 1999
|
||||
|
||||
Copyright (C) 1991, 1999 Free Software Foundation, Inc.
|
||||
59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
Everyone is permitted to copy and distribute verbatim copies
|
||||
of this license document, but changing it is not allowed.
|
||||
|
||||
[This is the first released version of the Lesser GPL. It also counts
|
||||
as the successor of the GNU Library Public License, version 2, hence
|
||||
the version number 2.1.]
|
||||
|
||||
Preamble
|
||||
|
||||
The licenses for most software are designed to take away your
|
||||
freedom to share and change it. By contrast, the GNU General Public
|
||||
Licenses are intended to guarantee your freedom to share and change
|
||||
free software--to make sure the software is free for all its users.
|
||||
|
||||
This license, the Lesser General Public License, applies to some
|
||||
specially designated software packages--typically libraries--of the
|
||||
Free Software Foundation and other authors who decide to use it. You
|
||||
can use it too, but we suggest you first think carefully about whether
|
||||
this license or the ordinary General Public License is the better
|
||||
strategy to use in any particular case, based on the explanations below.
|
||||
|
||||
When we speak of free software, we are referring to freedom of use,
|
||||
not price. Our General Public Licenses are designed to make sure that
|
||||
you have the freedom to distribute copies of free software (and charge
|
||||
for this service if you wish); that you receive source code or can get
|
||||
it if you want it; that you can change the software and use pieces of
|
||||
it in new free programs; and that you are informed that you can do
|
||||
these things.
|
||||
|
||||
To protect your rights, we need to make restrictions that forbid
|
||||
distributors to deny you these rights or to ask you to surrender these
|
||||
rights. These restrictions translate to certain responsibilities for
|
||||
you if you distribute copies of the library or if you modify it.
|
||||
|
||||
For example, if you distribute copies of the library, whether gratis
|
||||
or for a fee, you must give the recipients all the rights that we gave
|
||||
you. You must make sure that they, too, receive or can get the source
|
||||
code. If you link other code with the library, you must provide
|
||||
complete object files to the recipients, so that they can relink them
|
||||
with the library after making changes to the library and recompiling
|
||||
it. And you must show them these terms so they know their rights.
|
||||
|
||||
We protect your rights with a two-step method: (1) we copyright the
|
||||
library, and (2) we offer you this license, which gives you legal
|
||||
permission to copy, distribute and/or modify the library.
|
||||
|
||||
To protect each distributor, we want to make it very clear that
|
||||
there is no warranty for the free library. Also, if the library is
|
||||
modified by someone else and passed on, the recipients should know
|
||||
that what they have is not the original version, so that the original
|
||||
author's reputation will not be affected by problems that might be
|
||||
introduced by others.
|
||||
|
||||
Finally, software patents pose a constant threat to the existence of
|
||||
any free program. We wish to make sure that a company cannot
|
||||
effectively restrict the users of a free program by obtaining a
|
||||
restrictive license from a patent holder. Therefore, we insist that
|
||||
any patent license obtained for a version of the library must be
|
||||
consistent with the full freedom of use specified in this license.
|
||||
|
||||
Most GNU software, including some libraries, is covered by the
|
||||
ordinary GNU General Public License. This license, the GNU Lesser
|
||||
General Public License, applies to certain designated libraries, and
|
||||
is quite different from the ordinary General Public License. We use
|
||||
this license for certain libraries in order to permit linking those
|
||||
libraries into non-free programs.
|
||||
|
||||
When a program is linked with a library, whether statically or using
|
||||
a shared library, the combination of the two is legally speaking a
|
||||
combined work, a derivative of the original library. The ordinary
|
||||
General Public License therefore permits such linking only if the
|
||||
entire combination fits its criteria of freedom. The Lesser General
|
||||
Public License permits more lax criteria for linking other code with
|
||||
the library.
|
||||
|
||||
We call this license the "Lesser" General Public License because it
|
||||
does Less to protect the user's freedom than the ordinary General
|
||||
Public License. It also provides other free software developers Less
|
||||
of an advantage over competing non-free programs. These disadvantages
|
||||
are the reason we use the ordinary General Public License for many
|
||||
libraries. However, the Lesser license provides advantages in certain
|
||||
special circumstances.
|
||||
|
||||
For example, on rare occasions, there may be a special need to
|
||||
encourage the widest possible use of a certain library, so that it becomes
|
||||
a de-facto standard. To achieve this, non-free programs must be
|
||||
allowed to use the library. A more frequent case is that a free
|
||||
library does the same job as widely used non-free libraries. In this
|
||||
case, there is little to gain by limiting the free library to free
|
||||
software only, so we use the Lesser General Public License.
|
||||
|
||||
In other cases, permission to use a particular library in non-free
|
||||
programs enables a greater number of people to use a large body of
|
||||
free software. For example, permission to use the GNU C Library in
|
||||
non-free programs enables many more people to use the whole GNU
|
||||
operating system, as well as its variant, the GNU/Linux operating
|
||||
system.
|
||||
|
||||
Although the Lesser General Public License is Less protective of the
|
||||
users' freedom, it does ensure that the user of a program that is
|
||||
linked with the Library has the freedom and the wherewithal to run
|
||||
that program using a modified version of the Library.
|
||||
|
||||
The precise terms and conditions for copying, distribution and
|
||||
modification follow. Pay close attention to the difference between a
|
||||
"work based on the library" and a "work that uses the library". The
|
||||
former contains code derived from the library, whereas the latter must
|
||||
be combined with the library in order to run.
|
||||
|
||||
GNU LESSER GENERAL PUBLIC LICENSE
|
||||
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
|
||||
|
||||
0. This License Agreement applies to any software library or other
|
||||
program which contains a notice placed by the copyright holder or
|
||||
other authorized party saying it may be distributed under the terms of
|
||||
this Lesser General Public License (also called "this License").
|
||||
Each licensee is addressed as "you".
|
||||
|
||||
A "library" means a collection of software functions and/or data
|
||||
prepared so as to be conveniently linked with application programs
|
||||
(which use some of those functions and data) to form executables.
|
||||
|
||||
The "Library", below, refers to any such software library or work
|
||||
which has been distributed under these terms. A "work based on the
|
||||
Library" means either the Library or any derivative work under
|
||||
copyright law: that is to say, a work containing the Library or a
|
||||
portion of it, either verbatim or with modifications and/or translated
|
||||
straightforwardly into another language. (Hereinafter, translation is
|
||||
included without limitation in the term "modification".)
|
||||
|
||||
"Source code" for a work means the preferred form of the work for
|
||||
making modifications to it. For a library, complete source code means
|
||||
all the source code for all modules it contains, plus any associated
|
||||
interface definition files, plus the scripts used to control compilation
|
||||
and installation of the library.
|
||||
|
||||
Activities other than copying, distribution and modification are not
|
||||
covered by this License; they are outside its scope. The act of
|
||||
running a program using the Library is not restricted, and output from
|
||||
such a program is covered only if its contents constitute a work based
|
||||
on the Library (independent of the use of the Library in a tool for
|
||||
writing it). Whether that is true depends on what the Library does
|
||||
and what the program that uses the Library does.
|
||||
|
||||
1. You may copy and distribute verbatim copies of the Library's
|
||||
complete source code as you receive it, in any medium, provided that
|
||||
you conspicuously and appropriately publish on each copy an
|
||||
appropriate copyright notice and disclaimer of warranty; keep intact
|
||||
all the notices that refer to this License and to the absence of any
|
||||
warranty; and distribute a copy of this License along with the
|
||||
Library.
|
||||
|
||||
You may charge a fee for the physical act of transferring a copy,
|
||||
and you may at your option offer warranty protection in exchange for a
|
||||
fee.
|
||||
|
||||
2. You may modify your copy or copies of the Library or any portion
|
||||
of it, thus forming a work based on the Library, and copy and
|
||||
distribute such modifications or work under the terms of Section 1
|
||||
above, provided that you also meet all of these conditions:
|
||||
|
||||
a) The modified work must itself be a software library.
|
||||
|
||||
b) You must cause the files modified to carry prominent notices
|
||||
stating that you changed the files and the date of any change.
|
||||
|
||||
c) You must cause the whole of the work to be licensed at no
|
||||
charge to all third parties under the terms of this License.
|
||||
|
||||
d) If a facility in the modified Library refers to a function or a
|
||||
table of data to be supplied by an application program that uses
|
||||
the facility, other than as an argument passed when the facility
|
||||
is invoked, then you must make a good faith effort to ensure that,
|
||||
in the event an application does not supply such function or
|
||||
table, the facility still operates, and performs whatever part of
|
||||
its purpose remains meaningful.
|
||||
|
||||
(For example, a function in a library to compute square roots has
|
||||
a purpose that is entirely well-defined independent of the
|
||||
application. Therefore, Subsection 2d requires that any
|
||||
application-supplied function or table used by this function must
|
||||
be optional: if the application does not supply it, the square
|
||||
root function must still compute square roots.)
|
||||
|
||||
These requirements apply to the modified work as a whole. If
|
||||
identifiable sections of that work are not derived from the Library,
|
||||
and can be reasonably considered independent and separate works in
|
||||
themselves, then this License, and its terms, do not apply to those
|
||||
sections when you distribute them as separate works. But when you
|
||||
distribute the same sections as part of a whole which is a work based
|
||||
on the Library, the distribution of the whole must be on the terms of
|
||||
this License, whose permissions for other licensees extend to the
|
||||
entire whole, and thus to each and every part regardless of who wrote
|
||||
it.
|
||||
|
||||
Thus, it is not the intent of this section to claim rights or contest
|
||||
your rights to work written entirely by you; rather, the intent is to
|
||||
exercise the right to control the distribution of derivative or
|
||||
collective works based on the Library.
|
||||
|
||||
In addition, mere aggregation of another work not based on the Library
|
||||
with the Library (or with a work based on the Library) on a volume of
|
||||
a storage or distribution medium does not bring the other work under
|
||||
the scope of this License.
|
||||
|
||||
3. You may opt to apply the terms of the ordinary GNU General Public
|
||||
License instead of this License to a given copy of the Library. To do
|
||||
this, you must alter all the notices that refer to this License, so
|
||||
that they refer to the ordinary GNU General Public License, version 2,
|
||||
instead of to this License. (If a newer version than version 2 of the
|
||||
ordinary GNU General Public License has appeared, then you can specify
|
||||
that version instead if you wish.) Do not make any other change in
|
||||
these notices.
|
||||
|
||||
Once this change is made in a given copy, it is irreversible for
|
||||
that copy, so the ordinary GNU General Public License applies to all
|
||||
subsequent copies and derivative works made from that copy.
|
||||
|
||||
This option is useful when you wish to copy part of the code of
|
||||
the Library into a program that is not a library.
|
||||
|
||||
4. You may copy and distribute the Library (or a portion or
|
||||
derivative of it, under Section 2) in object code or executable form
|
||||
under the terms of Sections 1 and 2 above provided that you accompany
|
||||
it with the complete corresponding machine-readable source code, which
|
||||
must be distributed under the terms of Sections 1 and 2 above on a
|
||||
medium customarily used for software interchange.
|
||||
|
||||
If distribution of object code is made by offering access to copy
|
||||
from a designated place, then offering equivalent access to copy the
|
||||
source code from the same place satisfies the requirement to
|
||||
distribute the source code, even though third parties are not
|
||||
compelled to copy the source along with the object code.
|
||||
|
||||
5. A program that contains no derivative of any portion of the
|
||||
Library, but is designed to work with the Library by being compiled or
|
||||
linked with it, is called a "work that uses the Library". Such a
|
||||
work, in isolation, is not a derivative work of the Library, and
|
||||
therefore falls outside the scope of this License.
|
||||
|
||||
However, linking a "work that uses the Library" with the Library
|
||||
creates an executable that is a derivative of the Library (because it
|
||||
contains portions of the Library), rather than a "work that uses the
|
||||
library". The executable is therefore covered by this License.
|
||||
Section 6 states terms for distribution of such executables.
|
||||
|
||||
When a "work that uses the Library" uses material from a header file
|
||||
that is part of the Library, the object code for the work may be a
|
||||
derivative work of the Library even though the source code is not.
|
||||
Whether this is true is especially significant if the work can be
|
||||
linked without the Library, or if the work is itself a library. The
|
||||
threshold for this to be true is not precisely defined by law.
|
||||
|
||||
If such an object file uses only numerical parameters, data
|
||||
structure layouts and accessors, and small macros and small inline
|
||||
functions (ten lines or less in length), then the use of the object
|
||||
file is unrestricted, regardless of whether it is legally a derivative
|
||||
work. (Executables containing this object code plus portions of the
|
||||
Library will still fall under Section 6.)
|
||||
|
||||
Otherwise, if the work is a derivative of the Library, you may
|
||||
distribute the object code for the work under the terms of Section 6.
|
||||
Any executables containing that work also fall under Section 6,
|
||||
whether or not they are linked directly with the Library itself.
|
||||
|
||||
6. As an exception to the Sections above, you may also combine or
|
||||
link a "work that uses the Library" with the Library to produce a
|
||||
work containing portions of the Library, and distribute that work
|
||||
under terms of your choice, provided that the terms permit
|
||||
modification of the work for the customer's own use and reverse
|
||||
engineering for debugging such modifications.
|
||||
|
||||
You must give prominent notice with each copy of the work that the
|
||||
Library is used in it and that the Library and its use are covered by
|
||||
this License. You must supply a copy of this License. If the work
|
||||
during execution displays copyright notices, you must include the
|
||||
copyright notice for the Library among them, as well as a reference
|
||||
directing the user to the copy of this License. Also, you must do one
|
||||
of these things:
|
||||
|
||||
a) Accompany the work with the complete corresponding
|
||||
machine-readable source code for the Library including whatever
|
||||
changes were used in the work (which must be distributed under
|
||||
Sections 1 and 2 above); and, if the work is an executable linked
|
||||
with the Library, with the complete machine-readable "work that
|
||||
uses the Library", as object code and/or source code, so that the
|
||||
user can modify the Library and then relink to produce a modified
|
||||
executable containing the modified Library. (It is understood
|
||||
that the user who changes the contents of definitions files in the
|
||||
Library will not necessarily be able to recompile the application
|
||||
to use the modified definitions.)
|
||||
|
||||
b) Use a suitable shared library mechanism for linking with the
|
||||
Library. A suitable mechanism is one that (1) uses at run time a
|
||||
copy of the library already present on the user's computer system,
|
||||
rather than copying library functions into the executable, and (2)
|
||||
will operate properly with a modified version of the library, if
|
||||
the user installs one, as long as the modified version is
|
||||
interface-compatible with the version that the work was made with.
|
||||
|
||||
c) Accompany the work with a written offer, valid for at
|
||||
least three years, to give the same user the materials
|
||||
specified in Subsection 6a, above, for a charge no more
|
||||
than the cost of performing this distribution.
|
||||
|
||||
d) If distribution of the work is made by offering access to copy
|
||||
from a designated place, offer equivalent access to copy the above
|
||||
specified materials from the same place.
|
||||
|
||||
e) Verify that the user has already received a copy of these
|
||||
materials or that you have already sent this user a copy.
|
||||
|
||||
For an executable, the required form of the "work that uses the
|
||||
Library" must include any data and utility programs needed for
|
||||
reproducing the executable from it. However, as a special exception,
|
||||
the materials to be distributed need not include anything that is
|
||||
normally distributed (in either source or binary form) with the major
|
||||
components (compiler, kernel, and so on) of the operating system on
|
||||
which the executable runs, unless that component itself accompanies
|
||||
the executable.
|
||||
|
||||
It may happen that this requirement contradicts the license
|
||||
restrictions of other proprietary libraries that do not normally
|
||||
accompany the operating system. Such a contradiction means you cannot
|
||||
use both them and the Library together in an executable that you
|
||||
distribute.
|
||||
|
||||
7. You may place library facilities that are a work based on the
|
||||
Library side-by-side in a single library together with other library
|
||||
facilities not covered by this License, and distribute such a combined
|
||||
library, provided that the separate distribution of the work based on
|
||||
the Library and of the other library facilities is otherwise
|
||||
permitted, and provided that you do these two things:
|
||||
|
||||
a) Accompany the combined library with a copy of the same work
|
||||
based on the Library, uncombined with any other library
|
||||
facilities. This must be distributed under the terms of the
|
||||
Sections above.
|
||||
|
||||
b) Give prominent notice with the combined library of the fact
|
||||
that part of it is a work based on the Library, and explaining
|
||||
where to find the accompanying uncombined form of the same work.
|
||||
|
||||
8. You may not copy, modify, sublicense, link with, or distribute
|
||||
the Library except as expressly provided under this License. Any
|
||||
attempt otherwise to copy, modify, sublicense, link with, or
|
||||
distribute the Library is void, and will automatically terminate your
|
||||
rights under this License. However, parties who have received copies,
|
||||
or rights, from you under this License will not have their licenses
|
||||
terminated so long as such parties remain in full compliance.
|
||||
|
||||
9. You are not required to accept this License, since you have not
|
||||
signed it. However, nothing else grants you permission to modify or
|
||||
distribute the Library or its derivative works. These actions are
|
||||
prohibited by law if you do not accept this License. Therefore, by
|
||||
modifying or distributing the Library (or any work based on the
|
||||
Library), you indicate your acceptance of this License to do so, and
|
||||
all its terms and conditions for copying, distributing or modifying
|
||||
the Library or works based on it.
|
||||
|
||||
10. Each time you redistribute the Library (or any work based on the
|
||||
Library), the recipient automatically receives a license from the
|
||||
original licensor to copy, distribute, link with or modify the Library
|
||||
subject to these terms and conditions. You may not impose any further
|
||||
restrictions on the recipients' exercise of the rights granted herein.
|
||||
You are not responsible for enforcing compliance by third parties with
|
||||
this License.
|
||||
|
||||
11. If, as a consequence of a court judgment or allegation of patent
|
||||
infringement or for any other reason (not limited to patent issues),
|
||||
conditions are imposed on you (whether by court order, agreement or
|
||||
otherwise) that contradict the conditions of this License, they do not
|
||||
excuse you from the conditions of this License. If you cannot
|
||||
distribute so as to satisfy simultaneously your obligations under this
|
||||
License and any other pertinent obligations, then as a consequence you
|
||||
may not distribute the Library at all. For example, if a patent
|
||||
license would not permit royalty-free redistribution of the Library by
|
||||
all those who receive copies directly or indirectly through you, then
|
||||
the only way you could satisfy both it and this License would be to
|
||||
refrain entirely from distribution of the Library.
|
||||
|
||||
If any portion of this section is held invalid or unenforceable under any
|
||||
particular circumstance, the balance of the section is intended to apply,
|
||||
and the section as a whole is intended to apply in other circumstances.
|
||||
|
||||
It is not the purpose of this section to induce you to infringe any
|
||||
patents or other property right claims or to contest validity of any
|
||||
such claims; this section has the sole purpose of protecting the
|
||||
integrity of the free software distribution system which is
|
||||
implemented by public license practices. Many people have made
|
||||
generous contributions to the wide range of software distributed
|
||||
through that system in reliance on consistent application of that
|
||||
system; it is up to the author/donor to decide if he or she is willing
|
||||
to distribute software through any other system and a licensee cannot
|
||||
impose that choice.
|
||||
|
||||
This section is intended to make thoroughly clear what is believed to
|
||||
be a consequence of the rest of this License.
|
||||
|
||||
12. If the distribution and/or use of the Library is restricted in
|
||||
certain countries either by patents or by copyrighted interfaces, the
|
||||
original copyright holder who places the Library under this License may add
|
||||
an explicit geographical distribution limitation excluding those countries,
|
||||
so that distribution is permitted only in or among countries not thus
|
||||
excluded. In such case, this License incorporates the limitation as if
|
||||
written in the body of this License.
|
||||
|
||||
13. The Free Software Foundation may publish revised and/or new
|
||||
versions of the Lesser General Public License from time to time.
|
||||
Such new versions will be similar in spirit to the present version,
|
||||
but may differ in detail to address new problems or concerns.
|
||||
|
||||
Each version is given a distinguishing version number. If the Library
|
||||
specifies a version number of this License which applies to it and
|
||||
"any later version", you have the option of following the terms and
|
||||
conditions either of that version or of any later version published by
|
||||
the Free Software Foundation. If the Library does not specify a
|
||||
license version number, you may choose any version ever published by
|
||||
the Free Software Foundation.
|
||||
|
||||
14. If you wish to incorporate parts of the Library into other free
|
||||
programs whose distribution conditions are incompatible with these,
|
||||
write to the author to ask for permission. For software which is
|
||||
copyrighted by the Free Software Foundation, write to the Free
|
||||
Software Foundation; we sometimes make exceptions for this. Our
|
||||
decision will be guided by the two goals of preserving the free status
|
||||
of all derivatives of our free software and of promoting the sharing
|
||||
and reuse of software generally.
|
||||
|
||||
NO WARRANTY
|
||||
|
||||
15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
|
||||
WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
|
||||
EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
|
||||
OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
|
||||
KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
||||
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
|
||||
LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
|
||||
THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
|
||||
|
||||
16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
|
||||
WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
|
||||
AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
|
||||
FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
|
||||
CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
|
||||
LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
|
||||
RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
|
||||
FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
|
||||
SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
|
||||
DAMAGES.
|
||||
|
||||
END OF TERMS AND CONDITIONS
|
||||
|
||||
How to Apply These Terms to Your New Libraries
|
||||
|
||||
If you develop a new library, and you want it to be of the greatest
|
||||
possible use to the public, we recommend making it free software that
|
||||
everyone can redistribute and change. You can do so by permitting
|
||||
redistribution under these terms (or, alternatively, under the terms of the
|
||||
ordinary General Public License).
|
||||
|
||||
To apply these terms, attach the following notices to the library. It is
|
||||
safest to attach them to the start of each source file to most effectively
|
||||
convey the exclusion of warranty; and each file should have at least the
|
||||
"copyright" line and a pointer to where the full notice is found.
|
||||
|
||||
<one line to give the library's name and a brief idea of what it does.>
|
||||
Copyright (C) <year> <name of author>
|
||||
|
||||
This library is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU Lesser General Public
|
||||
License as published by the Free Software Foundation; either
|
||||
version 2.1 of the License, or (at your option) any later version.
|
||||
|
||||
This library 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
|
||||
Lesser General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU Lesser General Public
|
||||
License along with this library; if not, write to the Free Software
|
||||
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
Also add information on how to contact you by electronic and paper mail.
|
||||
|
||||
You should also get your employer (if you work as a programmer) or your
|
||||
school, if any, to sign a "copyright disclaimer" for the library, if
|
||||
necessary. Here is a sample; alter the names:
|
||||
|
||||
Yoyodyne, Inc., hereby disclaims all copyright interest in the
|
||||
library `Frob' (a library for tweaking knobs) written by James Random Hacker.
|
||||
|
||||
<signature of Ty Coon>, 1 April 1990
|
||||
Ty Coon, President of Vice
|
||||
|
||||
That's all there is to it!
|
||||
|
||||
|
|
@ -272,7 +272,7 @@ public class Diff {
|
|||
case Diff.Part.ADDED: sb.append("added"); break;
|
||||
case Diff.Part.DELETED: sb.append("deleted"); break;
|
||||
}
|
||||
sb.append("\">").append(wikiCode.replaceXMLEntities(ps[j].getString()).replaceAll("\n", "<br />"));
|
||||
sb.append("\">").append(htmlTools.replaceXMLEntities(ps[j].getString()).replaceAll("\n", "<br />"));
|
||||
sb.append("</span>");
|
||||
}
|
||||
sb.append("</p>");
|
||||
|
|
232
source/de/anomic/data/htmlTools.java
Normal file
232
source/de/anomic/data/htmlTools.java
Normal file
|
@ -0,0 +1,232 @@
|
|||
package de.anomic.data;
|
||||
|
||||
public class htmlTools {
|
||||
|
||||
/** Replaces special characters from a string. Avoids XSS attacks and ensures correct display of
|
||||
* special characters in non UTF-8 capable browsers.
|
||||
* @param text a string that possibly contains HTML
|
||||
* @return the string with all special characters encoded
|
||||
*/
|
||||
//[MN]
|
||||
public static String replaceHTML(String text) {
|
||||
text = replace(text, xmlentities);
|
||||
text = replace(text, htmlentities);
|
||||
return text;
|
||||
}
|
||||
|
||||
/** Replaces special characters from a string. Ensures correct display of
|
||||
* special characters in non UTF-8 capable browsers.
|
||||
* @param text a string that possibly contains special characters
|
||||
* @return the string with all special characters encoded
|
||||
*/
|
||||
//[MN]
|
||||
public static String replaceHTMLEntities(String text) {
|
||||
text = replace(text, htmlentities);
|
||||
return text;
|
||||
}
|
||||
|
||||
/** Replaces special characters from a string. Avoids XSS attacks.
|
||||
* @param text a string that possibly contains HTML
|
||||
* @return the string without any HTML-tags that can be used for XSS
|
||||
*/
|
||||
//[MN]
|
||||
public static String replaceXMLEntities(String text) {
|
||||
text = replace(text, xmlentities);
|
||||
return text;
|
||||
}
|
||||
|
||||
/** Replaces characters in a string with other characters defined in an array.
|
||||
* @param text a string that possibly contains special characters
|
||||
* @param entities array that contains characters to be replaced and characters it will be replaced by
|
||||
* @return the string with all characters replaced by the corresponding character from array
|
||||
*/
|
||||
//[FB], changes by [MN]
|
||||
public static String replace(String text, String[] entities) {
|
||||
if (text==null) { return null; }
|
||||
for (int x=0;x<=entities.length-1;x=x+2) {
|
||||
int p=0;
|
||||
while ((p=text.indexOf(entities[x],p))>=0) {
|
||||
text=text.substring(0,p)+entities[x+1]+text.substring(p+entities[x].length());
|
||||
p+=entities[x+1].length();
|
||||
}
|
||||
}
|
||||
return text;
|
||||
}
|
||||
|
||||
public static String deReplaceHTML(String text) {
|
||||
text = deReplaceHTMLEntities(text);
|
||||
text = deReplaceXMLEntities(text);
|
||||
return text;
|
||||
}
|
||||
|
||||
public static String deReplaceHTMLEntities(String text) {
|
||||
return deReplace(text, htmlentities);
|
||||
}
|
||||
|
||||
public static String deReplaceXMLEntities(String text) {
|
||||
return deReplace(text, xmlentities);
|
||||
}
|
||||
|
||||
public static String deReplace(String text, String[] entities) {
|
||||
if (text == null) return null;
|
||||
for (int i=entities.length-1; i>0; i-=2) {
|
||||
int p = 0;
|
||||
while ((p = text.indexOf(entities[i])) >= 0) {
|
||||
text = text.substring(0, p) + entities[i - 1] + text.substring(p + entities[i].length());
|
||||
p += entities[i - 1].length();
|
||||
}
|
||||
}
|
||||
return text;
|
||||
}
|
||||
|
||||
//This array contains codes (see http://mindprod.com/jgloss/unicode.html for details)
|
||||
//that will be replaced. To add new codes or patterns, just put them at the end
|
||||
//of the list. Codes or patterns in this list can not be escaped with [= or <pre>
|
||||
public static final String[] xmlentities={
|
||||
// Ampersands _have_ to be replaced first. If they were replaced later,
|
||||
// other replaced characters containing ampersands would get messed up.
|
||||
"\u0026","&", //ampersand
|
||||
"\"",""", //quotation mark
|
||||
"\u003C","<", //less than
|
||||
"\u003E",">", //greater than
|
||||
};
|
||||
|
||||
//This array contains codes (see http://mindprod.com/jgloss/unicode.html for details) and
|
||||
//patterns that will be replaced. To add new codes or patterns, just put them at the end
|
||||
//of the list. Codes or patterns in this list can not be escaped with [= or <pre>
|
||||
public static final String[] htmlentities={
|
||||
"\u005E","^", // Caret
|
||||
|
||||
"\u0060","`", // Accent Grave `
|
||||
"\u007B","{", // {
|
||||
"\u007C","|", // |
|
||||
"\u007D","}", // }
|
||||
"\u007E","~", // ~
|
||||
|
||||
"\u0082","‚",
|
||||
"\u0083","ƒ",
|
||||
"\u0084","„",
|
||||
"\u0085","…",
|
||||
"\u0086","†",
|
||||
"\u0087","‡",
|
||||
"\u0088","ˆ",
|
||||
"\u0089","‰",
|
||||
"\u008A","Š",
|
||||
"\u008B","‹",
|
||||
"\u008C","Œ",
|
||||
"\u008D","",
|
||||
"\u008E","Ž",
|
||||
|
||||
"\u0091","‘",
|
||||
"\u0092","’",
|
||||
"\u0093","“",
|
||||
"\u0094","”",
|
||||
"\u0095","•",
|
||||
"\u0096","–",
|
||||
"\u0097","—",
|
||||
"\u0098","˜",
|
||||
"\u0099","™",
|
||||
"\u009A","š",
|
||||
"\u009B","›",
|
||||
"\u009C","œ",
|
||||
"\u009D","",
|
||||
"\u009E","ž",
|
||||
"\u009F","Ÿ",
|
||||
|
||||
"\u00A1","¡", //inverted (spanish) exclamation mark
|
||||
"\u00A2","¢", //cent
|
||||
"\u00A3","£", //pound
|
||||
"\u00A4","¤", //currency
|
||||
"\u00A5","¥", //yen
|
||||
"\u00A6","¦", //broken vertical bar
|
||||
"\u00A7","§", //section sign
|
||||
"\u00A8","¨", //diaeresis (umlaut)
|
||||
"\u00A9","©", //copyright sign
|
||||
"\u00AA","ª", //feminine ordinal indicator
|
||||
"\u00AB","«", //left-pointing double angle quotation mark
|
||||
"\u00AC","¬", //not sign
|
||||
"\u00AD","­", //soft hyphen
|
||||
"\u00AE","®", //registered sign
|
||||
"\u00AF","¯", //macron
|
||||
"\u00B0","°", //degree sign
|
||||
"\u00B1","±", //plus-minus sign
|
||||
"\u00B2","²", //superscript two
|
||||
"\u00B3","³", //superscript three
|
||||
"\u00B4","´", //acute accent
|
||||
"\u00B5","µ", //micro sign
|
||||
"\u00B6","¶", //paragraph sign
|
||||
"\u00B7","·", //middle dot
|
||||
"\u00B8","¸", //cedilla
|
||||
"\u00B9","¹", //superscript one
|
||||
"\u00BA","º", //masculine ordinal indicator
|
||||
"\u00BB","»", //right-pointing double angle quotation mark
|
||||
"\u00BC","¼", //fraction 1/4
|
||||
"\u00BD","½", //fraction 1/2
|
||||
"\u00BE","¾", //fraction 3/4
|
||||
"\u00BF","¿", //inverted (spanisch) questionmark
|
||||
"\u00C0","À",
|
||||
"\u00C1","Á",
|
||||
"\u00C2","Â",
|
||||
"\u00C3","Ã",
|
||||
"\u00C4","Ä",
|
||||
"\u00C5","Å",
|
||||
"\u00C6","Æ",
|
||||
"\u00C7","Ç",
|
||||
"\u00C8","È",
|
||||
"\u00C9","É",
|
||||
"\u00CA","Ê",
|
||||
"\u00CB","Ë",
|
||||
"\u00CC","Ì",
|
||||
"\u00CD","Í",
|
||||
"\u00CE","Î",
|
||||
"\u00CF","Ï",
|
||||
"\u00D0","Ð",
|
||||
"\u00D1","Ñ",
|
||||
"\u00D2","Ò",
|
||||
"\u00D3","Ó",
|
||||
"\u00D4","Ô",
|
||||
"\u00D5","Õ",
|
||||
"\u00D6","Ö",
|
||||
"\u00D7","×",
|
||||
"\u00D8","Ø",
|
||||
"\u00D9","Ù",
|
||||
"\u00DA","Ú",
|
||||
"\u00DB","Û",
|
||||
"\u00DC","Ü",
|
||||
"\u00DD","Ý",
|
||||
"\u00DE","Þ",
|
||||
"\u00DF","ß",
|
||||
"\u00E0","à",
|
||||
"\u00E1","á",
|
||||
"\u00E2","â",
|
||||
"\u00E3","ã",
|
||||
"\u00E4","ä",
|
||||
"\u00E5","å",
|
||||
"\u00E6","æ",
|
||||
"\u00E7","ç",
|
||||
"\u00E8","è",
|
||||
"\u00E9","é",
|
||||
"\u00EA","ê",
|
||||
"\u00EB","ë",
|
||||
"\u00EC","ì",
|
||||
"\u00ED","í",
|
||||
"\u00EE","î",
|
||||
"\u00EF","ï",
|
||||
"\u00F0","ð",
|
||||
"\u00F1","ñ",
|
||||
"\u00F2","ò",
|
||||
"\u00F3","ó",
|
||||
"\u00F4","ô",
|
||||
"\u00F5","õ",
|
||||
"\u00F6","ö",
|
||||
"\u00F7","÷",
|
||||
"\u00F8","ø",
|
||||
"\u00F9","ù",
|
||||
"\u00FA","ú",
|
||||
"\u00FB","û",
|
||||
"\u00FC","ü",
|
||||
"\u00FD","ý",
|
||||
"\u00FE","þ",
|
||||
"\u00FF","ÿ"
|
||||
};
|
||||
}
|
|
@ -1,20 +0,0 @@
|
|||
package de.anomic.data.wiki;
|
||||
|
||||
public class WikiParserException extends RuntimeException {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
public WikiParserException() { }
|
||||
|
||||
public WikiParserException(String message) {
|
||||
super(message);
|
||||
}
|
||||
|
||||
public WikiParserException(Throwable cause) {
|
||||
super(cause);
|
||||
}
|
||||
|
||||
public WikiParserException(String message, Throwable cause) {
|
||||
super(message, cause);
|
||||
}
|
||||
}
|
50
source/de/anomic/data/wiki/abstractWikiParser.java
Normal file
50
source/de/anomic/data/wiki/abstractWikiParser.java
Normal file
|
@ -0,0 +1,50 @@
|
|||
package de.anomic.data.wiki;
|
||||
|
||||
import java.io.BufferedReader;
|
||||
import java.io.ByteArrayInputStream;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStreamReader;
|
||||
import java.io.StringReader;
|
||||
import java.io.UnsupportedEncodingException;
|
||||
|
||||
import de.anomic.plasma.plasmaSwitchboard;
|
||||
|
||||
public abstract class abstractWikiParser implements wikiParser {
|
||||
|
||||
protected plasmaSwitchboard sb;
|
||||
|
||||
public abstractWikiParser(plasmaSwitchboard sb) {
|
||||
this.sb = sb;
|
||||
}
|
||||
|
||||
protected abstract String transform(BufferedReader reader, int length, plasmaSwitchboard sb) throws IOException;
|
||||
|
||||
public String transform(String content) {
|
||||
return transform(content, this.sb);
|
||||
}
|
||||
|
||||
public String transform(String content, plasmaSwitchboard sb) {
|
||||
try {
|
||||
return transform(new BufferedReader(new StringReader(content)), content.length(), sb);
|
||||
} catch (IOException e) {
|
||||
return "internal error: " + e.getMessage();
|
||||
}
|
||||
}
|
||||
|
||||
public String transform(byte[] content) throws UnsupportedEncodingException {
|
||||
return transform(content, "UTF-8", this.sb);
|
||||
}
|
||||
|
||||
public String transform(byte[] content, String encoding) throws UnsupportedEncodingException {
|
||||
return transform(content, encoding, this.sb);
|
||||
}
|
||||
|
||||
public String transform(byte[] content, String encoding, plasmaSwitchboard switchboard) throws UnsupportedEncodingException {
|
||||
ByteArrayInputStream bais = new ByteArrayInputStream(content);
|
||||
try {
|
||||
return transform(new BufferedReader(new InputStreamReader(bais, encoding)), content.length, switchboard);
|
||||
} catch (IOException e) {
|
||||
return "internal error: " + e.getMessage();
|
||||
}
|
||||
}
|
||||
}
|
285
source/de/anomic/data/wiki/knwikiParser.java
Normal file
285
source/de/anomic/data/wiki/knwikiParser.java
Normal file
|
@ -0,0 +1,285 @@
|
|||
// wikiParser.java
|
||||
// ---------
|
||||
// part of YaCy
|
||||
// (C) by Michael Peter Christen; mc@anomic.de
|
||||
// first published on http://www.anomic.de
|
||||
// Frankfurt, Germany, 2007
|
||||
// Created 22.02.2007
|
||||
//
|
||||
// This file is contributed by Franz Brauße
|
||||
//
|
||||
// $LastChangedDate: $
|
||||
// $LastChangedRevision: $
|
||||
// $LastChangedBy: $
|
||||
//
|
||||
// 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
|
||||
//
|
||||
// Using this software in any meaning (reading, learning, copying, compiling,
|
||||
// running) means that you agree that the Author(s) is (are) not responsible
|
||||
// for cost, loss of data or any harm that may be caused directly or indirectly
|
||||
// by usage of this softare or this documentation. The usage of this software
|
||||
// is on your own risk. The installation and usage (starting/running) of this
|
||||
// software may allow other people or application to access your computer and
|
||||
// any attached devices and is highly dependent on the configuration of the
|
||||
// software which must be done by the user of the software; the author(s) is
|
||||
// (are) also not responsible for proper configuration and usage of the
|
||||
// software, even if provoked by documentation provided together with
|
||||
// the software.
|
||||
//
|
||||
// Any changes to this file according to the GPL as documented in the file
|
||||
// gpl.txt aside this file in the shipment you received can be done to the
|
||||
// lines that follows this copyright notice here, but changes must not be
|
||||
// done inside the copyright notive above. A re-distribution must contain
|
||||
// the intact and unchanged copyright notice.
|
||||
// Contributions and changes to the program code must be marked as such.
|
||||
|
||||
package de.anomic.data.wiki;
|
||||
|
||||
import java.io.UnsupportedEncodingException;
|
||||
import java.util.ArrayList;
|
||||
import java.util.regex.Matcher;
|
||||
|
||||
import de.anomic.data.wiki.tokens.DefinitionListToken;
|
||||
import de.anomic.data.wiki.tokens.LinkToken;
|
||||
import de.anomic.data.wiki.tokens.ListToken;
|
||||
import de.anomic.data.wiki.tokens.SimpleToken;
|
||||
import de.anomic.data.wiki.tokens.TableToken;
|
||||
import de.anomic.data.wiki.tokens.Token;
|
||||
import de.anomic.plasma.plasmaSwitchboard;
|
||||
import de.anomic.yacy.yacyCore;
|
||||
|
||||
public class knwikiParser implements wikiParser {
|
||||
|
||||
public final Token[] tokens;
|
||||
private final String[] BEs;
|
||||
|
||||
public knwikiParser(plasmaSwitchboard sb) {
|
||||
tokens = new Token[] {
|
||||
new SimpleToken('=', '=', new String[][] { null, { "h2" }, { "h3" }, { "h4" } }, true),
|
||||
new SimpleToken('\'', '\'', new String[][] { null, { "i" }, { "b" }, null, { "b", "i" } }, false),
|
||||
new LinkToken(yacyCore.seedDB.mySeed.getPublicAddress(), "Wiki.html?page=", sb),
|
||||
new ListToken('*', "ul"),
|
||||
new ListToken('#', "ol"),
|
||||
new ListToken(':', "blockquote", null),
|
||||
new ListToken(' ', null, "tt", false),
|
||||
new DefinitionListToken(),
|
||||
new TableToken()
|
||||
};
|
||||
ArrayList r = new ArrayList();
|
||||
for (int i=0, k, j; i<tokens.length; i++)
|
||||
if (tokens[i].getBlockElementNames() != null)
|
||||
for (j=0; j<tokens[i].getBlockElementNames().length; j++) {
|
||||
if (tokens[i].getBlockElementNames()[j] == null) continue;
|
||||
if ((k = tokens[i].getBlockElementNames()[j].indexOf(' ')) > 1) {
|
||||
r.add(tokens[i].getBlockElementNames()[j].substring(0, k));
|
||||
} else {
|
||||
r.add(tokens[i].getBlockElementNames()[j]);
|
||||
}
|
||||
}
|
||||
r.add("hr");
|
||||
BEs = (String[])r.toArray(new String[r.size()]);
|
||||
}
|
||||
|
||||
public static void main(String[] args) {
|
||||
String text = "===T<pre>itle===\n" +
|
||||
"==blubb== was ==ein '''shice'''==...och.bla\n" +
|
||||
"* ein \n" +
|
||||
"*==test=</pre>=\n" +
|
||||
"** doppelt\n" +
|
||||
"* ''tess*sst''\n" +
|
||||
"*** xyz\n" +
|
||||
"=]*** huch\n" +
|
||||
"* ehehe***\n" +
|
||||
"* blubb\n" +
|
||||
"bliblablo\n\n\n" +
|
||||
"* blubb\n" +
|
||||
"{|border=-1\n" +
|
||||
"|-\n" +
|
||||
"||bla|| blubb\n" +
|
||||
"|-\n" +
|
||||
"||align center|och||huch||\n" +
|
||||
"|}\n" +
|
||||
"\n" +
|
||||
"# bla\n" +
|
||||
"# blubb\n" +
|
||||
"'''''ehehehe''''', ne?!\n" +
|
||||
"[http://www/index.html,ne?!] -\n" +
|
||||
"[[Image:blubb|BLA]] ---- och\n" +
|
||||
" blubb1\n" +
|
||||
" blubb2\n" +
|
||||
":doppel-blubb[= huch =]\n" +
|
||||
";hier:da\n" +
|
||||
";dort:und so\n" +
|
||||
";;und:doppelt\n\n\n\n" +
|
||||
"[[Image:blubb|BLA]]";
|
||||
// text = "[=\n=]* bla";
|
||||
String t = "[=] ein fucking [= test =]-text[=,ne?!=] joa, [=alles=]wunderbar," +
|
||||
"[=denk ich=] mal =]";
|
||||
long l = System.currentTimeMillis();
|
||||
t = new knwikiParser(null).parse((args.length > 0) ? args[0] : text);
|
||||
System.out.println("parsing time: " + (System.currentTimeMillis() - l) + " ms");
|
||||
System.out.println("--- --- ---");
|
||||
System.out.println(t);
|
||||
}
|
||||
|
||||
public String transform(String content) {
|
||||
return parse(content);
|
||||
}
|
||||
|
||||
public String transform(String content, plasmaSwitchboard sb) {
|
||||
return parse(content);
|
||||
}
|
||||
|
||||
public String transform(byte[] content) throws UnsupportedEncodingException {
|
||||
return parse(new String(content, "UTF-8"));
|
||||
}
|
||||
|
||||
public String transform(
|
||||
byte[] content, String encoding,
|
||||
plasmaSwitchboard switchboard) throws UnsupportedEncodingException {
|
||||
return parse(new String(content, encoding));
|
||||
}
|
||||
|
||||
public String transform(byte[] content, String encoding) throws UnsupportedEncodingException {
|
||||
return parse(new String(content, encoding));
|
||||
}
|
||||
|
||||
public String parse(String text) {
|
||||
Text[] tt = Text.split2Texts(text, "[=", "=]");
|
||||
for (int i=0; i<tt.length; i+=2)
|
||||
tt[i].setText(parseUnescaped(tt[i].getText()));
|
||||
text = Text.mergeTexts(tt);
|
||||
|
||||
tt = Text.split2Texts(text, "<pre>", "</pre>");
|
||||
for (int i=0; i<tt.length; i+=2)
|
||||
tt[i].setText(replaceBRs(tt[i].getText()));
|
||||
return Text.mergeTexts(tt);
|
||||
}
|
||||
|
||||
public String parseUnescaped(String text) {
|
||||
Token st;
|
||||
Matcher m;
|
||||
StringBuffer sb;
|
||||
for (int i=0; i<tokens.length; i++) {
|
||||
st = tokens[i];
|
||||
for (int j=0; j<st.getRegex().length; j++) {
|
||||
m = st.getRegex()[j].matcher(text);
|
||||
sb = new StringBuffer();
|
||||
while (m.find()) try {
|
||||
//System.out.print("found " + st.getClass().getSimpleName() + ": " +
|
||||
// m.group().replaceAll("\n", "\\\\n").replaceAll("\t", " ") + ", ");
|
||||
if (st.setText(m.group(), j)) {
|
||||
// System.out.println("usable");
|
||||
} else {
|
||||
// System.out.println("not usable");
|
||||
continue;
|
||||
}
|
||||
m.appendReplacement(sb, (st.getMarkup() == null) ? m.group() : st.getMarkup());
|
||||
} catch (wikiParserException e) {
|
||||
m.appendReplacement(sb, st.getText());
|
||||
}
|
||||
text = new String(m.appendTail(sb));
|
||||
}
|
||||
}
|
||||
return text.replaceAll("----", "<hr />");
|
||||
}
|
||||
|
||||
private String replaceBRs(String text) {
|
||||
StringBuffer sb = new StringBuffer(text.length());
|
||||
String[] tt = text.split("\n");
|
||||
boolean replace;
|
||||
for (int i=0, j; i<tt.length; i++) {
|
||||
replace = true;
|
||||
for (j=0; j<BEs.length; j++)
|
||||
if (tt[i].endsWith(BEs[j] + ">")) { replace = false; break; }
|
||||
sb.append(tt[i]);
|
||||
if (i < tt.length - 1) {
|
||||
if (replace) sb.append("<br />");
|
||||
sb.append("\n");
|
||||
}
|
||||
}
|
||||
return new String(sb);
|
||||
}
|
||||
|
||||
private static class Text {
|
||||
|
||||
public static final String escapeNewLine = "@";
|
||||
|
||||
private String text;
|
||||
private final boolean escaped;
|
||||
private final boolean nl;
|
||||
|
||||
public Text(String text, boolean escaped, boolean newLineBefore) {
|
||||
this.text = text;
|
||||
this.escaped = escaped;
|
||||
this.nl = newLineBefore;
|
||||
}
|
||||
|
||||
public String setTextPlain(String text) { return this.text = text; }
|
||||
public String setText(String text) {
|
||||
if (this.nl)
|
||||
this.text = text.substring(escapeNewLine.length());
|
||||
else
|
||||
this.text = text;
|
||||
return this.text;
|
||||
}
|
||||
|
||||
public String getTextPlain() { return this.text; }
|
||||
public String getText() {
|
||||
if (this.nl)
|
||||
return escapeNewLine + this.text;
|
||||
else
|
||||
return this.text;
|
||||
}
|
||||
|
||||
public String toString() { return this.text; }
|
||||
public boolean isEscaped() { return this.escaped; }
|
||||
public boolean isNewLineBefore() { return this.nl; }
|
||||
|
||||
private static Text[] split2Texts(String text, String escapeBegin, String escapeEnd) {
|
||||
if (text == null) return null;
|
||||
if (text.length() < 2) return new Text[] { new Text(text, false, true) };
|
||||
|
||||
int startLen = escapeBegin.length();
|
||||
int endLen = escapeEnd.length();
|
||||
ArrayList r = new ArrayList();
|
||||
boolean escaped = text.startsWith(escapeBegin);
|
||||
if (escaped) r.add(new Text("", false, true));
|
||||
int i, j = 0;
|
||||
while ((i = text.indexOf((escaped) ? escapeEnd : escapeBegin, j)) > -1) {
|
||||
r.add(resolve2Text(text, escaped, (j > 0) ? j + ((escaped) ? startLen : endLen) : 0, i, escapeEnd));
|
||||
j = i;
|
||||
escaped = !escaped;
|
||||
}
|
||||
r.add(resolve2Text(text, escaped, (escaped) ? j : (j > 0) ? j + endLen : 0, -1, escapeEnd));
|
||||
return (Text[])r.toArray(new Text[r.size()]);
|
||||
}
|
||||
|
||||
private static Text resolve2Text(String text, boolean escaped, int from, int to, String escapeEnd) {
|
||||
if (to == -1) to = text.length();
|
||||
return new Text(
|
||||
text.substring(from, to),
|
||||
escaped,
|
||||
from < escapeEnd.length() + 2 || (!escaped && text.charAt(from - escapeEnd.length() - 1) == '\n'));
|
||||
}
|
||||
|
||||
private static String mergeTexts(Text[] texts) {
|
||||
StringBuffer sb = new StringBuffer();
|
||||
for (int n=0; n < texts.length; n++)
|
||||
sb.append(texts[n].getTextPlain());
|
||||
return new String(sb);
|
||||
}
|
||||
}
|
||||
}
|
|
@ -47,15 +47,17 @@
|
|||
|
||||
package de.anomic.data.wiki.tokens;
|
||||
|
||||
import de.anomic.data.wiki.wikiParserException;
|
||||
|
||||
public abstract class AbstractToken implements Token {
|
||||
|
||||
protected String text = null;
|
||||
protected String markup = null;
|
||||
protected boolean parsed = false;
|
||||
|
||||
protected abstract void parse();
|
||||
protected abstract void parse() throws wikiParserException;
|
||||
|
||||
public String getMarkup() {
|
||||
public String getMarkup() throws wikiParserException {
|
||||
if (this.text == null)
|
||||
throw new IllegalArgumentException();
|
||||
if (!this.parsed) parse();
|
||||
|
@ -64,5 +66,5 @@ public abstract class AbstractToken implements Token {
|
|||
|
||||
public String getText() { return this.text; }
|
||||
|
||||
public String toString() { return getMarkup(); }
|
||||
public String toString() { try { return getMarkup(); } catch (wikiParserException e) { return null; } }
|
||||
}
|
||||
|
|
|
@ -55,7 +55,7 @@ import java.util.regex.Pattern;
|
|||
import de.anomic.data.bookmarksDB;
|
||||
import de.anomic.data.bookmarksDB.Bookmark;
|
||||
import de.anomic.data.bookmarksDB.Tag;
|
||||
import de.anomic.data.wiki.WikiParserException;
|
||||
import de.anomic.data.wiki.wikiParserException;
|
||||
import de.anomic.plasma.plasmaSwitchboard;
|
||||
|
||||
public class LinkToken extends AbstractToken {
|
||||
|
@ -106,13 +106,13 @@ public class LinkToken extends AbstractToken {
|
|||
this.sb = sb;
|
||||
}
|
||||
|
||||
protected void parse() {
|
||||
protected void parse() throws wikiParserException {
|
||||
StringBuffer sb = new StringBuffer();
|
||||
if (this.patternNr < 0 || this.patternNr >= patterns.length)
|
||||
throw new WikiParserException("patternNr was not set correctly: " + this.patternNr);
|
||||
throw new wikiParserException("patternNr was not set correctly: " + this.patternNr);
|
||||
Matcher m = patterns[this.patternNr].matcher(this.text);
|
||||
if (!m.find())
|
||||
throw new WikiParserException("Didn't find match for: (" + this.patternNr + ") " + this.text);
|
||||
throw new wikiParserException("Didn't find match for: (" + this.patternNr + ") " + this.text);
|
||||
|
||||
switch (this.patternNr) {
|
||||
case IMG:
|
||||
|
|
|
@ -51,7 +51,7 @@ import java.util.ArrayList;
|
|||
import java.util.regex.Matcher;
|
||||
import java.util.regex.Pattern;
|
||||
|
||||
import de.anomic.data.wiki.WikiParserException;
|
||||
import de.anomic.data.wiki.wikiParserException;
|
||||
|
||||
public class SimpleToken extends AbstractToken {
|
||||
|
||||
|
@ -88,7 +88,7 @@ public class SimpleToken extends AbstractToken {
|
|||
"([\\" + lastChar + "]{" + i + "," + definitionList.length + "})")};
|
||||
}
|
||||
|
||||
public String getMarkup() {
|
||||
public String getMarkup() throws wikiParserException {
|
||||
if (this.content == null) {
|
||||
if (this.text == null) {
|
||||
throw new IllegalArgumentException();
|
||||
|
@ -96,14 +96,14 @@ public class SimpleToken extends AbstractToken {
|
|||
setText(this.text, 0);
|
||||
}
|
||||
}
|
||||
if (!this.parsed) try { parse(); } catch (WikiParserException e) { return this.text; }
|
||||
if (!this.parsed) parse();
|
||||
return this.markup;
|
||||
}
|
||||
|
||||
protected void parse() {
|
||||
protected void parse() throws wikiParserException {
|
||||
String[] e;
|
||||
if (this.grade >= this.definitionList.length || (e = this.definitionList[this.grade]) == null)
|
||||
throw new WikiParserException("Token not defined for grade: " + this.grade);
|
||||
throw new wikiParserException("Token not defined for grade: " + this.grade);
|
||||
this.markup = getMarkup(e);
|
||||
this.parsed = true;
|
||||
}
|
||||
|
|
|
@ -49,11 +49,13 @@ package de.anomic.data.wiki.tokens;
|
|||
|
||||
import java.util.regex.Pattern;
|
||||
|
||||
import de.anomic.data.wiki.wikiParserException;
|
||||
|
||||
public interface Token {
|
||||
|
||||
public Pattern[] getRegex();
|
||||
public boolean setText(String text, int patternNr);
|
||||
public String getText();
|
||||
public String getMarkup();
|
||||
public String getMarkup() throws wikiParserException;
|
||||
public String[] getBlockElementNames();
|
||||
}
|
||||
|
|
|
@ -1,260 +1,14 @@
|
|||
// wikiParser.java
|
||||
// ---------
|
||||
// part of YaCy
|
||||
// (C) by Michael Peter Christen; mc@anomic.de
|
||||
// first published on http://www.anomic.de
|
||||
// Frankfurt, Germany, 2007
|
||||
// Created 22.02.2007
|
||||
//
|
||||
// This file is contributed by Franz Brauße
|
||||
//
|
||||
// $LastChangedDate: $
|
||||
// $LastChangedRevision: $
|
||||
// $LastChangedBy: $
|
||||
//
|
||||
// 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
|
||||
//
|
||||
// Using this software in any meaning (reading, learning, copying, compiling,
|
||||
// running) means that you agree that the Author(s) is (are) not responsible
|
||||
// for cost, loss of data or any harm that may be caused directly or indirectly
|
||||
// by usage of this softare or this documentation. The usage of this software
|
||||
// is on your own risk. The installation and usage (starting/running) of this
|
||||
// software may allow other people or application to access your computer and
|
||||
// any attached devices and is highly dependent on the configuration of the
|
||||
// software which must be done by the user of the software; the author(s) is
|
||||
// (are) also not responsible for proper configuration and usage of the
|
||||
// software, even if provoked by documentation provided together with
|
||||
// the software.
|
||||
//
|
||||
// Any changes to this file according to the GPL as documented in the file
|
||||
// gpl.txt aside this file in the shipment you received can be done to the
|
||||
// lines that follows this copyright notice here, but changes must not be
|
||||
// done inside the copyright notive above. A re-distribution must contain
|
||||
// the intact and unchanged copyright notice.
|
||||
// Contributions and changes to the program code must be marked as such.
|
||||
|
||||
package de.anomic.data.wiki;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.regex.Matcher;
|
||||
import java.io.UnsupportedEncodingException;
|
||||
|
||||
import de.anomic.data.wiki.tokens.DefinitionListToken;
|
||||
import de.anomic.data.wiki.tokens.LinkToken;
|
||||
import de.anomic.data.wiki.tokens.ListToken;
|
||||
import de.anomic.data.wiki.tokens.SimpleToken;
|
||||
import de.anomic.data.wiki.tokens.TableToken;
|
||||
import de.anomic.data.wiki.tokens.Token;
|
||||
import de.anomic.plasma.plasmaSwitchboard;
|
||||
import de.anomic.yacy.yacyCore;
|
||||
|
||||
public class wikiParser {
|
||||
|
||||
public final Token[] tokens;
|
||||
private final String[] BEs;
|
||||
public interface wikiParser {
|
||||
|
||||
public wikiParser(plasmaSwitchboard sb) {
|
||||
tokens = new Token[] {
|
||||
new SimpleToken('=', '=', new String[][] { null, { "h2" }, { "h3" }, { "h4" } }, true),
|
||||
new SimpleToken('\'', '\'', new String[][] { null, { "i" }, { "b" }, null, { "b", "i" } }, false),
|
||||
new LinkToken(yacyCore.seedDB.mySeed.getPublicAddress(), "Wiki.html?page=", sb),
|
||||
new ListToken('*', "ul"),
|
||||
new ListToken('#', "ol"),
|
||||
new ListToken(':', "blockquote", null),
|
||||
new ListToken(' ', null, "tt", false),
|
||||
new DefinitionListToken(),
|
||||
new TableToken()
|
||||
};
|
||||
ArrayList r = new ArrayList();
|
||||
for (int i=0, k, j; i<tokens.length; i++)
|
||||
if (tokens[i].getBlockElementNames() != null)
|
||||
for (j=0; j<tokens[i].getBlockElementNames().length; j++) {
|
||||
if (tokens[i].getBlockElementNames()[j] == null) continue;
|
||||
if ((k = tokens[i].getBlockElementNames()[j].indexOf(' ')) > 1) {
|
||||
r.add(tokens[i].getBlockElementNames()[j].substring(0, k));
|
||||
} else {
|
||||
r.add(tokens[i].getBlockElementNames()[j]);
|
||||
}
|
||||
}
|
||||
r.add("hr");
|
||||
BEs = (String[])r.toArray(new String[r.size()]);
|
||||
}
|
||||
|
||||
public static void main(String[] args) {
|
||||
String text = "===T<pre>itle===\n" +
|
||||
"==blubb== was ==ein '''shice'''==...och.bla\n" +
|
||||
"* ein \n" +
|
||||
"*==test=</pre>=\n" +
|
||||
"** doppelt\n" +
|
||||
"* ''tess*sst''\n" +
|
||||
"*** xyz\n" +
|
||||
"=]*** huch\n" +
|
||||
"* ehehe***\n" +
|
||||
"* blubb\n" +
|
||||
"bliblablo\n\n\n" +
|
||||
"* blubb\n" +
|
||||
"{|border=-1\n" +
|
||||
"|-\n" +
|
||||
"||bla|| blubb\n" +
|
||||
"|-\n" +
|
||||
"||align center|och||huch||\n" +
|
||||
"|}\n" +
|
||||
"\n" +
|
||||
"# bla\n" +
|
||||
"# blubb\n" +
|
||||
"'''''ehehehe''''', ne?!\n" +
|
||||
"[http://www/index.html,ne?!] -\n" +
|
||||
"[[Image:blubb|BLA]] ---- och\n" +
|
||||
" blubb1\n" +
|
||||
" blubb2\n" +
|
||||
":doppel-blubb[= huch =]\n" +
|
||||
";hier:da\n" +
|
||||
";dort:und so\n" +
|
||||
";;und:doppelt\n\n\n\n" +
|
||||
"[[Image:blubb|BLA]]";
|
||||
// text = "[=\n=]* bla";
|
||||
String t = "[=] ein fucking [= test =]-text[=,ne?!=] joa, [=alles=]wunderbar," +
|
||||
"[=denk ich=] mal =]";
|
||||
long l = System.currentTimeMillis();
|
||||
t = new wikiParser(null).parse((args.length > 0) ? args[0] : text);
|
||||
System.out.println("parsing time: " + (System.currentTimeMillis() - l) + " ms");
|
||||
System.out.println("--- --- ---");
|
||||
System.out.println(t);
|
||||
}
|
||||
|
||||
public String parse(String text) {
|
||||
Text[] tt = Text.split2Texts(text, "[=", "=]");
|
||||
for (int i=0; i<tt.length; i+=2)
|
||||
tt[i].setText(parseUnescaped(tt[i].getText()));
|
||||
text = Text.mergeTexts(tt);
|
||||
|
||||
tt = Text.split2Texts(text, "<pre>", "</pre>");
|
||||
for (int i=0; i<tt.length; i+=2)
|
||||
tt[i].setText(replaceBRs(tt[i].getText()));
|
||||
return Text.mergeTexts(tt);
|
||||
}
|
||||
|
||||
public String parseUnescaped(String text) {
|
||||
Token st;
|
||||
Matcher m;
|
||||
StringBuffer sb;
|
||||
for (int i=0; i<tokens.length; i++) {
|
||||
st = tokens[i];
|
||||
for (int j=0; j<st.getRegex().length; j++) {
|
||||
m = st.getRegex()[j].matcher(text);
|
||||
sb = new StringBuffer();
|
||||
while (m.find()) {
|
||||
//System.out.print("found " + st.getClass().getSimpleName() + ": " +
|
||||
// m.group().replaceAll("\n", "\\\\n").replaceAll("\t", " ") + ", ");
|
||||
if (st.setText(m.group(), j)) {
|
||||
// System.out.println("usable");
|
||||
} else {
|
||||
// System.out.println("not usable");
|
||||
continue;
|
||||
}
|
||||
m.appendReplacement(sb, (st.getMarkup() == null) ? m.group() : st.getMarkup());
|
||||
}
|
||||
text = new String(m.appendTail(sb));
|
||||
}
|
||||
}
|
||||
return text.replaceAll("----", "<hr />");
|
||||
}
|
||||
|
||||
private String replaceBRs(String text) {
|
||||
StringBuffer sb = new StringBuffer(text.length());
|
||||
String[] tt = text.split("\n");
|
||||
boolean replace;
|
||||
for (int i=0, j; i<tt.length; i++) {
|
||||
replace = true;
|
||||
for (j=0; j<BEs.length; j++)
|
||||
if (tt[i].endsWith(BEs[j] + ">")) { replace = false; break; }
|
||||
sb.append(tt[i]);
|
||||
if (i < tt.length - 1) {
|
||||
if (replace) sb.append("<br />");
|
||||
sb.append("\n");
|
||||
}
|
||||
}
|
||||
return new String(sb);
|
||||
}
|
||||
|
||||
private static class Text {
|
||||
|
||||
public static final String escapeNewLine = "@";
|
||||
|
||||
private String text;
|
||||
private final boolean escaped;
|
||||
private final boolean nl;
|
||||
|
||||
public Text(String text, boolean escaped, boolean newLineBefore) {
|
||||
this.text = text;
|
||||
this.escaped = escaped;
|
||||
this.nl = newLineBefore;
|
||||
}
|
||||
|
||||
public String setTextPlain(String text) { return this.text = text; }
|
||||
public String setText(String text) {
|
||||
if (this.nl)
|
||||
this.text = text.substring(escapeNewLine.length());
|
||||
else
|
||||
this.text = text;
|
||||
return this.text;
|
||||
}
|
||||
|
||||
public String getTextPlain() { return this.text; }
|
||||
public String getText() {
|
||||
if (this.nl)
|
||||
return escapeNewLine + this.text;
|
||||
else
|
||||
return this.text;
|
||||
}
|
||||
|
||||
public String toString() { return this.text; }
|
||||
public boolean isEscaped() { return this.escaped; }
|
||||
public boolean isNewLineBefore() { return this.nl; }
|
||||
|
||||
private static Text[] split2Texts(String text, String escapeBegin, String escapeEnd) {
|
||||
if (text == null) return null;
|
||||
if (text.length() < 2) return new Text[] { new Text(text, false, true) };
|
||||
|
||||
int startLen = escapeBegin.length();
|
||||
int endLen = escapeEnd.length();
|
||||
ArrayList r = new ArrayList();
|
||||
boolean escaped = text.startsWith(escapeBegin);
|
||||
if (escaped) r.add(new Text("", false, true));
|
||||
int i, j = 0;
|
||||
while ((i = text.indexOf((escaped) ? escapeEnd : escapeBegin, j)) > -1) {
|
||||
r.add(resolve2Text(text, escaped, (j > 0) ? j + ((escaped) ? startLen : endLen) : 0, i, escapeEnd));
|
||||
j = i;
|
||||
escaped = !escaped;
|
||||
}
|
||||
r.add(resolve2Text(text, escaped, (escaped) ? j : (j > 0) ? j + endLen : 0, -1, escapeEnd));
|
||||
return (Text[])r.toArray(new Text[r.size()]);
|
||||
}
|
||||
|
||||
private static Text resolve2Text(String text, boolean escaped, int from, int to, String escapeEnd) {
|
||||
if (to == -1) to = text.length();
|
||||
return new Text(
|
||||
text.substring(from, to),
|
||||
escaped,
|
||||
from < escapeEnd.length() + 2 || (!escaped && text.charAt(from - escapeEnd.length() - 1) == '\n'));
|
||||
}
|
||||
|
||||
private static String mergeTexts(Text[] texts) {
|
||||
StringBuffer sb = new StringBuffer();
|
||||
for (int n=0; n < texts.length; n++)
|
||||
sb.append(texts[n].getTextPlain());
|
||||
return new String(sb);
|
||||
}
|
||||
}
|
||||
public String transform(String text);
|
||||
public String transform(String text, plasmaSwitchboard switchboard);
|
||||
public String transform(byte[] text) throws UnsupportedEncodingException;
|
||||
public String transform(byte[] text, String encoding) throws UnsupportedEncodingException;
|
||||
public String transform(byte[] text, String encoding, plasmaSwitchboard switchboard) throws UnsupportedEncodingException;
|
||||
}
|
||||
|
|
20
source/de/anomic/data/wiki/wikiParserException.java
Normal file
20
source/de/anomic/data/wiki/wikiParserException.java
Normal file
|
@ -0,0 +1,20 @@
|
|||
package de.anomic.data.wiki;
|
||||
|
||||
public class wikiParserException extends Exception {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
public wikiParserException() { }
|
||||
|
||||
public wikiParserException(String message) {
|
||||
super(message);
|
||||
}
|
||||
|
||||
public wikiParserException(Throwable cause) {
|
||||
super(cause);
|
||||
}
|
||||
|
||||
public wikiParserException(String message, Throwable cause) {
|
||||
super(message, cause);
|
||||
}
|
||||
}
|
|
@ -47,12 +47,11 @@
|
|||
package de.anomic.data;
|
||||
|
||||
import java.io.BufferedReader;
|
||||
import java.io.ByteArrayInputStream;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStreamReader;
|
||||
import java.io.UnsupportedEncodingException;
|
||||
import java.util.ArrayList;
|
||||
|
||||
import de.anomic.data.wiki.abstractWikiParser;
|
||||
import de.anomic.data.wiki.wikiParser;
|
||||
import de.anomic.plasma.plasmaSwitchboard;
|
||||
import de.anomic.server.serverCore;
|
||||
import de.anomic.yacy.yacyCore;
|
||||
|
@ -60,11 +59,10 @@ import de.anomic.yacy.yacyCore;
|
|||
/** This class provides methods to handle texts that have been posted in the yacyWiki or other
|
||||
* parts of YaCy that use this class, like the blog or the profile.
|
||||
*/
|
||||
public class wikiCode {
|
||||
public class wikiCode extends abstractWikiParser implements wikiParser {
|
||||
private String numListLevel="";
|
||||
private String ListLevel="";
|
||||
private String defListLevel="";
|
||||
private plasmaSwitchboard sb;
|
||||
private boolean cellprocessing=false; //needed for prevention of double-execution of replaceHTML
|
||||
private boolean defList = false; //needed for definition lists
|
||||
private boolean escape = false; //needed for escape
|
||||
|
@ -84,270 +82,19 @@ public class wikiCode {
|
|||
|
||||
/** Constructor of the class wikiCode */
|
||||
public wikiCode(plasmaSwitchboard switchboard){
|
||||
sb=switchboard;
|
||||
}
|
||||
|
||||
public String transform(String content){
|
||||
try {
|
||||
return transform(content.getBytes("UTF-8"), sb);
|
||||
} catch (UnsupportedEncodingException e) {
|
||||
return transform(content.getBytes(), sb);
|
||||
}
|
||||
}
|
||||
|
||||
public String transform(byte[] content){
|
||||
return transform(content, sb);
|
||||
}
|
||||
|
||||
public String transform(byte[] content, plasmaSwitchboard switchboard) {
|
||||
ByteArrayInputStream bais = new ByteArrayInputStream(content);
|
||||
try {
|
||||
BufferedReader br = new BufferedReader(new InputStreamReader(bais,
|
||||
"UTF-8"));
|
||||
String line;
|
||||
StringBuffer out = new StringBuffer(content.length);
|
||||
try {
|
||||
while ((line = br.readLine()) != null) {
|
||||
out.append(transformLine(line, switchboard)).append(
|
||||
serverCore.crlfString);
|
||||
}
|
||||
return directory() + new String(out);
|
||||
} catch (UnsupportedEncodingException e1) {
|
||||
// can not happen
|
||||
return null;
|
||||
}
|
||||
} catch (IOException e) {
|
||||
return "internal error: " + e.getMessage();
|
||||
}
|
||||
}
|
||||
|
||||
/** Replaces special characters from a string. Avoids XSS attacks and ensures correct display of
|
||||
* special characters in non UTF-8 capable browsers.
|
||||
* @param text a string that possibly contains HTML
|
||||
* @return the string with all special characters encoded
|
||||
*/
|
||||
//[MN]
|
||||
public static String replaceHTML(String text) {
|
||||
text = replace(text, xmlentities);
|
||||
text = replace(text, htmlentities);
|
||||
return text;
|
||||
}
|
||||
|
||||
/** Replaces special characters from a string. Ensures correct display of
|
||||
* special characters in non UTF-8 capable browsers.
|
||||
* @param text a string that possibly contains special characters
|
||||
* @return the string with all special characters encoded
|
||||
*/
|
||||
//[MN]
|
||||
public static String replaceHTMLEntities(String text) {
|
||||
text = replace(text, htmlentities);
|
||||
return text;
|
||||
}
|
||||
|
||||
/** Replaces special characters from a string. Avoids XSS attacks.
|
||||
* @param text a string that possibly contains HTML
|
||||
* @return the string without any HTML-tags that can be used for XSS
|
||||
*/
|
||||
//[MN]
|
||||
public static String replaceXMLEntities(String text) {
|
||||
text = replace(text, xmlentities);
|
||||
return text;
|
||||
}
|
||||
|
||||
/** Replaces characters in a string with other characters defined in an array.
|
||||
* @param text a string that possibly contains special characters
|
||||
* @param entities array that contains characters to be replaced and characters it will be replaced by
|
||||
* @return the string with all characters replaced by the corresponding character from array
|
||||
*/
|
||||
//[FB], changes by [MN]
|
||||
public static String replace(String text, String[] entities) {
|
||||
if (text==null) { return null; }
|
||||
for (int x=0;x<=entities.length-1;x=x+2) {
|
||||
int p=0;
|
||||
while ((p=text.indexOf(entities[x],p))>=0) {
|
||||
text=text.substring(0,p)+entities[x+1]+text.substring(p+entities[x].length());
|
||||
p+=entities[x+1].length();
|
||||
}
|
||||
}
|
||||
return text;
|
||||
super(switchboard);
|
||||
}
|
||||
|
||||
public static String deReplaceHTML(String text) {
|
||||
text = deReplaceHTMLEntities(text);
|
||||
text = deReplaceXMLEntities(text);
|
||||
return text;
|
||||
protected String transform(
|
||||
BufferedReader reader,
|
||||
int length,
|
||||
plasmaSwitchboard switchboard) throws IOException {
|
||||
StringBuffer out = new StringBuffer(length);
|
||||
String line;
|
||||
while ((line = reader.readLine()) != null)
|
||||
out.append(transformLine(line, switchboard)).append(serverCore.crlfString);
|
||||
return out.insert(0, directory()).toString();
|
||||
}
|
||||
|
||||
public static String deReplaceHTMLEntities(String text) {
|
||||
return deReplace(text, htmlentities);
|
||||
}
|
||||
|
||||
public static String deReplaceXMLEntities(String text) {
|
||||
return deReplace(text, xmlentities);
|
||||
}
|
||||
|
||||
public static String deReplace(String text, String[] entities) {
|
||||
if (text == null) return null;
|
||||
for (int i=entities.length-1; i>0; i-=2) {
|
||||
int p = 0;
|
||||
while ((p = text.indexOf(entities[i])) >= 0) {
|
||||
text = text.substring(0, p) + entities[i - 1] + text.substring(p + entities[i].length());
|
||||
p += entities[i - 1].length();
|
||||
}
|
||||
}
|
||||
return text;
|
||||
}
|
||||
|
||||
//This array contains codes (see http://mindprod.com/jgloss/unicode.html for details)
|
||||
//that will be replaced. To add new codes or patterns, just put them at the end
|
||||
//of the list. Codes or patterns in this list can not be escaped with [= or <pre>
|
||||
public static String[] xmlentities={
|
||||
// Ampersands _have_ to be replaced first. If they were replaced later,
|
||||
// other replaced characters containing ampersands would get messed up.
|
||||
"\u0026","&", //ampersand
|
||||
"\"",""", //quotation mark
|
||||
"\u003C","<", //less than
|
||||
"\u003E",">", //greater than
|
||||
};
|
||||
|
||||
//This array contains codes (see http://mindprod.com/jgloss/unicode.html for details) and
|
||||
//patterns that will be replaced. To add new codes or patterns, just put them at the end
|
||||
//of the list. Codes or patterns in this list can not be escaped with [= or <pre>
|
||||
public static String[] htmlentities={
|
||||
"\u005E","^", // Caret
|
||||
|
||||
"\u0060","`", // Accent Grave `
|
||||
"\u007B","{", // {
|
||||
"\u007C","|", // |
|
||||
"\u007D","}", // }
|
||||
"\u007E","~", // ~
|
||||
|
||||
"\u0082","‚",
|
||||
"\u0083","ƒ",
|
||||
"\u0084","„",
|
||||
"\u0085","…",
|
||||
"\u0086","†",
|
||||
"\u0087","‡",
|
||||
"\u0088","ˆ",
|
||||
"\u0089","‰",
|
||||
"\u008A","Š",
|
||||
"\u008B","‹",
|
||||
"\u008C","Œ",
|
||||
"\u008D","",
|
||||
"\u008E","Ž",
|
||||
|
||||
"\u0091","‘",
|
||||
"\u0092","’",
|
||||
"\u0093","“",
|
||||
"\u0094","”",
|
||||
"\u0095","•",
|
||||
"\u0096","–",
|
||||
"\u0097","—",
|
||||
"\u0098","˜",
|
||||
"\u0099","™",
|
||||
"\u009A","š",
|
||||
"\u009B","›",
|
||||
"\u009C","œ",
|
||||
"\u009D","",
|
||||
"\u009E","ž",
|
||||
"\u009F","Ÿ",
|
||||
|
||||
"\u00A1","¡", //inverted (spanish) exclamation mark
|
||||
"\u00A2","¢", //cent
|
||||
"\u00A3","£", //pound
|
||||
"\u00A4","¤", //currency
|
||||
"\u00A5","¥", //yen
|
||||
"\u00A6","¦", //broken vertical bar
|
||||
"\u00A7","§", //section sign
|
||||
"\u00A8","¨", //diaeresis (umlaut)
|
||||
"\u00A9","©", //copyright sign
|
||||
"\u00AA","ª", //feminine ordinal indicator
|
||||
"\u00AB","«", //left-pointing double angle quotation mark
|
||||
"\u00AC","¬", //not sign
|
||||
"\u00AD","­", //soft hyphen
|
||||
"\u00AE","®", //registered sign
|
||||
"\u00AF","¯", //macron
|
||||
"\u00B0","°", //degree sign
|
||||
"\u00B1","±", //plus-minus sign
|
||||
"\u00B2","²", //superscript two
|
||||
"\u00B3","³", //superscript three
|
||||
"\u00B4","´", //acute accent
|
||||
"\u00B5","µ", //micro sign
|
||||
"\u00B6","¶", //paragraph sign
|
||||
"\u00B7","·", //middle dot
|
||||
"\u00B8","¸", //cedilla
|
||||
"\u00B9","¹", //superscript one
|
||||
"\u00BA","º", //masculine ordinal indicator
|
||||
"\u00BB","»", //right-pointing double angle quotation mark
|
||||
"\u00BC","¼", //fraction 1/4
|
||||
"\u00BD","½", //fraction 1/2
|
||||
"\u00BE","¾", //fraction 3/4
|
||||
"\u00BF","¿", //inverted (spanisch) questionmark
|
||||
"\u00C0","À",
|
||||
"\u00C1","Á",
|
||||
"\u00C2","Â",
|
||||
"\u00C3","Ã",
|
||||
"\u00C4","Ä",
|
||||
"\u00C5","Å",
|
||||
"\u00C6","Æ",
|
||||
"\u00C7","Ç",
|
||||
"\u00C8","È",
|
||||
"\u00C9","É",
|
||||
"\u00CA","Ê",
|
||||
"\u00CB","Ë",
|
||||
"\u00CC","Ì",
|
||||
"\u00CD","Í",
|
||||
"\u00CE","Î",
|
||||
"\u00CF","Ï",
|
||||
"\u00D0","Ð",
|
||||
"\u00D1","Ñ",
|
||||
"\u00D2","Ò",
|
||||
"\u00D3","Ó",
|
||||
"\u00D4","Ô",
|
||||
"\u00D5","Õ",
|
||||
"\u00D6","Ö",
|
||||
"\u00D7","×",
|
||||
"\u00D8","Ø",
|
||||
"\u00D9","Ù",
|
||||
"\u00DA","Ú",
|
||||
"\u00DB","Û",
|
||||
"\u00DC","Ü",
|
||||
"\u00DD","Ý",
|
||||
"\u00DE","Þ",
|
||||
"\u00DF","ß",
|
||||
"\u00E0","à",
|
||||
"\u00E1","á",
|
||||
"\u00E2","â",
|
||||
"\u00E3","ã",
|
||||
"\u00E4","ä",
|
||||
"\u00E5","å",
|
||||
"\u00E6","æ",
|
||||
"\u00E7","ç",
|
||||
"\u00E8","è",
|
||||
"\u00E9","é",
|
||||
"\u00EA","ê",
|
||||
"\u00EB","ë",
|
||||
"\u00EC","ì",
|
||||
"\u00ED","í",
|
||||
"\u00EE","î",
|
||||
"\u00EF","ï",
|
||||
"\u00F0","ð",
|
||||
"\u00F1","ñ",
|
||||
"\u00F2","ò",
|
||||
"\u00F3","ó",
|
||||
"\u00F4","ô",
|
||||
"\u00F5","õ",
|
||||
"\u00F6","ö",
|
||||
"\u00F7","÷",
|
||||
"\u00F8","ø",
|
||||
"\u00F9","ù",
|
||||
"\u00FA","ú",
|
||||
"\u00FB","û",
|
||||
"\u00FC","ü",
|
||||
"\u00FD","ý",
|
||||
"\u00FE","þ",
|
||||
"\u00FF","ÿ"
|
||||
};
|
||||
|
||||
/** This method processes tables in the wiki code.
|
||||
* @param a string that might contain parts of a table
|
||||
|
@ -1073,12 +820,12 @@ public class wikiCode {
|
|||
public String transformLine(String result, plasmaSwitchboard switchboard) {
|
||||
//If HTML has not bee replaced yet (can happen if method gets called in recursion), replace now!
|
||||
if (!replacedHTML || preformattedSpan){
|
||||
result = replaceXMLEntities(result);
|
||||
result = htmlTools.replaceXMLEntities(result);
|
||||
replacedHTML = true;
|
||||
}
|
||||
//If special characters have not bee replaced yet, replace now!
|
||||
if (!replacedCharacters || preformattedSpan){
|
||||
result = replaceHTMLEntities(result);
|
||||
result = htmlTools.replaceHTMLEntities(result);
|
||||
replacedCharacters = true;
|
||||
}
|
||||
|
||||
|
|
|
@ -64,6 +64,7 @@ import java.util.Iterator;
|
|||
import java.util.Properties;
|
||||
import java.util.StringTokenizer;
|
||||
|
||||
import de.anomic.data.htmlTools;
|
||||
import de.anomic.data.userDB;
|
||||
import de.anomic.data.wikiCode;
|
||||
import de.anomic.kelondro.kelondroBase64Order;
|
||||
|
@ -899,11 +900,11 @@ public final class httpd implements serverHandler {
|
|||
// 06.01.2007: decode HTML entities by [FB]
|
||||
public static String decodeHtmlEntities(String s) {
|
||||
// replace all entities defined in wikiCode.characters and htmlentities
|
||||
for (int i=1; i<wikiCode.htmlentities.length; i+=2) {
|
||||
s = s.replaceAll(wikiCode.htmlentities[i], wikiCode.htmlentities[i - 1]);
|
||||
for (int i=1; i<htmlTools.htmlentities.length; i+=2) {
|
||||
s = s.replaceAll(htmlTools.htmlentities[i], htmlTools.htmlentities[i - 1]);
|
||||
}
|
||||
for (int i=1; i<wikiCode.xmlentities.length; i+=2) {
|
||||
s = s.replaceAll(wikiCode.xmlentities[i], wikiCode.xmlentities[i - 1]);
|
||||
for (int i=1; i<htmlTools.xmlentities.length; i+=2) {
|
||||
s = s.replaceAll(htmlTools.xmlentities[i], htmlTools.xmlentities[i - 1]);
|
||||
}
|
||||
|
||||
// replace all other
|
||||
|
|
|
@ -61,11 +61,13 @@ import java.io.BufferedOutputStream;
|
|||
import java.io.File;
|
||||
import java.io.FileOutputStream;
|
||||
import java.io.IOException;
|
||||
import java.io.UnsupportedEncodingException;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Enumeration;
|
||||
import java.util.Hashtable;
|
||||
import java.util.Map;
|
||||
|
||||
import de.anomic.data.htmlTools;
|
||||
import de.anomic.data.wikiCode;
|
||||
import de.anomic.plasma.plasmaSwitchboard;
|
||||
|
||||
|
@ -89,7 +91,7 @@ public class serverObjects extends Hashtable implements Cloneable {
|
|||
* like put, but it replaces any HTML special chars.
|
||||
*/
|
||||
public Object putSafeXML(Object key, String value){
|
||||
return put(key, wikiCode.replaceXMLEntities(value));
|
||||
return put(key, htmlTools.replaceXMLEntities(value));
|
||||
}
|
||||
|
||||
// new put takes also null values
|
||||
|
@ -126,8 +128,12 @@ public class serverObjects extends Hashtable implements Cloneable {
|
|||
//TODO: Cache the wikiCode Object?
|
||||
return this.putASIS(key, (new wikiCode(plasmaSwitchboard.getSwitchboard())).transform(wikiCode));
|
||||
}
|
||||
public String putWiki(Object key, byte[] wikiCode){
|
||||
return this.putASIS(key, (new wikiCode(plasmaSwitchboard.getSwitchboard())).transform(wikiCode));
|
||||
public String putWiki(Object key, byte[] wikiCode) {
|
||||
try {
|
||||
return this.putASIS(key, (new wikiCode(plasmaSwitchboard.getSwitchboard())).transform(wikiCode));
|
||||
} catch (UnsupportedEncodingException e) {
|
||||
return "Internal error: no UTF-8 supported";
|
||||
}
|
||||
}
|
||||
|
||||
// long variant
|
||||
|
|
|
@ -48,6 +48,7 @@ package de.anomic.soap.services;
|
|||
import org.apache.axis.AxisFault;
|
||||
import org.w3c.dom.Document;
|
||||
|
||||
import de.anomic.data.htmlTools;
|
||||
import de.anomic.data.wikiCode;
|
||||
import de.anomic.plasma.plasmaURL;
|
||||
import de.anomic.net.URL;
|
||||
|
@ -161,9 +162,9 @@ public class SearchService extends AbstractService
|
|||
// Postprocess search ...
|
||||
int count = Integer.valueOf(searchResult.get("type_results","0")).intValue();
|
||||
for (int i=0; i < count; i++) {
|
||||
searchResult.put("type_results_" + i + "_url",wikiCode.replaceXMLEntities(searchResult.get("type_results_" + i + "_url","")));
|
||||
searchResult.put("type_results_" + i + "_description",wikiCode.replaceXMLEntities(searchResult.get("type_results_" + i + "_description","")));
|
||||
searchResult.put("type_results_" + i + "_urlname",wikiCode.replaceXMLEntities(searchResult.get("type_results_" + i + "_urlname","")));
|
||||
searchResult.put("type_results_" + i + "_url",htmlTools.replaceXMLEntities(searchResult.get("type_results_" + i + "_url","")));
|
||||
searchResult.put("type_results_" + i + "_description",htmlTools.replaceXMLEntities(searchResult.get("type_results_" + i + "_description","")));
|
||||
searchResult.put("type_results_" + i + "_urlname",htmlTools.replaceXMLEntities(searchResult.get("type_results_" + i + "_urlname","")));
|
||||
}
|
||||
|
||||
// format the result
|
||||
|
|
Loading…
Reference in New Issue
Block a user