From 7478338a404028fc36f82a6113cf284f34d891d6 Mon Sep 17 00:00:00 2001 From: reger Date: Fri, 5 Jun 2015 00:51:00 +0200 Subject: [PATCH] remove augmented parsing activation from frontend experimental implementation not used and based on error prone experimental rdfaparser --- htroot/AugmentedParsing_p.html | 36 ------------------- htroot/AugmentedParsing_p.java | 30 ---------------- htroot/env/templates/submenuSemantic.template | 1 - source/net/yacy/document/TextParser.java | 4 +-- 4 files changed, 1 insertion(+), 70 deletions(-) delete mode 100644 htroot/AugmentedParsing_p.html delete mode 100644 htroot/AugmentedParsing_p.java diff --git a/htroot/AugmentedParsing_p.html b/htroot/AugmentedParsing_p.html deleted file mode 100644 index 28cb5103d..000000000 --- a/htroot/AugmentedParsing_p.html +++ /dev/null @@ -1,36 +0,0 @@ - - - - YaCy '#[clientname]#': Augmented Parsing - #%env/templates/metas.template%# - - - #%env/templates/header.template%# - #%env/templates/submenuSemantic.template%# -

Augmented Parsing

- -
-
Global Status -

- With this settings you can activate or deactivate augmented parsing which combines the documents with information from external sources (tags etc.). -

- -
- -
-
- Enabled
-

- Globally enables or disables the augmented parser. This setting requires a restart. -

-
-
- - -
-
- - - #%env/templates/footer.template%# - - diff --git a/htroot/AugmentedParsing_p.java b/htroot/AugmentedParsing_p.java deleted file mode 100644 index 481aead4e..000000000 --- a/htroot/AugmentedParsing_p.java +++ /dev/null @@ -1,30 +0,0 @@ -import net.yacy.cora.protocol.RequestHeader; -import net.yacy.server.serverObjects; -import net.yacy.server.serverSwitch; - -public final class AugmentedParsing_p { - - public static serverObjects respond(@SuppressWarnings("unused") final RequestHeader header, final serverObjects post, final serverSwitch env) { - // return variable that accumulates replacements - final serverObjects prop = new serverObjects(); - - if (post != null) { - - if (post.containsKey("augmentedparserSettings")) { - - - env.setConfig("parserAugmentation", - "on".equals(post.get("augmentedparserenabled")) ? true : false); - - } - - } - - prop.put("augmentedparserenabled_checked", - env.getConfigBool("parserAugmentation", false) ? "1" : "0"); - - // return rewrite properties - return prop; - } - -} diff --git a/htroot/env/templates/submenuSemantic.template b/htroot/env/templates/submenuSemantic.template index 97abe40ae..e4efc52bb 100644 --- a/htroot/env/templates/submenuSemantic.template +++ b/htroot/env/templates/submenuSemantic.template @@ -14,7 +14,6 @@

Augmented Content

\ No newline at end of file diff --git a/source/net/yacy/document/TextParser.java b/source/net/yacy/document/TextParser.java index 468d96b39..f077feb7c 100644 --- a/source/net/yacy/document/TextParser.java +++ b/source/net/yacy/document/TextParser.java @@ -64,12 +64,10 @@ import net.yacy.document.parser.vcfParser; import net.yacy.document.parser.vsdParser; import net.yacy.document.parser.xlsParser; import net.yacy.document.parser.zipParser; -import net.yacy.document.parser.augment.AugmentParser; import net.yacy.document.parser.images.genericImageParser; import net.yacy.document.parser.images.metadataImageParser; import net.yacy.kelondro.util.FileUtils; import net.yacy.kelondro.util.MemoryControl; -import net.yacy.search.Switchboard; public final class TextParser { @@ -90,7 +88,7 @@ public final class TextParser { initParser(new docParser()); initParser(new gzipParser()); // AugmentParser calls internally RDFaParser (therefore add before RDFa) - if (Switchboard.getSwitchboard().getConfigBool("parserAugmentation", true)) initParser(new AugmentParser()); + // if (Switchboard.getSwitchboard().getConfigBool("parserAugmentation", true)) initParser(new AugmentParser()); // experimental implementation, not working yet (2015-06-05) // RDFaParser calls internally htmlParser (therefore add before html) // if (Switchboard.getSwitchboard().getConfigBool("parserAugmentation.RDFa", true)) initParser(new RDFaParser()); // experimental implementation, not working yet (2015-06-04) initParser(new htmlParser()); // called within rdfa parser