- ConfigAdvanced_p => XHTML (no invalid IDs)

- removed unmappable characters from code

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

htroot/CacheAdmin_p.html

@@ -100,15 +100,17 @@
      <!-- TO-DO: CSS/XHTMLize end -->
    </div>::
    <div class="CacheAdminTree">
-     <p>
-       #(empty)#::[empty]#(/empty)#
-       #{treeFolders}#
-       <img src="/env/grafics/folderIconSmall.gif" align="top" alt="Folder" />
-       <a href="CacheAdmin_p.html?action=info&amp;path=#[path]#/#[name]#" class="tt"><nobr>#[name]#</nobr></a>#{/treeFolders}#
-       #{treeFiles}#
-       <img src="/env/grafics/fileIconSmall.gif" align="top" alt="File" />
-       <a href="CacheAdmin_p.html?action=info&amp;path=#[path]#/#[name]#" class="tt"><nobr>#[name]#</nobr></a>#{/treeFiles}#
-     </p>
+     #(empty)#::<p>[empty]</p>#(/empty)#
+     <ul class="tagList">#{treeFolders}#
+       <li>
+         <img src="/env/grafics/folderIconSmall.gif" alt="Folder" />
+         <a href="CacheAdmin_p.html?action=info&amp;path=#[path]#/#[name]#" class="tt">#[name]#</a>
+       </li>#{/treeFolders}#
+       <li>#{treeFiles}#
+         <img src="/env/grafics/fileIconSmall.gif" alt="File" />
+         <a href="CacheAdmin_p.html?action=info&amp;path=#[path]#/#[name]#" class="tt">#[name]#</a>
+       </li>#{/treeFiles}#
+     </ul>
    </div>
    #(/info)#
    #%env/templates/footer.template%#

htroot/ConfigAdvanced_p.html

@@ -6,7 +6,7 @@
     <script type="text/javascript">
       <!--
       function element_clicked(element){
-        document.getElementById("key").value=element.id;
+        document.getElementById("key").value=element.id.substring(1);
         document.getElementById("value").value=element.value;
       }
       -->
@@ -28,7 +28,7 @@
   </p>
   <select name="options" size="25" style="width: 600px">
     #{options}#
-    <option id="#[key]#" value="#[value]#" onclick="element_clicked(this)">#[key]#: #[value]#</option>
+    <option id="k#[key]#" value="#[value]#" onclick="element_clicked(this)">#[key]#: #[value]#</option>
     #{/options}#
   </select><br />
   <form action="Config_p.html" method="post">

htroot/xml/queues_p.java

@@ -109,7 +109,8 @@ public class queues_p {
                 }
                 int size = (post == null) ? entryList.size() : post.getInt("num", entryList.size());
                 if (size > entryList.size()) size = entryList.size();
-
+                
+                int ok = 0;
                 for (i = 0; i < size; i++) {
                     boolean inProcess = i < inProcessCount;
                     pcentry = (plasmaSwitchboardQueue.Entry) entryList.get(i);
@@ -117,7 +118,7 @@ public class queues_p {
                     totalSize += entrySize;
                     if ((pcentry != null)&&(pcentry.url() != null)) {
                         initiator = yacyCore.seedDB.getConnected(pcentry.initiator());
-                        prop.put("list-indexing_"+i+"_profile", pcentry.profile().name());
+                        prop.put("list-indexing_"+i+"_profile", (pcentry.profile() != null) ? pcentry.profile().name() : "deleted");
                         prop.putNoHTML("list-indexing_"+i+"_initiator", ((initiator == null) ? "proxy" : wikiCode.replaceHTML(initiator.getName())));
                         prop.put("list-indexing_"+i+"_depth", pcentry.depth());
                         prop.put("list-indexing_"+i+"_modified", pcentry.getModificationDate());
@@ -126,9 +127,10 @@ public class queues_p {
                         prop.put("list-indexing_"+i+"_size", entrySize);
                         prop.put("list-indexing_"+i+"_inProcess", (inProcess)?1:0);
                         prop.put("list-indexing_"+i+"_hash", pcentry.urlHash());
+                        ok++;
                     }
                 }
-                prop.put("list-indexing", i);
+                prop.put("list-indexing", ok);
             } catch (IOException e) {}
         }
         

