fixed many links to old forum, now https://searchlab.eu

pull/303/head
Michael Christen 5 years ago
parent 7f7ed6278e
commit 3a46b07603

@ -50,11 +50,11 @@ The source code is inside the release package (see /source and /htroot).
## Where is the documentation? ## Where is the documentation?
Documentation can be found at: Documentation can be found at:
- (Home Page) https://yacy.net/ - (Home Page) https://yacy.net/
- (German Forum) http://forum.yacy.de/ - (International Forum) https://searchlab.eu
- (Wiki:de) http://www.yacy-websuche.de/wiki/index.php/De:Start - (Wiki:de) http://www.yacy-websuche.de/wiki/index.php/De:Start
- (Wiki:en) http://www.yacy-websearch.net/wiki/index.php/En:Start - (Wiki:en) http://www.yacy-websearch.net/wiki/index.php/En:Start
- (Tutorial Videos) https://yacy.net/en/Tutorials.html and https://yacy.net/de/Lehrfilme.html - (Tutorial Videos) https://yacy.net/en/Tutorials.html and https://yacy.net/de/Lehrfilme.html
Every of these locations has a (YaCy) search functionality which combines Every of these locations has a (YaCy) search functionality which combines
all these locations into one search result. all these locations into one search result.

@ -178,7 +178,7 @@
#(hintSupport)#:: #(hintSupport)#::
<dt class="hintIcon"><img src="env/grafics/idea.png" width="32" height="32" alt="idea"/></dt> <dt class="hintIcon"><img src="env/grafics/idea.png" width="32" height="32" alt="idea"/></dt>
<dd class="hint">If you need professional support, please write to <tt>support@yacy.net</tt><br>For community support, please visit our <a href="http://forum.yacy.de" target="_blank">forum</a>. <dd class="hint">If you need professional support, please write to <tt>support@yacy.net</tt><br>For community support, please visit our <a href="https://searchlab.eu" target="_blank">forum</a>.
</dd> </dd>
#(/hintSupport)# #(/hintSupport)#

@ -192,7 +192,7 @@ XDtoU7vQ/wIAAP//AwBb7ktEXQ4nqQAAAABJRU5ErkJggg==" width="128" height="64" alt="K
<p>Please send us feed-back about your experience with an<br/> <p>Please send us feed-back about your experience with an<br/>
<a href="http://sayat.me/YaCy" target="_blank">anonymous message</a><br/> <a href="http://sayat.me/YaCy" target="_blank">anonymous message</a><br/>
or a<br/> or a<br/>
posting to our <a href="http://forum.yacy.de" target="_blank">web forums</a><br/> posting to our <a href="https://searchlab.eu" target="_blank">web forums</a><br/>
or a<br/> or a<br/>
<a href="http://bugs.yacy.net" target="_blank">bug report</a>!</p> <a href="http://bugs.yacy.net" target="_blank">bug report</a>!</p>
<h2>Professional Support</h2> <h2>Professional Support</h2>

@ -111,7 +111,7 @@
<li id="header_jslicense"><a href="jslicense.html" data-jslicense="1">JavaScript information</a></li> <li id="header_jslicense"><a href="jslicense.html" data-jslicense="1">JavaScript information</a></li>
<li class="divider" role="separator"></li> <li class="divider" role="separator"></li>
<li id="header_download"><a href="https://yacy.net" target="_blank"><i>external</i>&nbsp;&nbsp;&nbsp;Download YaCy</a></li> <li id="header_download"><a href="https://yacy.net" target="_blank"><i>external</i>&nbsp;&nbsp;&nbsp;Download YaCy</a></li>
<li id="header_community"><a href="http://forum.yacy.de" target="_blank"><i>external</i>&nbsp;&nbsp;&nbsp;Community (Web Forums)</a></li> <li id="header_community"><a href="https://searchlab.eu" target="_blank"><i>external</i>&nbsp;&nbsp;&nbsp;Community (Web Forums)</a></li>
<li id="header_wiki"><a href="http://wiki.yacy.de" target="_blank"><i>external</i>&nbsp;&nbsp;&nbsp;Project Wiki</a></li> <li id="header_wiki"><a href="http://wiki.yacy.de" target="_blank"><i>external</i>&nbsp;&nbsp;&nbsp;Project Wiki</a></li>
<li id="header_git"><a href="https://github.com/yacy/yacy_search_server/commits/master" target="_blank"><i>external</i>&nbsp;&nbsp;&nbsp;Git Repository</a></li> <li id="header_git"><a href="https://github.com/yacy/yacy_search_server/commits/master" target="_blank"><i>external</i>&nbsp;&nbsp;&nbsp;Git Repository</a></li>
<li id="header_bugs"><a href="http://bugs.yacy.net" target="_blank"><i>external</i>&nbsp;&nbsp;&nbsp;Bugtracker</a></li> <li id="header_bugs"><a href="http://bugs.yacy.net" target="_blank"><i>external</i>&nbsp;&nbsp;&nbsp;Bugtracker</a></li>

