sorting of crawl profile names in crawl profile editor, see

http://forum.yacy-websuche.de/viewtopic.php?p=20851#p20851 git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@7172 6c8d7289-2bf4-0310-a012-ef5d649a1542
yacy · Sep 20, 2010 · 377f001 · 377f001
1 parent 3552476
commit 377f001
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/htroot/CrawlProfileEditor_p.java b/htroot/CrawlProfileEditor_p.java
@@ -30,6 +30,7 @@
 import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
+import java.util.TreeMap;
 
 import net.yacy.cora.protocol.RequestHeader;
 import net.yacy.kelondro.index.RowSpaceExceededException;
@@ -127,17 +128,20 @@ public static serverObjects respond(final RequestHeader header, final serverObje
             }
         }
 
-        // generate handle list
-        int count = 0;
+        // generate handle list: first sort by handle name
         CrawlProfile selentry;
+        TreeMap<String, String> orderdHandles = new TreeMap<String, String>();
         for (byte[] h: sb.crawler.profilesActiveCrawls.keySet()) {
             selentry = new CrawlProfile(sb.crawler.profilesActiveCrawls.get(h));
-            if (ignoreNames.contains(selentry.name())) {
-                continue;
-            }
-            prop.put("profiles_" + count + "_name", selentry.name());
-            prop.put("profiles_" + count + "_handle", selentry.handle());
-            if (handle.equals(selentry.handle())) {
+            if (ignoreNames.contains(selentry.name())) continue;
+            orderdHandles.put(selentry.name(), selentry.handle());
+        }
+        // then write into pop-up menu list
+        int count = 0;
+        for (Map.Entry<String, String> NameHandle: orderdHandles.entrySet()) {
+            prop.put("profiles_" + count + "_name", NameHandle.getKey());
+            prop.put("profiles_" + count + "_handle", NameHandle.getValue());
+            if (handle.equals(NameHandle.getValue())) {
                 prop.put("profiles_" + count + "_selected", "1");
             }
             count++;

diff --git a/source/de/anomic/yacy/graphics/NetworkGraph.java b/source/de/anomic/yacy/graphics/NetworkGraph.java
@@ -259,8 +259,6 @@ private static RasterPlotter drawNetworkPicture(final yacySeedDB seedDB, final i
                 }
             }
             for (Hit event: yacyChannel.channels(yacyChannel.DHTSEND)) {
-                assert event != null;
-                assert event.getPubDate() != null;
                 if (event == null || event.getPubDate() == null) continue;
                 if (event.getPubDate().after(horizon)) {
                     //System.out.println("*** NETWORK-DHTSEND: " + event.getLink());