From 1600414450be685a6e2ba7282f93a96055645467 Mon Sep 17 00:00:00 2001
From: reger <reger18@arcor.de>
Date: Fri, 2 May 2014 19:32:09 +0200
Subject: [PATCH 1/6] fix NPE on continuing crawls after YaCy restart (Agent is
 then nulll)

---
 source/net/yacy/crawler/HostBalancer.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/source/net/yacy/crawler/HostBalancer.java b/source/net/yacy/crawler/HostBalancer.java
index 1ba50ce8c..29aa2923e 100644
--- a/source/net/yacy/crawler/HostBalancer.java
+++ b/source/net/yacy/crawler/HostBalancer.java
@@ -211,7 +211,8 @@ public class HostBalancer implements Balancer {
             if (queue == null) {
                 queue = new HostQueue(this.hostsPath, entry.url().getHost(), entry.url().getPort(), this.queues.size() > 100, this.exceed134217727);
                 this.queues.put(hosthash, queue);
-                robots.ensureExist(entry.url(), profile.getAgent(), true); // concurrently load all robots.txt
+                // profile might be null when continue crawls after YaCy restart
+                robots.ensureExist(entry.url(), profile == null ? ClientIdentification.yacyInternetCrawlerAgent : profile.getAgent(), true); // concurrently load all robots.txt
             }
             return queue.push(entry, profile, robots);
         }

From b8cee9b7d8444db750e63d6ed470e17d93b01936 Mon Sep 17 00:00:00 2001
From: sixcooler <sgaebel@sixcooler.de>
Date: Fri, 2 May 2014 22:55:47 +0200
Subject: [PATCH 2/6] remove tables from tabletracker on close to avoid lots of
 dead entrys in /PerformanceMemory_p.html

---
 source/net/yacy/kelondro/table/Table.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/source/net/yacy/kelondro/table/Table.java b/source/net/yacy/kelondro/table/Table.java
index 8630f35d2..2b652ad87 100644
--- a/source/net/yacy/kelondro/table/Table.java
+++ b/source/net/yacy/kelondro/table/Table.java
@@ -474,12 +474,17 @@ public class Table implements Index, Iterable<Row.Entry> {
 
     @Override
     public void close() {
-        if (this.file != null) this.file.close();
+    	String tablefile = null;
+        if (this.file != null) {
+        	tablefile = this.file.filename().toString();
+        	this.file.close();
+        }
         this.file = null;
         if (this.table != null) this.table.close();
         this.table = null;
         if (this.index != null) this.index.close();
         this.index = null;
+		if (tablefile != null) tableTracker.remove(tablefile);
     }
 
     @Override

From 91bd384cf6f346b219d71dd5eb0f3bc7aea1b1e1 Mon Sep 17 00:00:00 2001
From: reger <reger18@arcor.de>
Date: Sat, 3 May 2014 21:55:10 +0200
Subject: [PATCH 3/6] fix input-group layout on index.html see bug
 http://mantis.tokeek.de/view.php?id=391

---
 htroot/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htroot/index.html b/htroot/index.html
index ad37c37a5..39c309195 100644
--- a/htroot/index.html
+++ b/htroot/index.html
@@ -53,7 +53,7 @@
 	<h2 class="yacy"><a href="#[promoteSearchPageGreeting.homepage]#" class="yacylogo"><img src="#[promoteSearchPageGreeting.largeImage]#" alt="yacy" style="margin: auto;"/></a></h2>
     <h2 class="yacy">#[promoteSearchPageGreeting]#</h2>
 
-    <form class="search" action="yacysearch.html" method="get" id="searchform" accept-charset="UTF-8">
+    <form class="search form-inline" action="yacysearch.html" method="get" id="searchform" accept-charset="UTF-8">
       <fieldset class="maininput">
         <div class="input-group">
           <input name="query" id="search" type="text" size="40" maxlength="80" value="#[former]#" onFocus="this.select()" class="form-control searchinput typeahead" />

From 8a7c68e4c7f6a682e3ef656b423ce1ad76b42caa Mon Sep 17 00:00:00 2001
From: reger <reger18@arcor.de>
Date: Sun, 4 May 2014 09:29:07 +0200
Subject: [PATCH 4/6] content of surrogates/out never accessed (remove) After
 import the conent is never accessed but may take up a lot of disk space, also
 the getLoadedOAIServer (which lists the files in surrogate out) is not used.
 Making the surrogate.out obsolete. Removed keeping of xmls after import.

---
 .../document/importer/OAIPMHImporter.java     | 38 +------------------
 source/net/yacy/search/Switchboard.java       | 38 +++----------------
 .../net/yacy/search/SwitchboardConstants.java |  4 +-
 3 files changed, 8 insertions(+), 72 deletions(-)

diff --git a/source/net/yacy/document/importer/OAIPMHImporter.java b/source/net/yacy/document/importer/OAIPMHImporter.java
index 74fe2b269..173332b48 100644
--- a/source/net/yacy/document/importer/OAIPMHImporter.java
+++ b/source/net/yacy/document/importer/OAIPMHImporter.java
@@ -22,13 +22,8 @@
 
 package net.yacy.document.importer;
 
-import java.io.File;
 import java.io.IOException;
 import java.net.MalformedURLException;
-import java.text.ParseException;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
 import net.yacy.cora.date.GenericFormatter;
@@ -181,43 +176,12 @@ public class OAIPMHImporter extends Thread implements Importer, Comparable<OAIPM
         return 0;
     }
 