@ -62,7 +62,7 @@
<li id="header_jslicense"><a href="jslicense.html" data-jslicense="1">JavaScript information</a></li> <li id="header_jslicense"><a href="jslicense.html" data-jslicense="1">JavaScript information</a></li>
<li class="divider" role="separator"></li> <li class="divider" role="separator"></li>
<li id="header_download"><a href="https://yacy.net" target="_blank"><i>external</i>&nbsp;&nbsp;&nbsp;Download YaCy</a></li> <li id="header_download"><a href="https://yacy.net" target="_blank"><i>external</i>&nbsp;&nbsp;&nbsp;Download YaCy</a></li>
<li id="header_community"><a href="http://forum.yacy.de" target="_blank"><i>external</i>&nbsp;&nbsp;&nbsp;Community (Web Forums)</a></li> <li id="header_community"><a href="https://searchlab.eu" target="_blank"><i>external</i>&nbsp;&nbsp;&nbsp;Community (Web Forums)</a></li>
<li id="header_wiki"><a href="http://wiki.yacy.de" target="_blank"><i>external</i>&nbsp;&nbsp;&nbsp;Project Wiki</a></li> <li id="header_wiki"><a href="http://wiki.yacy.de" target="_blank"><i>external</i>&nbsp;&nbsp;&nbsp;Project Wiki</a></li>
<li id="header_git"><a href="https://github.com/yacy/yacy_search_server/commits/master" target="_blank"><i>external</i>&nbsp;&nbsp;&nbsp;Git Repository</a></li> <li id="header_git"><a href="https://github.com/yacy/yacy_search_server/commits/master" target="_blank"><i>external</i>&nbsp;&nbsp;&nbsp;Git Repository</a></li>
<li id="header_bugs"><a href="http://bugs.yacy.net" target="_blank"><i>external</i>&nbsp;&nbsp;&nbsp;Bugtracker</a></li> <li id="header_bugs"><a href="http://bugs.yacy.net" target="_blank"><i>external</i>&nbsp;&nbsp;&nbsp;Bugtracker</a></li>

@ -42,7 +42,7 @@
<li id="header_jslicense"><a href="jslicense.html" data-jslicense="1">JavaScript information</a></li> <li id="header_jslicense"><a href="jslicense.html" data-jslicense="1">JavaScript information</a></li>
<li class="divider" role="separator"></li> <li class="divider" role="separator"></li>
<li id="header_download"><a href="https://yacy.net" target="_blank"><i>external</i>&nbsp;&nbsp;&nbsp;Download YaCy</a></li> <li id="header_download"><a href="https://yacy.net" target="_blank"><i>external</i>&nbsp;&nbsp;&nbsp;Download YaCy</a></li>
<li id="header_community"><a href="http://forum.yacy.de" target="_blank"><i>external</i>&nbsp;&nbsp;&nbsp;Community (Web Forums)</a></li> <li id="header_community"><a href="https://searchlab.eu" target="_blank"><i>external</i>&nbsp;&nbsp;&nbsp;Community (Web Forums)</a></li>
<li id="header_wiki"><a href="http://wiki.yacy.de" target="_blank"><i>external</i>&nbsp;&nbsp;&nbsp;Project Wiki</a></li> <li id="header_wiki"><a href="http://wiki.yacy.de" target="_blank"><i>external</i>&nbsp;&nbsp;&nbsp;Project Wiki</a></li>
<li id="header_git"><a href="https://github.com/yacy/yacy_search_server/commits/master" target="_blank"><i>external</i>&nbsp;&nbsp;&nbsp;Git Repository</a></li> <li id="header_git"><a href="https://github.com/yacy/yacy_search_server/commits/master" target="_blank"><i>external</i>&nbsp;&nbsp;&nbsp;Git Repository</a></li>
<li id="header_bugs"><a href="http://bugs.yacy.net" target="_blank"><i>external</i>&nbsp;&nbsp;&nbsp;Bugtracker</a></li> <li id="header_bugs"><a href="http://bugs.yacy.net" target="_blank"><i>external</i>&nbsp;&nbsp;&nbsp;Bugtracker</a></li>