source/de/anomic/server/logging/logParsers/LogParserPLASMA.java

@@ -62,7 +62,7 @@ public class LogParserPLASMA implements LogParser{
     private static Pattern i9 = Pattern.compile("RankingDistribution - transmitted file [\\w-:.\\\\]* to [\\w.]*:\\d* successfully in (\\d)* seconds");
     private static Pattern i10 = Pattern.compile("RankingDistribution - error transmitting file");
     private static Pattern i11 = Pattern.compile("Peer [\\w-_]*:[\\w-_]{12} is busy\\. Waiting \\d* ms\\.");
-    //private static Pattern i12 = Pattern.compile("\\*Indexed \\d* words in URL [\\w:.&?/%-~$§@=]* \\[[\\w-_]{12}\\]");
+    //private static Pattern i12 = Pattern.compile("\\*Indexed \\d* words in URL [\\w:.&?/%-~$§@=]* \\[[\\w-_]{12}\\]");
     private static Pattern i13 = Pattern.compile("WROTE HEADER for |LOCALCRAWL\\[\\d*, \\d*, \\d*, \\d*\\]|REJECTED WRONG STATUS TYPE");
     //RegExp for LogLevel W
     private static Pattern w1 = Pattern.compile("found not enough \\(\\d*\\) peers for distribution");
@@ -74,7 +74,7 @@ public class LogParserPLASMA implements LogParser{
     private Matcher m;
     //RegExp for advancedParser
     //private Pattern adv1 = Pattern.compile("\\*Indexed (\\d*) words in URL [\\w:.&?/%-=]* \\[[\\w-_]{12}\\]\\n\\tDescription: ([\\w- ]*)\\n\\tMimeType: ([\\w-_/]*) \\| Size: (\\d*) bytes \\| Anchors: (\\d*)\\n\\tStackingTime: (\\d*) ms \\| ParsingTime: (\\d*) ms \\| IndexingTime: (\\d*) ms \\| StorageTime: (\\d*) ms");
-    private Pattern adv1 = Pattern.compile("\\*Indexed (\\d*) words in URL [\\w:.&?/%-~$§@=]* \\[[\\w-_]{12}\\][\\r\\n]*\\tDescription: ([\\w-\\.,:!?='\"|/+@() ]*)[\\r\\n]*\\tMimeType: ([\\w-_~/]*) \\| Size: (\\d*) bytes \\| Anchors: (\\d*)[\\r\\n]*\\tStackingTime:[ ]*(\\d*) ms \\| ParsingTime:[ ]*(\\d*) ms \\| IndexingTime: (\\d*) ms \\| StorageTime: (\\d*) ms");
+    private Pattern adv1 = Pattern.compile("\\*Indexed (\\d*) words in URL [\\w:.&?/%-~$§@=]* \\[[\\w-_]{12}\\][\\r\\n]*\\tDescription: ([\\w-\\.,:!?='\"|/+@() ]*)[\\r\\n]*\\tMimeType: ([\\w-_~/]*) \\| Size: (\\d*) bytes \\| Anchors: (\\d*)[\\r\\n]*\\tStackingTime:[ ]*(\\d*) ms \\| ParsingTime:[ ]*(\\d*) ms \\| IndexingTime: (\\d*) ms \\| StorageTime: (\\d*) ms");
 
     private int urlSum=0;
     private int urlReqSum=0;

source/de/anomic/server/serverCore.java

@@ -427,7 +427,7 @@ public final class serverCore extends serverAbstractThread implements serverThre
             address.startsWith("192.168") ||
             address.startsWith("10.")     ||
             address.startsWith("169.254") ||
-            // 172.16.0.0–172.31.255.255 (I think this is faster than a regex)
+            // 172.16.0.0-172.31.255.255 (I think this is faster than a regex)
             (address.startsWith("172.") && ( 
              address.startsWith("172.16.") || address.startsWith("172.17.") ||
              address.startsWith("172.18.") || address.startsWith("172.19.") ||