-    /**
-     * get a map for already loaded oai-pmh servers and their latest access date
-     * @param surrogatesIn
-     * @param surrogatesOut
-     * @return a map where the key is the hostID of the servers and the value is the last access date
-     */
-    @SuppressWarnings("unchecked")
-    public static Map<String, Date> getLoadedOAIServer(File surrogatesIn, File surrogatesOut) {
-        Map<String, Date> map = getLoadedOAIServer(surrogatesOut);
-        map.putAll((Map<? extends String, ? extends Date>) getLoadedOAIServer(surrogatesIn).entrySet());
-        return map;
-    }
-
-    private static Map<String, Date> getLoadedOAIServer(File surrogates) {
-        HashMap<String, Date> map = new HashMap<String, Date>();
-        //oaipmh_opus.bsz-bw.de_20091102113118728.xml
-        for (String s: surrogates.list()) {
-            if (s.startsWith(filenamePrefix) && s.endsWith(".xml") && s.charAt(s.length() - 22) == filenameSeparationChar) {
-                try {
-                    Date fd = GenericFormatter.SHORT_MILSEC_FORMATTER.parse(s.substring(s.length() - 21, s.length() - 4));
-                    String hostID = s.substring(7, s.length() - 22);
-                    Date md = map.get(hostID);
-                    if (md == null || fd.after(md)) map.put(hostID, fd);
-                } catch (final ParseException e) {
-                    ConcurrentLog.logException(e);
-                }
-            }
-        }
-        return map;
-    }
-
     public static final char hostReplacementChar = '_';
     public static final char filenameSeparationChar = '.';
     public static final String filenamePrefix = "oaipmh";
 
     /**
-     * compute a host id that is also used in the getLoadedOAIServer method for the map key
+     * compute a host id
      * @param source
      * @return a string that is a key for the given host
      */
diff --git a/source/net/yacy/search/Switchboard.java b/source/net/yacy/search/Switchboard.java
index 5fe44bcd3..426c41ddd 100644
--- a/source/net/yacy/search/Switchboard.java
+++ b/source/net/yacy/search/Switchboard.java
@@ -37,17 +37,14 @@
 package net.yacy.search;
 
 import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
 import java.io.BufferedReader;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.OutputStream;
 import java.io.Reader;
 import java.net.MalformedURLException;
 import java.security.NoSuchAlgorithmException;