@ -135,7 +135,7 @@ $(function() {
</a> </a>
</td> </td>
<td> <td>
<a href="http://forum.yacy-websuche.de/" target="_blanc"> <a href="https://searchlab.eu" target="_blanc">
<img alt="YaCy Forum" title="YaCy Forum" src="img-1/Discussion.png" border="0"/> <img alt="YaCy Forum" title="YaCy Forum" src="img-1/Discussion.png" border="0"/>
<br /> <br />
Forum Forum

@ -38,7 +38,7 @@ apfelmaennchen
</ul> </ul>
<h3>Bug Tracker</h3> <h3>Bug Tracker</h3>
<ul> <ul>
<li>Please report bugs in the official <a href="http://forum.yacy-websuche.de/" target="_blank">YaCy-Forum</a> - thanks!</li> <li>Please report bugs in the official <a href="https://searchlab.eu" target="_blank">YaCy-Forum</a> - thanks!</li>
<li>29-09-2008: There seems to be timing problems with the RSS search result. In some cases no result is shown at all, even after a page reload!</li> <li>29-09-2008: There seems to be timing problems with the RSS search result. In some cases no result is shown at all, even after a page reload!</li>
<li>19-04-2008: currently only contentdom="text" is working, all others will fail...</li> <li>19-04-2008: currently only contentdom="text" is working, all others will fail...</li>
</ul> </ul>

@ -1815,7 +1815,7 @@ deselect the partial import flag==Den teilweisen Import Flag abschalten
When an export is started, surrogate files are generated into DATA/SURROGATE/in which are automatically fetched by an indexer thread.==Wenn ein Export gestartet wird werden Hilfsdateien in DATA/SURROGATE/in erzeugt, die automatisch von einem Indexer Thread geholt und verarbeitet werden. When an export is started, surrogate files are generated into DATA/SURROGATE/in which are automatically fetched by an indexer thread.==Wenn ein Export gestartet wird werden Hilfsdateien in DATA/SURROGATE/in erzeugt, die automatisch von einem Indexer Thread geholt und verarbeitet werden.
All indexed surrogate files are then moved to DATA/SURROGATE/out and can be re-cycled when an index is deleted.==Alle indexierten Hilfsdateien werden dann nach DATA/SURROGATE/out verschoben und können recycelt werden wenn ein Index gelöscht wird. All indexed surrogate files are then moved to DATA/SURROGATE/out and can be re-cycled when an index is deleted.==Alle indexierten Hilfsdateien werden dann nach DATA/SURROGATE/out verschoben und können recycelt werden wenn ein Index gelöscht wird.
The URL stub==Der Teil der URL The URL stub==Der Teil der URL
like http://forum.yacy-websuche.de==wie z.B. http://forum.yacy-websuche.de like https://searchlab.eu==wie z.B. https://searchlab.eu
this must be the path right in front of '/viewtopic.php?'==dies muss den kompletten Pfad vor '/viewtopic.php?' enthalten this must be the path right in front of '/viewtopic.php?'==dies muss den kompletten Pfad vor '/viewtopic.php?' enthalten
Type==Typ Type==Typ
> of database<==> der Datenbank< > of database<==> der Datenbank<

@ -2161,7 +2161,7 @@ where it can be retrieved using the URL==d'o&ugrave; elle peut &ecirc;tre r&eacu
Your Web Page Indexer is idle. You can start your own web crawl <a href="CrawlStartSite.html">here</a>==Votre indexeur de pages web est inactif. Vous pouvez d&eacute;marrer votre propre balayage du web <a href="CrawlStartSite.html">ici</a> Your Web Page Indexer is idle. You can start your own web crawl <a href="CrawlStartSite.html">here</a>==Votre indexeur de pages web est inactif. Vous pouvez d&eacute;marrer votre propre balayage du web <a href="CrawlStartSite.html">ici</a>
Your Web Page Indexer is busy. You can <a href="Crawler_p.html">monitor your web crawl</a> here.==Votre indexeur de pages web est actif. Vous pouvez surveiller votre balayage du web <a href="Crawler_p.html">ici</a>. Your Web Page Indexer is busy. You can <a href="Crawler_p.html">monitor your web crawl</a> here.==Votre indexeur de pages web est actif. Vous pouvez surveiller votre balayage du web <a href="Crawler_p.html">ici</a>.
If you need professional support, please write to==Si vous avez besoin d'une assistance professionnelle, vous pouvez &eacute;crire &agrave; If you need professional support, please write to==Si vous avez besoin d'une assistance professionnelle, vous pouvez &eacute;crire &agrave;
For community support, please visit our <a href="http://forum.yacy.de" target="_blank">forum</a>==Si vous cherchez l'aide de la communaut&eacute;, vous pouvez visiter notre <a href="http://forum.yacy.de" target="_blank">forum</a> For community support, please visit our <a href="https://searchlab.eu" target="_blank">forum</a>==Si vous cherchez l'aide de la communaut&eacute;, vous pouvez visiter notre <a href="https://searchlab.eu" target="_blank">forum</a>
"Follow YaCy on Twitter"=="Suivez YaCy sur Twitter" "Follow YaCy on Twitter"=="Suivez YaCy sur Twitter"
@ -2306,7 +2306,7 @@ Therefore we like to ask you: do you like YaCy? Will you use it again... if not,
Please send us feed-back about your experience with an==Vous pouvez nous faire parvenir vos commentaires avec un Please send us feed-back about your experience with an==Vous pouvez nous faire parvenir vos commentaires avec un
anonymous message==message anonyme anonymous message==message anonyme
or a<br/>==ou un<br/> or a<br/>==ou un<br/>
posting to our <a href="http://forum.yacy.de" target="_blank">web forums</a><br/>==message sur nos <a href="http://forum.yacy.de" target="_blank">forums</a><br/> posting to our <a href="https://searchlab.eu" target="_blank">web forums</a><br/>==message sur nos <a href="https://searchlab.eu" target="_blank">forums</a><br/>
bug report==rapport de bogue bug report==rapport de bogue
<h2>Professional Support</h2>==<h2>Support professionnel</h2> <h2>Professional Support</h2>==<h2>Support professionnel</h2>
If you are a professional user and you would like to use YaCy in your company in combination with consulting services by YaCy specialists, please see==Si vous souhaitez utiliser YaCy dans votre entreprise en association avec un service de consultations d'expertise par des sp&eacute;cialistes de YaCy, veuillez consulter If you are a professional user and you would like to use YaCy in your company in combination with consulting services by YaCy specialists, please see==Si vous souhaitez utiliser YaCy dans votre entreprise en association avec un service de consultations d'expertise par des sp&eacute;cialistes de YaCy, veuillez consulter

@ -2527,7 +2527,7 @@
<source>The URL stub</source> <source>The URL stub</source>
</trans-unit> </trans-unit>
<trans-unit id="8bafb5ec" xml:space="preserve" approved="no" translate="yes"> <trans-unit id="8bafb5ec" xml:space="preserve" approved="no" translate="yes">
<source>like http://forum.yacy-websuche.de</source> <source>like https://searchlab.eu</source>
</trans-unit> </trans-unit>
<trans-unit id="6d4ca1b5" xml:space="preserve" approved="no" translate="yes"> <trans-unit id="6d4ca1b5" xml:space="preserve" approved="no" translate="yes">
<source>this must be the path right in front of '/viewtopic.php?'</source> <source>this must be the path right in front of '/viewtopic.php?'</source>

@ -1942,7 +1942,7 @@ deselect the partial import flag==снимите флаг частичного
When an export is started, surrogate files are generated into DATA/SURROGATE/in which are automatically fetched by an indexer thread.==После начала экспорта, замещающие файлы создаются в DATA/SURROGATE/in и автоматически добавляются в индексатор. When an export is started, surrogate files are generated into DATA/SURROGATE/in which are automatically fetched by an indexer thread.==После начала экспорта, замещающие файлы создаются в DATA/SURROGATE/in и автоматически добавляются в индексатор.
All indexed surrogate files are then moved to DATA/SURROGATE/out and can be re-cycled when an index is deleted.==Все проиндексированные замещающие файлы перемещаются в DATA/SURROGATE/out и могут быть использованы повторно в случае удаления индекса. All indexed surrogate files are then moved to DATA/SURROGATE/out and can be re-cycled when an index is deleted.==Все проиндексированные замещающие файлы перемещаются в DATA/SURROGATE/out и могут быть использованы повторно в случае удаления индекса.
The URL stub==Часть ссылки The URL stub==Часть ссылки
like http://forum.yacy-websuche.de==например, http://forum.yacy-websuche.de like https://searchlab.eu==например, https://searchlab.eu
this must be the path right in front of '/viewtopic.php?'==(путь до '/viewtopic.php?') this must be the path right in front of '/viewtopic.php?'==(путь до '/viewtopic.php?')
Type==Тип Type==Тип
> of database<==> базы данных< > of database<==> базы данных<

@ -1558,7 +1558,7 @@ in phpmyadmin/config.inc.php and place your dump file in /tmp (Otherwise it is n
deselect the partial import flag==Зніміть прапорець часткового імпорту deselect the partial import flag==Зніміть прапорець часткового імпорту
When an export is started, surrogate files are generated into DATA/SURROGATE/in which are automatically fetched by an indexer thread.==При запуску експорту в DATA/SURROGATE/in створюються допоміжні файли, які автоматично вилучаються та опрацьовуються потоком індексувача. When an export is started, surrogate files are generated into DATA/SURROGATE/in which are automatically fetched by an indexer thread.==При запуску експорту в DATA/SURROGATE/in створюються допоміжні файли, які автоматично вилучаються та опрацьовуються потоком індексувача.
All indexed surrogate files are then moved to DATA/SURROGATE/out and can be re-cycled when an index is deleted.==Всі проіндексовані допоміжні файли потім переміщуються в DATA/SURROGATE/out, і можуть бути знову оброблені, якщо індекс буде видалено. All indexed surrogate files are then moved to DATA/SURROGATE/out and can be re-cycled when an index is deleted.==Всі проіндексовані допоміжні файли потім переміщуються в DATA/SURROGATE/out, і можуть бути знову оброблені, якщо індекс буде видалено.
<b>The URL stub</b>,<br />like http://forum.yacy-websuche.de==<b>Частина URL, як наприклад,</b><br />http://forum.yacy-websuche.de <b>The URL stub</b>,<br />like https://searchlab.eu==<b>Частина URL, як наприклад,</b><br />https://searchlab.eu
this must be the path right in front of '/viewtopic.php?'==повний шлях перед "/viewtopic.php?" this must be the path right in front of '/viewtopic.php?'==повний шлях перед "/viewtopic.php?"
Type==Тип Type==Тип
Host</b> of the database<==Ім’я хосту</b> БД< Host</b> of the database<==Ім’я хосту</b> БД<

@ -1042,7 +1042,7 @@ deselect the partial import flag==取消部分导入
When an export is started, surrogate files are generated into DATA/SURROGATE/in which are automatically fetched by an indexer thread.==导出过程开始时, 在 DATA/SURROGATE/in 目录下自动生成备份文件, 并且会被索引器自动爬取. When an export is started, surrogate files are generated into DATA/SURROGATE/in which are automatically fetched by an indexer thread.==导出过程开始时, 在 DATA/SURROGATE/in 目录下自动生成备份文件, 并且会被索引器自动爬取.
All indexed surrogate files are then moved to DATA/SURROGATE/out and can be re-cycled when an index is deleted.==所有被索引的备份文件都在 DATA/SURROGATE/out 目录下, 并被索引器循环利用. All indexed surrogate files are then moved to DATA/SURROGATE/out and can be re-cycled when an index is deleted.==所有被索引的备份文件都在 DATA/SURROGATE/out 目录下, 并被索引器循环利用.
The URL stub==URL根域名 The URL stub==URL根域名
like http://forum.yacy-websuche.de==比如链接 http://forum.yacy-websuche.de like https://searchlab.eu==比如链接 https://searchlab.eu
this must be the path right in front of '/viewtopic.php?'==必须在'/viewtopic.php?'前面 this must be the path right in front of '/viewtopic.php?'==必须在'/viewtopic.php?'前面
Type==数据库 Type==数据库
> of database<==> 类型< > of database<==> 类型<

@ -246,7 +246,7 @@ else
echo "**** USE AT YOUR OWN RISK! Project home and releases: http://yacy.net/ ****" echo "**** USE AT YOUR OWN RISK! Project home and releases: http://yacy.net/ ****"
echo "** LOG of YaCy: DATA/LOG/yacy00.log (and yacy<xx>.log) **" echo "** LOG of YaCy: DATA/LOG/yacy00.log (and yacy<xx>.log) **"
echo "** STOP YaCy: execute stopYACY.sh and wait some seconds **" echo "** STOP YaCy: execute stopYACY.sh and wait some seconds **"
echo "** GET HELP for YaCy: see http://wiki.yacy.net and http://forum.yacy.de **" echo "** GET HELP for YaCy: join our community at https://searchlab.eu **"
echo "*******************************************************************************" echo "*******************************************************************************"
if [ $DEBUG -eq 1 ] #debug if [ $DEBUG -eq 1 ] #debug
then then

@ -29,7 +29,7 @@ Echo **** (C) by Michael Peter Christen, usage granted under the GPL Version 2
Echo **** USE AT YOUR OWN RISK! Project home and releases: http://yacy.net/ **** Echo **** USE AT YOUR OWN RISK! Project home and releases: http://yacy.net/ ****
Echo ** LOG of YaCy: DATA/LOG/yacy00.log (and yacy^<xx^>.log) ** Echo ** LOG of YaCy: DATA/LOG/yacy00.log (and yacy^<xx^>.log) **
Echo ** STOP YaCy: execute stopYACY.bat and wait some seconds ** Echo ** STOP YaCy: execute stopYACY.bat and wait some seconds **
Echo ** GET HELP for YaCy: see www.yacy-websearch.net/wiki and forum.yacy.de ** Echo ** GET HELP for YaCy: join our community at https://searchlab.eu **
Echo ******************************************************************************* Echo *******************************************************************************
Echo ^>^> YaCy started as daemon process. Administration at http://localhost:%port% ^<^< Echo ^>^> YaCy started as daemon process. Administration at http://localhost:%port% ^<^<

@ -279,7 +279,7 @@ public class GenericXMLParserTest {
+ "<html xmlns=\"http://www.w3.org/1999/xhtml\">" + "<head>" + "<html xmlns=\"http://www.w3.org/1999/xhtml\">" + "<head>"
+ "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />" + "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />"
+ "<title>XHTML attributes URLs test</title>" + "</head>" + "<body>" + "<title>XHTML attributes URLs test</title>" + "</head>" + "<body>"
+ "Here are YaCy<a href=\"http://yacy.net\">home page</a> and <a href=\"http://forum.yacy.de\">International Forum</a>." + "Here are YaCy<a href=\"http://yacy.net\">home page</a> and <a href=\"https://searchlab.eu\">International Forum</a>."
+ "And this is a relative link to a <a href=\"/document.html\">sub document</a>." + "</body>" + "And this is a relative link to a <a href=\"/document.html\">sub document</a>." + "</body>"
+ "</html>"; + "</html>";
@ -296,7 +296,7 @@ public class GenericXMLParserTest {
assertEquals(3, detectedAnchors.size()); assertEquals(3, detectedAnchors.size());
assertTrue(detectedAnchors.contains(new AnchorURL("http://www.w3.org/1999/xhtml"))); assertTrue(detectedAnchors.contains(new AnchorURL("http://www.w3.org/1999/xhtml")));
assertTrue(detectedAnchors.contains(new AnchorURL("http://yacy.net"))); assertTrue(detectedAnchors.contains(new AnchorURL("http://yacy.net")));
assertTrue(detectedAnchors.contains(new AnchorURL("http://forum.yacy.de"))); assertTrue(detectedAnchors.contains(new AnchorURL("https://searchlab.eu")));
} finally { } finally {
inStream.close(); inStream.close();
} }
@ -316,7 +316,7 @@ public class GenericXMLParserTest {
+ "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />" + "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />"
+ "<title>XHTML content URLs test</title>" + "</head>" + "<body>" + "Here are some YaCy links:" + "<dl>" + "<title>XHTML content URLs test</title>" + "</head>" + "<body>" + "Here are some YaCy links:" + "<dl>"
+ "<dt>Home page</dt>" + "<dd>http://yacy.net</dd>" + "<dt>International Forum</dt>" + "<dt>Home page</dt>" + "<dd>http://yacy.net</dd>" + "<dt>International Forum</dt>"
+ "<dd>http://forum.yacy.de</dd>" + "</dl>" + "<dd>https://searchlab.eu</dd>" + "</dl>"
+ "And this is a mention to a relative link : /document.html " + "</body>" + "</html>"; + "And this is a mention to a relative link : /document.html " + "</body>" + "</html>";
InputStream inStream = new ByteArrayInputStream(xhtml.getBytes(StandardCharsets.UTF_8.name())); InputStream inStream = new ByteArrayInputStream(xhtml.getBytes(StandardCharsets.UTF_8.name()));
@ -332,7 +332,7 @@ public class GenericXMLParserTest {
assertEquals(3, detectedAnchors.size()); assertEquals(3, detectedAnchors.size());
assertTrue(detectedAnchors.contains(new AnchorURL("http://www.w3.org/1999/xhtml"))); assertTrue(detectedAnchors.contains(new AnchorURL("http://www.w3.org/1999/xhtml")));
assertTrue(detectedAnchors.contains(new AnchorURL("http://yacy.net"))); assertTrue(detectedAnchors.contains(new AnchorURL("http://yacy.net")));
assertTrue(detectedAnchors.contains(new AnchorURL("http://forum.yacy.de"))); assertTrue(detectedAnchors.contains(new AnchorURL("https://searchlab.eu")));
} finally { } finally {
inStream.close(); inStream.close();
} }
@ -374,7 +374,7 @@ public class GenericXMLParserTest {
+ "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />" + "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />"
+ "<title>XHTML content URLs test</title>" + "</head>" + "<body>" + "<p>Here are some YaCy URLs: " + "<title>XHTML content URLs test</title>" + "</head>" + "<body>" + "<p>Here are some YaCy URLs: "
+ "Home page : http://yacy.net - International Forum : " + "Home page : http://yacy.net - International Forum : "
+ "http://forum.yacy.de " + "https://searchlab.eu "
+ "and this is a mention to a relative URL : /document.html</p>" + "and this is a mention to a relative URL : /document.html</p>"
+ "<p>Here are YaCy<a href=\"http://mantis.tokeek.de\">bug tracker</a> and <a href=\"http://www.yacy-websearch.net/wiki/\">Wiki</a>." + "<p>Here are YaCy<a href=\"http://mantis.tokeek.de\">bug tracker</a> and <a href=\"http://www.yacy-websearch.net/wiki/\">Wiki</a>."
+ "And this is a relative link to another <a href=\"/document2.html\">sub document</a></p>" + "And this is a relative link to another <a href=\"/document2.html\">sub document</a></p>"
@ -397,7 +397,7 @@ public class GenericXMLParserTest {
assertEquals(5, detectedAnchors.size()); assertEquals(5, detectedAnchors.size());
assertTrue(detectedAnchors.contains(new AnchorURL("http://www.w3.org/1999/xhtml"))); assertTrue(detectedAnchors.contains(new AnchorURL("http://www.w3.org/1999/xhtml")));
assertTrue(detectedAnchors.contains(new AnchorURL("http://yacy.net"))); assertTrue(detectedAnchors.contains(new AnchorURL("http://yacy.net")));
assertTrue(detectedAnchors.contains(new AnchorURL("http://forum.yacy.de"))); assertTrue(detectedAnchors.contains(new AnchorURL("https://searchlab.eu")));
assertTrue(detectedAnchors.contains(new AnchorURL("http://mantis.tokeek.de"))); assertTrue(detectedAnchors.contains(new AnchorURL("http://mantis.tokeek.de")));
assertTrue(detectedAnchors.contains(new AnchorURL("http://www.yacy-websearch.net/wiki/"))); assertTrue(detectedAnchors.contains(new AnchorURL("http://www.yacy-websearch.net/wiki/")));
} finally { } finally {
@ -434,7 +434,7 @@ public class GenericXMLParserTest {
.append("</head>") .append("</head>")
.append("<body><p>Here are some YaCy URLs: ") .append("<body><p>Here are some YaCy URLs: ")
.append("Home page : http://yacy.net - International Forum : ") .append("Home page : http://yacy.net - International Forum : ")
.append("http://forum.yacy.de ") .append("https://searchlab.eu ")
.append("and this is a mention to a relative URL : /document.html</p>"); .append("and this is a mention to a relative URL : /document.html</p>");
/* Add some filler text to reach a total size beyond SAX parser internal input stream buffers */ /* Add some filler text to reach a total size beyond SAX parser internal input stream buffers */
@ -460,7 +460,7 @@ public class GenericXMLParserTest {
assertEquals(3, detectedAnchors.size()); assertEquals(3, detectedAnchors.size());
assertTrue(detectedAnchors.contains(new AnchorURL("http://www.w3.org/1999/xhtml"))); assertTrue(detectedAnchors.contains(new AnchorURL("http://www.w3.org/1999/xhtml")));
assertTrue(detectedAnchors.contains(new AnchorURL("http://yacy.net"))); assertTrue(detectedAnchors.contains(new AnchorURL("http://yacy.net")));
assertTrue(detectedAnchors.contains(new AnchorURL("http://forum.yacy.de"))); assertTrue(detectedAnchors.contains(new AnchorURL("https://searchlab.eu")));
} finally { } finally {
inStream.close(); inStream.close();
} }

@ -173,7 +173,7 @@ public class ContentScraperTest {
*/ */
@Test @Test
public void testFindAbsoluteURLs() throws MalformedURLException { public void testFindAbsoluteURLs() throws MalformedURLException {
final String[] urlStrings = { "http://yacy.net", "http://forum.yacy.de", "https://en.wikipedia.org" }; final String[] urlStrings = { "http://yacy.net", "https://searchlab.eu", "https://en.wikipedia.org" };
final List<AnchorURL> urls = new ArrayList<>(); final List<AnchorURL> urls = new ArrayList<>();
for (String urlString : urlStrings) { for (String urlString : urlStrings) {
urls.add(new AnchorURL(urlString)); urls.add(new AnchorURL(urlString));
@ -277,7 +277,7 @@ public class ContentScraperTest {
*/ */
@Test @Test
public void testFindAbsoluteURLsMaxURLs() throws MalformedURLException { public void testFindAbsoluteURLsMaxURLs() throws MalformedURLException {
final String text = "Some test URLS : http://yacy.net - http://forum.yacy.de - https://en.wikipedia.org"; final String text = "Some test URLS : http://yacy.net - https://searchlab.eu - https://en.wikipedia.org";
/* No limit */ /* No limit */
ArrayList<AnchorURL> detectedURLs = new ArrayList<>(); ArrayList<AnchorURL> detectedURLs = new ArrayList<>();

@ -153,7 +153,7 @@ public class ooxmlParserTest {
assertNotNull("Detected URLs must not be null", anchors); assertNotNull("Detected URLs must not be null", anchors);
assertEquals("2 URLs should be detected", 2, anchors.size()); assertEquals("2 URLs should be detected", 2, anchors.size());
assertTrue("YaCy home page URL should have been parsed", anchors.contains(new AnchorURL("http://yacy.net"))); assertTrue("YaCy home page URL should have been parsed", anchors.contains(new AnchorURL("http://yacy.net")));
assertTrue("YaCy forum URL should have been parsed", anchors.contains(new AnchorURL("http://forum.yacy-websuche.de/"))); assertTrue("YaCy forum URL should have been parsed", anchors.contains(new AnchorURL("https://searchlab.eu")));
} }
} }

Loading…
Cancel
Save