*) cleaned up in wikiCode parser (more to be done)

*) HTML fixes git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@7103 6c8d7289-2bf4-0310-a012-ef5d649a1542
14 years ago · 5f391fcfa9
parent b3f0d06444
commit 5f391fcfa9
4 changed files with 467 additions and 408 deletions
--- a/htroot/Load_PHPBB3.html
+++ b/htroot/Load_PHPBB3.html
@ -28,12 +28,17 @@
      to this page to read the integration hints below.
    </p>
    
-   <form name="Crawler" action="Crawler_p.html" method="post" enctype="multipart/form-data">
+   <form id="Crawler" action="Crawler_p.html" method="post" enctype="multipart/form-data">
       <fieldset>
        <dl>
          <dt><b>URL of the phpBB3 forum main page</b><br />This is a crawl start point</dt>
          <dd><input type="text" name="crawlingURL" value="#[starturl]#" size="60" maxlength="256" onkeypress="changed()" onfocus="check('url')" /></dd>

+          <dt></dt>
+          <dd><input type="submit" name="crawlingstart" value="Get content of phpBB3: crawl forum pages" /></dd>
+          
+        </dl>
+           
        <input type="hidden" name="crawlingMode" id="url" value="url" checked="checked" />
        <input type="hidden" name="createBookmark" value="off" />
        <input type="hidden" name="crawlingDepth" value="8" />
@ -46,7 +51,7 @@
        <input type="hidden" name="crawlingDomFilterCheck" value="off" />
        <input type="hidden" name="crawlingDomFilterDepth" value="0" />
        <input type="hidden" name="crawlingDomMaxCheck" value="off" />
-          <input type="hidden" name="crawlingDomMaxPages" "" />
+        <input type="hidden" name="crawlingDomMaxPages" value="" />
        <input type="hidden" name="crawlingQ" value="on" />
        <input type="hidden" name="storeHTCache" value="off" />
        <input type="hidden" name="indexText" value="on" />
@ -57,10 +62,6 @@
        <input type="hidden" name="xdstopw" value="off" />
        <input type="hidden" name="xpstopw" value="off" />
        
-          <dt></dt>
-          <dd><input type="submit" name="crawlingstart" value="Get content of phpBB3: crawl forum pages" /></dd>
-          
-        </dl>
      </fieldset>
    </form>
    
@ -69,6 +70,7 @@
      To integrate a search window into phpBB3, you must insert some code into a forum template.
      There are several templates that can be used for phpBB3, but in this guide we consider that
      you are using the default template, 'prosilver':
+    </p>
    <ul>
      <li>open styles/prosilver/template/overall_header.html</li>
      <li>find the line where the default search window is displayed, thats right behind the <pre>&lt;div id="search-box"&gt;</pre> statement</li>
@ -100,13 +102,14 @@
      &lt;input type="submit" name="Enter" value="Search" /&gt;
  &lt;/form&gt;YaCy Search
 &lt;/div&gt;
-</pre></li>
+        </pre>
+      </li>
      <li>Check all appearances of static IPs given in the code snippet and replace it with your own IP, or your host name</li>
      <li>You may want to change the default text elements in the code snippet</li>
      <li>To see all options for the search widget, look at the more generic description of search widgets at
-            the <a href="ConfigLiveSearch.html">configuration for live search</a>.
+          the <a href="ConfigLiveSearch.html">configuration for live search</a>.</li>
   </ul>
-       </p>
+       
    #%env/templates/footer.template%#
  </body>
 </html>
--- a/htroot/Load_RSS_p.html
+++ b/htroot/Load_RSS_p.html
@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
-    <title>YaCy '#[clientname]#': Configuration of a Wiki Search</title>
+    <title>YaCy '#[clientname]#': Configuration of a RSS Search</title>
    #%env/templates/metas.template%#
    <script type="text/javascript">
    <!--
--- a/source/de/anomic/data/wiki/abstractWikiParser.java
+++ b/source/de/anomic/data/wiki/abstractWikiParser.java
@ -32,11 +32,11 @@ import java.io.InputStreamReader;
 import java.io.StringReader;
 import java.io.UnsupportedEncodingException;

-public abstract class abstractWikiParser implements wikiParser {
+abstract class abstractWikiParser implements wikiParser {
    
-    String address;
+    final String address;
    
-    public abstractWikiParser(String address) {
+    public abstractWikiParser(final String address) {
        this.address = address;
    }
    
--- a/source/de/anomic/data/wiki/wikiCode.java
+++ b/source/de/anomic/data/wiki/wikiCode.java