Merge branch 'master' of ssh://git@gitorious.org/yacy/rc1.git

build.xml

@@ -58,6 +58,7 @@
   <property name="release_mac" location="${release}/MAC"/>
   <property name="git" location=".git"/>
   <property name="defaults" location="defaults"/>
+  <property name="RDFaParser" location="RDFaParser"/>
 
   <!-- pseudo default releaseNr as fallback --> 
   <property name="releaseNr" value="9000" />
@@ -300,6 +301,12 @@
                includes="**/*"/>
     </copy>
 
+  	<!-- copy RDFaParser -->
+    <copy todir="${release_main}/RDFaParser">
+      <fileset dir="${RDFaParser}" 
+               includes="**/*"/>
+    </copy>
+
   	<!-- copy Unix wrappers -->
     <copy todir="${release_main}">
       <fileset dir=".">

htroot/AugmentedBrowsingFilters_p.html

@@ -55,35 +55,10 @@
               <dd>
                 <input type="checkbox" name="overlayInteraction" id="overlayInteraction" #(overlayInteraction_checked)#:: checked="checked"#(/overlayInteraction_checked)# />Enabled<br/>
                 <p class="help">
-                   Show overlay interaction buttons for sciety.
+                   Show overlay interaction buttons.
                 </p>
               </dd>
-                           
-              <!-- <dt><label for="content">Add unique IDs to every node:</label></dt>
-              <dd>
-                <input type="checkbox" name="augmentedReparseAdduniqueid" id="augmentedReparseAdduniqueid" #(augmentedReparseAdduniqueid_checked)#:: checked="checked"#(/augmentedReparseAdduniqueid_checked)# />Enabled<br/>
-                <p class="help">
-                   Requires webpage reparsing.
-                </p>
-              </dd>
-              
-              <dt><label for="content">Add sciencenet domain info:</label></dt>
-              <dd>
-                <input type="checkbox" name="augmentedReparseAddserver" id="augmentedReparseAddserver" #(augmentedReparseAddserver_checked)#:: checked="checked"#(/augmentedReparseAddserver_checked)# />Enabled<br/>
-                <p class="help">
-                   Requires webpage reparsing.
-                </p>
-              </dd>
-              
-              <dt><label for="content">Add RDF from DB:</label></dt>
-              <dd>
-                <input type="checkbox" name="augmentedReparseAddrdf" id="augmentedReparseAddrdf" #(augmentedReparseAddrdf_checked)#:: checked="checked"#(/augmentedReparseAddrdf_checked)# />Enabled<br/>
-                <p class="help">
-                   Requires webpage reparsing.
-                </p>
-              </dd> -->              
-                                                       
-              
+ 
             </dl>
 
 	

htroot/AugmentedBrowsingFilters_p.java

@@ -26,15 +26,6 @@ public final class AugmentedBrowsingFilters_p {
 				env.setConfig("interaction.overlayinteraction.enabled", "on".equals(post
 						.get("overlayInteraction")) ? true : false);
 				
-//				env.setConfig("augmentation.reparse.adduniqueid", "on".equals(post
-//						.get("augmentedReparseAdduniqueid")) ? true : false);
-//				
-//				env.setConfig("augmentation.reparse.addserverinfo", "on".equals(post
-//						.get("augmentedReparseAddserver")) ? true : false);
-//				
-//				env.setConfig("augmentation.reparse.addrdf", "on".equals(post
-//						.get("augmentedReparseAddrdf")) ? true : false);
-
 			}
 
 		}
@@ -49,17 +40,7 @@ public final class AugmentedBrowsingFilters_p {
 				env.getConfigBool("augmentation.reparse", true) ? "1" : "0");
 		
 		prop.put("overlayInteraction_checked",
-				env.getConfigBool("interaction.overlayinteraction.enabled", true) ? "1" : "0");
-		
-//		prop.put("augmentedReparseAdduniqueid_checked",
-//				env.getConfigBool("augmentation.reparse.adduniqueid", true) ? "1" : "0");
-//		
-//		prop.put("augmentedReparseAddserver_checked",
-//				env.getConfigBool("augmentation.reparse.addserverinfo", true) ? "1" : "0");
-//		
-//		prop.put("augmentedReparseAddrdf_checked",
-//				env.getConfigBool("augmentation.reparse.addrdf", true) ? "1" : "0");
-		
+				env.getConfigBool("interaction.overlayinteraction.enabled", true) ? "1" : "0");		
 
 
 		// return rewrite properties

