finally some putHTML on htroot/xml/

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@5188 6c8d7289-2bf4-0310-a012-ef5d649a1542

htroot/xml/bookmarks/posts/get.java

@@ -71,9 +71,9 @@ public class get {
             if(serverDate.formatISO8601(new Date(bookmark.getTimeStamp())).equals(date) &&
                     tag==null || bookmark.getTags().contains(tag) &&
                     isAdmin || bookmark.getPublic()){
-                prop.put("posts_"+count+"_url", bookmark.getUrl());
+                prop.putHTML("posts_"+count+"_url", bookmark.getUrl());
-                prop.put("posts_"+count+"_title", bookmark.getTitle());
+                prop.putHTML("posts_"+count+"_title", bookmark.getTitle());
-                prop.put("posts_"+count+"_description", bookmark.getDescription());
+                prop.putHTML("posts_"+count+"_description", bookmark.getDescription());
                 prop.put("posts_"+count+"_md5", serverCodings.encodeMD5Hex(bookmark.getUrl()));
                 prop.put("posts_"+count+"_time", date);
                 prop.putHTML("posts_"+count+"_tags", bookmark.getTagsString().replaceAll(","," "));

htroot/xml/bookmarks/xbel/xbel.java

@@ -33,7 +33,7 @@ public class xbel {
     		}
         	if(post.containsKey("tag")) {
     			final String tagName=post.get("tag");    			
-    			prop.put("folder", tagName);
+    			prop.putHTML("folder", tagName);
     			if (!tagName.equals("")) {
     				final Iterator<String> bit=switchboard.bookmarksDB.getBookmarksIterator(tagName, isAdmin);
     				count = print_XBEL(bit, count);

htroot/xml/queues_p.java

@@ -102,7 +102,7 @@ public class queues_p {
                     totalSize += entrySize;
                     initiator = sb.webIndex.seedDB.getConnected(pcentry.initiator());
                     prop.put("list-indexing_"+i+"_profile", (pcentry.profile() != null) ? pcentry.profile().name() : "deleted");
-                    prop.put("list-indexing_"+i+"_initiator", ((initiator == null) ? "proxy" : initiator.getName()));
+                    prop.putHTML("list-indexing_"+i+"_initiator", ((initiator == null) ? "proxy" : initiator.getName()));
                     prop.put("list-indexing_"+i+"_depth", pcentry.depth());
                     prop.put("list-indexing_"+i+"_modified", pcentry.getModificationDate());
                     prop.putHTML("list-indexing_"+i+"_anchor", (pcentry.anchorName()==null) ? "" : pcentry.anchorName(), true);
@@ -118,7 +118,7 @@ public class queues_p {
         
         //loader queue
         prop.put("loaderSize", Integer.toString(sb.crawlQueues.size()));        
-        prop.put("loaderMax", sb.getConfig(plasmaSwitchboardConstants.CRAWLER_THREADS_ACTIVE_MAX, "10"));
+        prop.put("loaderMax", sb.getConfigLong(plasmaSwitchboardConstants.CRAWLER_THREADS_ACTIVE_MAX, 10));
         if (sb.crawlQueues.size() == 0) {
             prop.put("list-loader", "0");
         } else {
@@ -128,7 +128,7 @@ public class queues_p {
                 if (w[i] == null) continue;
                 prop.put("list-loader_"+count+"_profile", w[i].profileHandle());
                 initiator = sb.webIndex.seedDB.getConnected(w[i].initiator());
-                prop.put("list-loader_"+count+"_initiator", ((initiator == null) ? "proxy" : initiator.getName()));
+                prop.putHTML("list-loader_"+count+"_initiator", ((initiator == null) ? "proxy" : initiator.getName()));
                 prop.put("list-loader_"+count+"_depth", w[i].depth());
                 prop.putHTML("list-loader_"+count+"_url", w[i].url().toString(), true);
                 count++;

source/de/anomic/data/htmlTools.java

@@ -273,5 +273,9 @@ public class htmlTools {
         System.out.println(txet);
         System.out.println(decodeHtml2Unicode(txet));
         if (decodeHtml2Unicode(txet).equals(text)) System.out.println("correct");
+        
+        final String text2 = "encodeUnicode2xml: & \" < > ä ö ü";
+        System.out.println(text2);
+        System.out.println(encodeUnicode2xml(text2));
     }
 }