From fa98657bb32e3dd8404b0b7dd84b95cf790f1ceb Mon Sep 17 00:00:00 2001
From: cominch <dominic@luetjohann.com>
Date: Wed, 20 Jun 2012 09:10:39 +0200
Subject: [PATCH] Augmented Browsing: changed the settings page

---
 htroot/AugmentedBrowsingFilters_p.html | 29 ++------------------------
 htroot/AugmentedBrowsingFilters_p.java | 21 +------------------
 2 files changed, 3 insertions(+), 47 deletions(-)

diff --git a/htroot/AugmentedBrowsingFilters_p.html b/htroot/AugmentedBrowsingFilters_p.html
index ae55196b5..3bea2df50 100644
--- a/htroot/AugmentedBrowsingFilters_p.html
+++ b/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>
 
 	
diff --git a/htroot/AugmentedBrowsingFilters_p.java b/htroot/AugmentedBrowsingFilters_p.java
index 0ac474f62..294656cb4 100644
--- a/htroot/AugmentedBrowsingFilters_p.java
+++ b/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