htroot/ConfigPortal.html

@@ -57,6 +57,11 @@
           <input type="checkbox" name="search.app" value="true" #(search.app)#::checked="checked"#(/search.app)# />Applications
           </dd>
           
+          <dt>Show additional interaction features in footer</dt>
+          <dd>
+          <input type="checkbox" name="interaction.userlogon" value="true" #(interaction.userlogon)#::checked="checked"#(/interaction.userlogon)# />User-Logon&nbsp;
+          </dd>
+          
           <dt>Snippet Fetch Strategy &amp; Link Verification</dt>
           <dd>
           <img src="env/grafics/idea.png" width="32" height="32" alt="idea" align="center"/>Speed up search results with this option! (use CACHEONLY or FALSE to switch off verification)<br/>

htroot/ConfigPortal.java

@@ -59,7 +59,7 @@ public class ConfigPortal {
                 } else {
                     sb.setConfig(SwitchboardConstants.BROWSER_POP_UP_PAGE, "Status.html");
                 }
-                sb.setConfig(SwitchboardConstants.BROWSER_DEFAULT, sb.getConfig(SwitchboardConstants.BROWSER_POP_UP_PAGE, "index.html"));
+                sb.setConfig(SwitchboardConstants.BROWSER_POP_UP_PAGE, sb.getConfig(SwitchboardConstants.BROWSER_POP_UP_PAGE, "index.html"));
                 HTTPDFileHandler.initDefaultPath();
             }
             if (post.containsKey("searchpage_set")) {
@@ -80,6 +80,8 @@ public class ConfigPortal {
                 sb.setConfig("publicTopmenu", post.getBoolean("publicTopmenu", true));
                 sb.setConfig("publicSearchpage", post.getBoolean("publicSearchpage", true));
                 sb.setConfig("search.options", post.getBoolean("search.options", false));
+                
+                sb.setConfig("interaction.userlogon.enabled", post.getBoolean("interaction.userlogon", false));
 
                 sb.setConfig("search.text", post.getBoolean("search.text", false));
                 sb.setConfig("search.image", post.getBoolean("search.image", false));
@@ -129,6 +131,7 @@ public class ConfigPortal {
                 sb.setConfig("publicSearchpage", true);
                 sb.setConfig("search.navigation", "hosts,authors,namespace,topics");
                 sb.setConfig("search.options", true);
+                sb.setConfig("interaction.userlogon.enabled", false);
                 sb.setConfig("search.text", true);
                 sb.setConfig("search.image", true);
                 sb.setConfig("search.audio", false);
@@ -160,6 +163,8 @@ public class ConfigPortal {
         prop.put("publicSearchpage", sb.getConfigBool("publicSearchpage", false) ? 1 : 0);
         prop.put("search.options", sb.getConfigBool("search.options", false) ? 1 : 0);
 
+        prop.put("interaction.userlogon", sb.getConfigBool("interaction.userlogon.enabled", false) ? 1 : 0);
+        
         prop.put("search.text", sb.getConfigBool("search.text", false) ? 1 : 0);
         prop.put("search.image", sb.getConfigBool("search.image", false) ? 1 : 0);
         prop.put("search.audio", sb.getConfigBool("search.audio", false) ? 1 : 0);

htroot/Crawler_p.html

@@ -15,7 +15,7 @@
 #%env/templates/submenuCrawlMonitor.template%#
 <h2>Crawler</h2>
 <noscript><p>(Please enable JavaScript to automatically update this page!)</p></noscript>
-<fieldset style="width:230px;height:140px;float:left;">
+<fieldset style="width:270px;height:140px;float:left;">
 <legend>Queues</legend>
       <table border="0" cellpadding="2" cellspacing="1" class="watchCrawler">
         <tbody>

htroot/env/templates/embeddedfooter.template

@@ -1 +1,2 @@
 </div>
+<!--#include virtual="/interaction_elements/Footer.html" -->

htroot/env/templates/footer.template

@@ -1 +1,2 @@
-</div>
+</div>
+<!--#include virtual="/interaction_elements/Footer.html" -->

htroot/env/templates/simplefooter.template

@@ -1 +1,2 @@
 </div>
+<!--#include virtual="/interaction_elements/Footer.html" -->

htroot/interaction_elements/Footer.html

@@ -0,0 +1,88 @@
+#(enabled)#::
+<!-- BEGIN Footer.html -->
+<style type="text/css">
+
+
+.SubMenuFooter h3 {
+  -webkit-border-radius: 5px;
+  -khtml-border-radius: 5px;
+  -moz-border-radius: 5px;
+  border-radius: 5px;
+
+  background-color:#[color]#;
+  color:white;
+}
+
+a.MenuItemLinkFooter, ul.SubMenuFooter em {
+  background-color: #[color]#;
+  color:#[color]#;
+}
+
+a:hover.MenuItemLinkFooter {
+  background-color:#[color]#;
+  color:#[color]#;
+}
+
+ul.SubMenuFooter a.MenuItemLinkFooter {
+  margin-top:0;
+}
+
+a.MenuItemLinkFooter{
+  display:block;
+  text-decoration:none;
+  margin-top:1px;
+  margin-bottom:1px;
+  padding:1px 10px 1px 15px;
+  font-size:0.9em;
+  white-space:nowrap;
+}
+
+
+
+a:hover.MenuItemLinkFooter {
+  text-decoration:none;
+}
+
+
+ul.SubMenuFooter em {
+  margin-top:0;
+}
+
+
+ul.SubMenuFooter em {
+  display:block;
+  text-decoration:none;
+  margin-top:1px;
+  margin-bottom:1px;
+  padding:1px 10px 1px 15px;
+  font-size:0.9em;
+}
+
+ul.SubMenuFooter {
+  clear:left;
+  padding:0;
+  margin:0;
+}
+
+ul.SubMenuFooter li {
+  list-style:none;
+  margin:0;
+  margin-top:1px;
+  padding:0;
+}
+
+ul.SubMenuFooter li {
+  float:left;
+  margin-right:1px;
+  margin-top:0;
+}
+
+</style>
+
+<div style="position: fixed; bottom: 0px; width: 100%;">
+<ul class="SubMenuFooter">
+	#(userlogonenabled)#::<li style="width:#[ratio]#%;"><!--#include virtual="/currentyacypeer/interaction_elements/Loginstatus_part.html" --></li>#(/userlogonenabled)#
+</ul>
+</div>
+<!-- END Footer.html -->
+#(/enabled)#

htroot/interaction_elements/Footer.java

@@ -0,0 +1,35 @@
+package interaction_elements;
+
+
+import net.yacy.cora.protocol.RequestHeader;
+import net.yacy.search.Switchboard;
+import de.anomic.server.serverObjects;
+import de.anomic.server.serverSwitch;
+
+public class Footer {
+    
+    public static serverObjects respond(final RequestHeader requestHeader, final serverObjects post, final serverSwitch env) {
+    	
+    	final Switchboard sb = (Switchboard) env;
+    	
+        final serverObjects prop = new serverObjects();
+        
+        prop.put("enabled_color", env.getConfig("color_tableheader", ""));
+        
+        int count = 0;
+              
+        prop.put("enabled_userlogonenabled", env.getConfigBool("interaction.userlogon.enabled", false) ? "1" : "0");
+        if (env.getConfigBool("interaction.userlogon.enabled", false)) count++;
+        
+        if (count > 0) {        
+        	prop.put("enabled", "1");
+        	prop.put("enabled_userlogonenabled_ratio", Math.round(100/count)-1);
+        	
+        } else {
+        	prop.put("enabled", "0");
+        }
+              
+        
+        return prop;
+    }
+}

htroot/interaction_elements/Loginstatus_part.html

@@ -0,0 +1,10 @@
+#(enabled)#::
+<!-- Loginbutton_part -->
+#(logged-in)#
+<a id="logon_trigger" href="" class="MenuItemLinkFooter" style="color: #fff; background-color: #[color]#;" onclick="return false;"><img src="/currentyacypeer/interaction_elements/login_empty.png"> #[username]#</a>
+::
+<a id="logon_trigger" href="" class="MenuItemLinkFooter" style="color: #fff; background-color: #[color]#;" onclick="return false;"><img src="/currentyacypeer/interaction_elements/login_user.png"> #[username]#</a>
+::
+<a id="logon_trigger" href="" class="MenuItemLinkFooter" style="color: #fff; background-color: #[color]#;" onclick="return false;"><img src="/currentyacypeer/interaction_elements/login_admin.png"> #[username]#</a> 
+#(/logged-in)#
+#(/enabled)#

htroot/interaction_elements/Loginstatus_part.java

@@ -0,0 +1,114 @@
+package interaction_elements;
+
+//ViewLog_p.java 
+//-----------------------
+//part of the AnomicHTTPD caching proxy
+//(C) by Michael Peter Christen; mc@yacy.net
+//first published on http://www.anomic.de
+//Frankfurt, Germany, 2004
+//
+//This File is contributed by Alexander Schier
+//last major change: 14.12.2004
+//
+//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
+
+
+//You must compile this file with
+//javac -classpath .:../classes ViewLog_p.java
+//if the shell's current path is HTROOT
+
+import net.yacy.cora.protocol.HeaderFramework;
+import net.yacy.cora.protocol.RequestHeader;
+import net.yacy.search.Switchboard;
+import de.anomic.data.UserDB;
+import de.anomic.server.serverObjects;
+import de.anomic.server.serverSwitch;
+import de.anomic.server.servletProperties;
+
+public class Loginstatus_part {
+    
+    public static serverObjects respond(final RequestHeader requestHeader, final serverObjects post, final serverSwitch env) {
+    	
+    	final Switchboard sb = (Switchboard) env;
+    	
+    	final servletProperties prop = new servletProperties();
+        
+        prop.put("enabled", env.getConfigBool("interaction.userlogon.enabled", false) ? "1" : "0");
+        
+        prop.put("enabled_color", env.getConfig("color_tableheader", ""));
+
+        prop.put("enabled_logged-in_registrationenabled", env.getConfigBool("interaction.userselfregistration.enabled", false) ? "1" : "0");
+        
+//        
+//        final String address = sb.peers.mySeed().getPublicAddress();
+        
+        prop.put("enabled_peer", sb.peers.myName());
+        
+        prop.put("enabled_logged-in_returnto", "/index.html");
+        
+        
+        UserDB.Entry entry=null;
+
+        //default values
+        prop.put("enabled_logged_in", "0");
+        prop.put("enabled_logged-in_limit", "0");
+        prop.put("enabled_logged-in_username", "anonymous");
+        prop.put("enabled_status", "0");
+        //identified via HTTPPassword
+        entry=sb.userDB.proxyAuth((requestHeader.get(RequestHeader.AUTHORIZATION, "xxxxxx")));
+        if(entry != null){
+        	prop.put("enabled_logged-in_identified-by", "1");
+        //try via cookie
+        }else{
+            entry=sb.userDB.cookieAuth(requestHeader.getHeaderCookies());
+            prop.put("enabled_logged-in_identified-by", "2");
+            //try via ip
+            if(entry == null){
+                entry=sb.userDB.ipAuth((requestHeader.get(HeaderFramework.CONNECTION_PROP_CLIENTIP, "xxxxxx")));
+                if(entry != null){
+                    prop.put("enabled_logged-in_identified-by", "0");
+                }
+            }
+        }
+        
+        //identified via userDB
+        if(entry != null){
+            prop.put("enabled_logged-in", "1");
+            prop.put("enabled_logged-in_username", entry.getUserName());
+            if(entry.getTimeLimit() > 0){
+                prop.put("enabled_logged-in_limit", "1");
+                final long limit=entry.getTimeLimit();
+                final long used=entry.getTimeUsed();
+                prop.put("enabled_logged-in_limit_timelimit", limit);
+                prop.put("enabled_logged-in_limit_timeused", used);
+                int percent=0;
+                if(limit!=0 && used != 0)
+                    percent=(int)((float)used/(float)limit*100);
+                prop.put("enabled_logged-in_limit_percent", percent/3);
+                prop.put("enabled_logged-in_limit_percent2", (100-percent)/3);
+            }
+        //logged in via static Password
+        }else if(sb.verifyAuthentication(requestHeader)){
+            prop.put("enabled_logged-in", "2");
+            prop.put("enabled_logged-in_username", "staticadmin");
+        //identified via form-login
+        //TODO: this does not work for a static admin, yet.
+        }
+        
+        // return rewrite properties
+        return prop;
+        
+    }
+}

htroot/interaction_elements/OverlayInteraction.html

@@ -9,7 +9,7 @@ font-size: 10px;
 position: fixed;
 right: 0;
 background: #ffffff;
-border:1px solid #5a346e;
+border:1px solid #[color]#;
 
 width: 210px;
 height: auto;
@@ -17,7 +17,7 @@ padding: 30px 110px 30px 30px;
 
 z-index:99998;
 
-color: #5a346e;
+color: #[color]#;
 }
 
 .sci_right {
@@ -36,31 +36,11 @@ padding: 5px 5px 5px 5px;
 
 z-index:99998;
 
-color: #5a346e;
+color: #[color]#;
 
 }
 
 
-.sci_hide {
-	
-font: arial,helvetica,sans-serif;
-font-size: 10px;
-position: fixed;
-right: 0px;
-top: 0;
-background: #ffffff;
-border:0px;
-
-width: 100px;
-height: 20px;
-padding: 5px 5px 5px 5px;
-
-z-index:99998;
-
-color: #5a346e;
-
-}
-
 .sci_left {
 	
 font: arial,helvetica,sans-serif;
@@ -136,7 +116,7 @@ height: 2px;
 background: #ffffff;
 border:0px;
 
-background: #5a346e;
+background: #[color]#;
 
 padding: 0px 0px 0px 0px;
 

htroot/interaction_elements/OverlayInteraction.java

@@ -17,6 +17,8 @@ public class OverlayInteraction {
         prop.put("enabled_urlhash", post.get("urlhash", ""));
         
         prop.put("enabled_action", post.get("action", ""));
+        
+        prop.put("enabled_color", env.getConfig("color_tableheader", "")); 
 
         return prop;
     }

htroot/yacysearch.html

@@ -252,5 +252,7 @@ window.setTimeout('latestinfo();',8000);
 window.setTimeout('latestinfo();',10000);
 </script>
 
+<!--#include virtual="/interaction_elements/Footer.html" -->
+
 </body>
 </html>

source/net/yacy/document/Document.java

@@ -781,6 +781,7 @@ dc_rights
 
         for (final Document doc: docs) {
 
+        	if (doc == null) continue;
             final String author = doc.dc_creator();
             if (author.length() > 0) {
                 if (authors.length() > 0) authors.append(",");

source/net/yacy/document/TextParser.java

@@ -261,7 +261,7 @@ public final class TextParser {
         if (log.isFine()) log.logInfo("Parsing " + location + " with mimeType '" + mimeType + "' and file extension '" + fileExt + "'.");
         try {
             final Document[] docs = parser.parse(location, mimeType, documentCharset, sourceStream);
-            for (final Document d: docs) { assert d.getText() != null; } // verify docs
+            for (final Document d: docs) { assert d != null && d.getText() != null; } // verify docs
             return docs;
         } catch (final Exception e) {
             throw new Parser.Failure("parser failed: " + parser.getName(), location);

source/net/yacy/interaction/AugmentHtmlStream.java

@@ -381,6 +381,8 @@ public class AugmentHtmlStream {
                     NodeList bodychildren = bt.getChildren();
 
                     bodychildren.add(new org.htmlparser.nodes.TextNode(loadInternal("interaction_elements/OverlayInteraction.html?action="+action+"&urlhash="+ ASCII.String(url.hash()) +"&url="+url.toNormalform(false, true), requestHeader)));
+                    
+                    bodychildren.add(new org.htmlparser.nodes.TextNode(loadInternal("interaction_elements/Footer.html?action="+action+"&urlhash="+ ASCII.String(url.hash()) +"&url="+url.toNormalform(false, true), requestHeader)));
 
                     bt.setChildren(bodychildren);
 

source/net/yacy/search/index/DocumentIndex.java

@@ -157,6 +157,7 @@ public class DocumentIndex extends Segment
         final URIMetadataRow[] rows = new URIMetadataRow[documents.length];
         int c = 0;
         for ( final Document document : documents ) {
+        	if (document == null) continue;
             final Condenser condenser = new Condenser(document, true, true, LibraryProvider.dymLib, true);
             rows[c++] =
                 super.storeDocument(