@@ -78,7 +75,6 @@ import java.util.concurrent.atomic.AtomicInteger;
 import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
 import java.util.zip.GZIPInputStream;
-import java.util.zip.GZIPOutputStream;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 
@@ -243,7 +239,7 @@ public final class Switchboard extends serverSwitch {
     public File networkRoot;
     public File queuesRoot;
     public File surrogatesInPath;
-    public File surrogatesOutPath;
+    //public File surrogatesOutPath;
     public Segment index;
     public LoaderDispatcher loader;
     public CrawlSwitchboard crawler;
@@ -675,13 +671,13 @@ public final class Switchboard extends serverSwitch {
                 SwitchboardConstants.SURROGATES_IN_PATH_DEFAULT);
         this.log.info("surrogates.in Path = " + this.surrogatesInPath.getAbsolutePath());
         this.surrogatesInPath.mkdirs();
-        this.surrogatesOutPath =
+/*        this.surrogatesOutPath =
             getDataPath(
                 SwitchboardConstants.SURROGATES_OUT_PATH,
                 SwitchboardConstants.SURROGATES_OUT_PATH_DEFAULT);
         this.log.info("surrogates.out Path = " + this.surrogatesOutPath.getAbsolutePath());
         this.surrogatesOutPath.mkdirs();
-
+*/
         // copy opensearch heuristic config (if not exist)
         final File osdConfig = new File(getDataPath(), "DATA/SETTINGS/heuristicopensearch.conf");
         if (!osdConfig.exists()) {
@@ -1833,8 +1829,6 @@ public final class Switchboard extends serverSwitch {
         if ( !infile.exists() || !infile.canWrite() || !infile.canRead() ) {
             return false;
         }
-        final File outfile = new File(this.surrogatesOutPath, s);
-        //if (outfile.exists()) return false;
         boolean moved = false;
         if ( s.endsWith("xml.zip") ) {
             // open the zip file with all the xml files in it
@@ -1858,7 +1852,7 @@ public final class Switchboard extends serverSwitch {
             } catch (final IOException e ) {
                 ConcurrentLog.logException(e);
             } finally {
-                moved = infile.renameTo(outfile);
+                moved = infile.delete();
                 if (zis != null) try {zis.close();} catch (final IOException e) {}
             }
             return moved;
@@ -1874,29 +1868,7 @@ public final class Switchboard extends serverSwitch {
             ConcurrentLog.logException(e);
         } finally {
             if (!shallTerminate()) {
-                moved = infile.renameTo(outfile);
-                if ( moved ) {
-                    // check if this file is already compressed, if not, compress now
-                    if ( !outfile.getName().endsWith(".gz") ) {
-                        final String gzname = outfile.getName() + ".gz";
-                        final File gzfile = new File(outfile.getParentFile(), gzname);
-                        try {
-                            final OutputStream os =
-                                new BufferedOutputStream(new GZIPOutputStream(new FileOutputStream(gzfile)));
-                            BufferedInputStream bis = new BufferedInputStream(new FileInputStream(outfile)); 
-                            FileUtils.copy(bis, os);
-                            os.close();
-                            bis.close();
-                            if ( gzfile.exists() ) {
-                                FileUtils.deletedelete(outfile);
-                            }
-                        } catch (final FileNotFoundException e ) {
-                            ConcurrentLog.logException(e);
-                        } catch (final IOException e ) {
-                            ConcurrentLog.logException(e);
-                        }
-                    }
-                }
+                moved = infile.delete();
             }
             if (is != null) try {is.close();} catch (IOException e) {}
         }
diff --git a/source/net/yacy/search/SwitchboardConstants.java b/source/net/yacy/search/SwitchboardConstants.java
index 17fa0812a..d6dc47860 100644
--- a/source/net/yacy/search/SwitchboardConstants.java
+++ b/source/net/yacy/search/SwitchboardConstants.java
@@ -387,8 +387,8 @@ public final class SwitchboardConstants {
 
     public static final String SURROGATES_IN_PATH          = "surrogates.in";
     public static final String SURROGATES_IN_PATH_DEFAULT  = "DATA/SURROGATES/in";
-    public static final String SURROGATES_OUT_PATH         = "surrogates.out";
-    public static final String SURROGATES_OUT_PATH_DEFAULT = "DATA/SURROGATES/out";
+    //public static final String SURROGATES_OUT_PATH         = "surrogates.out";
+    //public static final String SURROGATES_OUT_PATH_DEFAULT = "DATA/SURROGATES/out";
 
     public static final String DICTIONARY_SOURCE_PATH         = "dictionaries";
     public static final String DICTIONARY_SOURCE_PATH_DEFAULT = "DATA/DICTIONARIES";

From 390f03e0410c9c63ca7f804dc8f4a122a7972e62 Mon Sep 17 00:00:00 2001
From: sixcooler <sgaebel@sixcooler.de>
Date: Mon, 5 May 2014 13:24:41 +0200
Subject: [PATCH 5/6] o not check for segments-count on optimize: this is also
 done in Solr and our getSegmentsCount() does not return up-to-date values

---
 .../yacy/cora/federate/solr/connector/SolrServerConnector.java   | 1 -
 1 file changed, 1 deletion(-)

diff --git a/source/net/yacy/cora/federate/solr/connector/SolrServerConnector.java b/source/net/yacy/cora/federate/solr/connector/SolrServerConnector.java
index 04276e3ed..e37c1d1c7 100644
--- a/source/net/yacy/cora/federate/solr/connector/SolrServerConnector.java
+++ b/source/net/yacy/cora/federate/solr/connector/SolrServerConnector.java
@@ -91,7 +91,6 @@ public abstract class SolrServerConnector extends AbstractSolrConnector implemen
     @Override
     public void optimize(int maxSegments) {
         if (this.server == null) return;
-        if (getSegmentCount() <= maxSegments) return;
         synchronized (this.server) {
             try {
                 //this.server.optimize(true, true, maxSegments);

From f98ccf952fe2afa80ed9ba9f83b21524362b5a31 Mon Sep 17 00:00:00 2001
From: Marc Nause <marc.nause@audioattack.de>
Date: Mon, 5 May 2014 23:16:01 +0200
Subject: [PATCH 6/6] Improved Blacklist API:

*) added JSON support
*) fixed Exception in case of missing parameters
*) renamed parameter for items in "add entry" and "delete entry" from
"entry" to "item" to match term in XML
---
 htroot/api/blacklists/add_entry_p.java    |  4 +--
 htroot/api/blacklists/add_entry_p.json    |  3 ++
 htroot/api/blacklists/delete_entry_p.java |  4 +--
 htroot/api/blacklists/delete_entry_p.json |  3 ++
 htroot/api/blacklists/get_list_p.java     | 27 +++++++++++++++--
 htroot/api/blacklists/get_list_p.json     |  9 ++++++
 htroot/api/blacklists/get_metadata_p.java | 35 ++++++++++++++++++-----
 htroot/api/blacklists/get_metadata_p.json |  8 ++++++
 8 files changed, 79 insertions(+), 14 deletions(-)
 create mode 100644 htroot/api/blacklists/add_entry_p.json
 create mode 100644 htroot/api/blacklists/delete_entry_p.json
 create mode 100644 htroot/api/blacklists/get_list_p.json
 create mode 100644 htroot/api/blacklists/get_metadata_p.json

diff --git a/htroot/api/blacklists/add_entry_p.java b/htroot/api/blacklists/add_entry_p.java
index c9d3e5035..f44e2f132 100644
--- a/htroot/api/blacklists/add_entry_p.java
+++ b/htroot/api/blacklists/add_entry_p.java
@@ -13,14 +13,14 @@ public class add_entry_p {
     private static final String RESULT_FAILURE = "0";
     private static final String RESULT_SUCCESS = "1";
     private static final String XML_ITEM_STATUS = "status";
-    private static final String KEY_NEW_ENTRY = "entry";
+    private static final String KEY_NEW_ENTRY = "item";
     private static final String KEY_CURRENT_BLACKLIST = "list";
 
     public static serverObjects respond(final RequestHeader header, final serverObjects post, @SuppressWarnings("unused") final serverSwitch env) {
 
         final serverObjects prop = new serverObjects();
 
-        if (post.containsKey(KEY_CURRENT_BLACKLIST) && post.containsKey(KEY_NEW_ENTRY)) {
+        if (post!= null && post.containsKey(KEY_CURRENT_BLACKLIST) && post.containsKey(KEY_NEW_ENTRY)) {
 
             final String blacklistToUse = post.get(KEY_CURRENT_BLACKLIST, "").trim();
             final String entry = post.get(KEY_NEW_ENTRY, "").trim();
diff --git a/htroot/api/blacklists/add_entry_p.json b/htroot/api/blacklists/add_entry_p.json
new file mode 100644
index 000000000..1b14c1256
--- /dev/null
+++ b/htroot/api/blacklists/add_entry_p.json
@@ -0,0 +1,3 @@
+{
+  "status":"#(status)#error::ok#(/status)#"
+}
\ No newline at end of file
diff --git a/htroot/api/blacklists/delete_entry_p.java b/htroot/api/blacklists/delete_entry_p.java
index 693ed9abf..e6a23366a 100644
--- a/htroot/api/blacklists/delete_entry_p.java
+++ b/htroot/api/blacklists/delete_entry_p.java
@@ -13,14 +13,14 @@ public class delete_entry_p {
     private static final String RESULT_FAILURE = "0";
     private static final String RESULT_SUCCESS = "1";
     private static final String XML_ITEM_STATUS = "status";
-    private static final String KEY_NEW_ENTRY = "entry";
+    private static final String KEY_NEW_ENTRY = "item";
     private static final String KEY_CURRENT_BLACKLIST = "list";
 
     public static serverObjects respond(final RequestHeader header, final serverObjects post, @SuppressWarnings("unused") final serverSwitch env) {
 
         final serverObjects prop = new serverObjects();
 
-        if (post.containsKey(KEY_CURRENT_BLACKLIST) && post.containsKey(KEY_NEW_ENTRY)) {
+        if (post!= null && post.containsKey(KEY_CURRENT_BLACKLIST) && post.containsKey(KEY_NEW_ENTRY)) {
 
             final String blacklistToUse = post.get(KEY_CURRENT_BLACKLIST, "").trim();
             final String entry = post.get(KEY_NEW_ENTRY, "").trim();
diff --git a/htroot/api/blacklists/delete_entry_p.json b/htroot/api/blacklists/delete_entry_p.json
new file mode 100644
index 000000000..1b14c1256
--- /dev/null
+++ b/htroot/api/blacklists/delete_entry_p.json
@@ -0,0 +1,3 @@
+{
+  "status":"#(status)#error::ok#(/status)#"
+}
\ No newline at end of file
diff --git a/htroot/api/blacklists/get_list_p.java b/htroot/api/blacklists/get_list_p.java
index 076cefc90..e8b498c17 100644
--- a/htroot/api/blacklists/get_list_p.java
+++ b/htroot/api/blacklists/get_list_p.java
@@ -13,6 +13,8 @@ import net.yacy.server.serverSwitch;
 
 public class get_list_p {
 
+    private static final BlacklistType[] BLACKLIST_TYPE_VALUES = BlacklistType.values();
+
     private static final String KEY_CURRENT_BLACKLIST = "list";
     private static final String ITEMS = "items";
     private static final String POSTFIX_ITEM = "_item";
@@ -23,9 +25,14 @@ public class get_list_p {
     private static final String PREFIX_TYPES = "types_";
     private static final String POSTFIX_VALUE = "_value";
     private static final String POSTFIX_NAME = "_name";
+    private static final String POSTFIX_COMMA = "_comma";
     private static final String TYPES_EXT = ".BlackLists";
     private static final String BLACK_LISTS_SHARED = "BlackLists.Shared";
 
+    private static final int lastTypeIndex = BLACKLIST_TYPE_VALUES.length - 1;
+    private static final String EMPTY_STRING = "";
+    private static final String COMMA_STRING = ",";
+
     public static serverObjects respond(@SuppressWarnings("unused") final RequestHeader header, final serverObjects post, @SuppressWarnings("unused") final serverSwitch env) {
        
         final serverObjects prop = new serverObjects();
@@ -34,7 +41,6 @@ public class get_list_p {
 
         final String blackListName = (post == null) ? "" : post.get(KEY_CURRENT_BLACKLIST, "");
 
-        int count;
         if (dirlist != null) {
             for (final String element : dirlist) {
                 if (element.equals(blackListName)) {
@@ -44,10 +50,17 @@ public class get_list_p {
                     prop.put(SHARED, ListManager.listSetContains(BLACK_LISTS_SHARED, element));
                     
                     int j = 0;
-                    for (final BlacklistType type : BlacklistType.values()) {
+                    for (final BlacklistType type : BLACKLIST_TYPE_VALUES) {
                         prop.putXML(PREFIX_TYPES + j + POSTFIX_NAME, type.toString());
                         prop.put(PREFIX_TYPES + j + POSTFIX_VALUE,
                                 ListManager.listSetContains(type + TYPES_EXT, element));
+                        
+                        if (j < lastTypeIndex) {
+                            prop.put(PREFIX_TYPES + j + POSTFIX_COMMA, COMMA_STRING);
+                        } else {
+                            prop.put(PREFIX_TYPES + j + POSTFIX_COMMA, EMPTY_STRING);
+                        }
+                        
                         j++;
                     }
                     prop.put(TYPES, BlacklistType.values().length);
@@ -56,12 +69,20 @@ public class get_list_p {
 
                     final Collection<String> list = FileUtils.getListArray(new File(ListManager.listsPath, element));
 
-                    count = 0;
+                    int count = 0;
+                    final int lastItemCount = list.size() - 1;
                     for (final String entry : list){
                         if (entry.isEmpty()) continue;
                         if (entry.charAt(0) == '#') continue;
 
                         prop.putXML(PREFIX_ITEMS + count + POSTFIX_ITEM, entry);
+                        
+                        if (count < lastItemCount) {
+                            prop.put(PREFIX_ITEMS + count + POSTFIX_COMMA, COMMA_STRING);
+                        } else {
+                            prop.put(PREFIX_ITEMS + count + POSTFIX_COMMA, EMPTY_STRING);
+                        }
+                        
                         count++;
                     }
                     prop.put(ITEMS, count);
diff --git a/htroot/api/blacklists/get_list_p.json b/htroot/api/blacklists/get_list_p.json
new file mode 100644
index 000000000..63bfcebab
--- /dev/null
+++ b/htroot/api/blacklists/get_list_p.json
@@ -0,0 +1,9 @@
+{
+  "name": "#[name]#",
+  "shared": "#[shared]#",
+  "types": [#{types}#{"#[name]#": "#[value]#"}#[comma]# #{/types}#]
+  "items":
+    [
+    #{items}#"#[item]#"#[comma]#
+    #{/items}#]
+}
\ No newline at end of file
diff --git a/htroot/api/blacklists/get_metadata_p.java b/htroot/api/blacklists/get_metadata_p.java
index 1753e3eb1..fcc27481c 100644
--- a/htroot/api/blacklists/get_metadata_p.java
+++ b/htroot/api/blacklists/get_metadata_p.java
@@ -12,43 +12,64 @@ import net.yacy.server.serverSwitch;
 
 public class get_metadata_p {
 
+    private static final BlacklistType[] BLACKLIST_TYPE_VALUES = BlacklistType.values();
+
     private static final String LISTS = "lists";
     private static final String POSTFIX_SHARED = "_shared";
     private static final String POSTFIX_TYPES = "_types";
     private static final String POSTFIX_VALUE = "_value";
     private static final String POSTFIX_NAME = "_name";
+    private static final String POSTFIX_COMMA = "_comma";
     private static final String TYPES_EXT = ".BlackLists";
     private static final String INFIX_TYPES = "_types_";
     private static final String PREFIX_LISTS = "lists_";
     private static final String BLACK_LISTS_SHARED = "BlackLists.Shared";
 
+    private static final int lastTypeIndex = BLACKLIST_TYPE_VALUES.length - 1;
+    private static final String EMPTY_STRING = "";
+    private static final String COMMA_STRING = ",";
+
     public static serverObjects respond(@SuppressWarnings("unused") final RequestHeader header, @SuppressWarnings("unused") final serverObjects post, @SuppressWarnings("unused") final serverSwitch env) {
-       
+
         final serverObjects prop = new serverObjects();
 
         final Collection<String> dirlist = FileUtils.getDirListing(ListManager.listsPath, Blacklist.BLACKLIST_FILENAME_FILTER);
-        int blacklistCount=0;
+        final int lastBlacklistCount = dirlist.size() - 1;
 
+        int blacklistCount = 0;
         if (dirlist != null) {
             for (final String element : dirlist) {
                 prop.putXML(PREFIX_LISTS + blacklistCount + POSTFIX_NAME, element);
 
                 prop.put(PREFIX_LISTS + blacklistCount + POSTFIX_SHARED, ListManager.listSetContains(BLACK_LISTS_SHARED, element));
-                
+
                 int j = 0;
-                for (final BlacklistType type : BlacklistType.values()) {
+                for (final BlacklistType type : BLACKLIST_TYPE_VALUES) {
                     prop.putXML(PREFIX_LISTS + blacklistCount + INFIX_TYPES + j + POSTFIX_NAME, type.toString());
                     prop.put(PREFIX_LISTS + blacklistCount + INFIX_TYPES + j + POSTFIX_VALUE,
                             ListManager.listSetContains(type + TYPES_EXT, element));
+
+                    if (j < lastTypeIndex) {
+                        prop.put(PREFIX_LISTS + blacklistCount + INFIX_TYPES + j + POSTFIX_COMMA, COMMA_STRING);
+                    } else {
+                        prop.put(PREFIX_LISTS + blacklistCount + INFIX_TYPES + j + POSTFIX_COMMA, EMPTY_STRING);
+                    }
+                    
                     j++;
                 }
-                prop.put(PREFIX_LISTS + blacklistCount + POSTFIX_TYPES, BlacklistType.values().length);
-                
+                prop.put(PREFIX_LISTS + blacklistCount + POSTFIX_TYPES, BLACKLIST_TYPE_VALUES.length);
+
+                if (blacklistCount < lastBlacklistCount) {
+                    prop.put(PREFIX_LISTS + blacklistCount + POSTFIX_COMMA, COMMA_STRING);
+                } else {
+                    prop.put(PREFIX_LISTS + blacklistCount + POSTFIX_COMMA, EMPTY_STRING);
+                }
+
                 blacklistCount++;
             }
         }
         prop.put(LISTS, blacklistCount);
-        
+
         return prop;
     }
 
diff --git a/htroot/api/blacklists/get_metadata_p.json b/htroot/api/blacklists/get_metadata_p.json
new file mode 100644
index 000000000..76a0291b6
--- /dev/null
+++ b/htroot/api/blacklists/get_metadata_p.json
@@ -0,0 +1,8 @@
+[
+  #{lists}#{
+    "name": "#[name]#",
+    "shared": "#[shared]#",
+    "types": [#{types}#{"#[name]#": "#[value]#"}#[comma]# #{/types}#]
+  }#[comma]#
+#{/lists}#
+]
\ No newline at end of file