diff --git a/htroot/Collage.html b/htroot/Collage.html index 5ab3d80b6..753c91f26 100755 --- a/htroot/Collage.html +++ b/htroot/Collage.html @@ -1,18 +1,44 @@ - - YaCy '#[clientname]#': Collage - #%env/templates/metas.template%# - - - - #%env/templates/header.template%# - #(imgurl)# - :: - #{list}# - #[url]# - #{/list}# - #(/imgurl)# - #%env/templates/footer.template%# - + +YaCy '#[clientname]#': Collage +#%env/templates/metas.template%# + + + +#%env/templates/header.template%# +#%env/templates/submenuWebStructure.template%# +

Collage

+ +
+
+
+
Private Queue
+
#[privateQueueSize]#
+
Public Queue
+
#[publicQueueSize]#
+
+
+
+ +#(imgurl)# +:: + #{list}# + #[url]# + #{/list}# +#(/imgurl)# +#%env/templates/footer.template%# + \ No newline at end of file diff --git a/htroot/Collage.java b/htroot/Collage.java index b82b1dadb..e27fefba7 100755 --- a/htroot/Collage.java +++ b/htroot/Collage.java @@ -60,11 +60,11 @@ public class Collage { private static Integer imgPosX[] = new Integer[fifoMax]; private static Integer imgPosY[] = new Integer[fifoMax]; private static long imgZIndex[] = new long[fifoMax]; - + private static final Random rand = new Random(); + public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch env) { final serverObjects prop = new serverObjects(); final plasmaSwitchboard sb = (plasmaSwitchboard) env; - Random rand = new Random(); final boolean authenticated = sb.adminAuthenticated(header) >= 2; collageQueue.ImageOriginEntry nextOrigin = collageQueue.next(!authenticated); @@ -105,6 +105,8 @@ public class Collage { prop.put("imgurl", "0"); } + prop.putNum("privateQueueSize", collageQueue.privateQueueSize()); + prop.putNum("publicQueueSize", collageQueue.publicQueueSize()); return prop; } } \ No newline at end of file diff --git a/htroot/env/templates/submenuWebStructure.template b/htroot/env/templates/submenuWebStructure.template index 9d46ab7ac..6487fb7ef 100644 --- a/htroot/env/templates/submenuWebStructure.template +++ b/htroot/env/templates/submenuWebStructure.template @@ -2,6 +2,7 @@

Web Visualization

\ No newline at end of file diff --git a/source/de/anomic/data/collageQueue.java b/source/de/anomic/data/collageQueue.java index 553400c07..dc6369cf7 100755 --- a/source/de/anomic/data/collageQueue.java +++ b/source/de/anomic/data/collageQueue.java @@ -81,6 +81,14 @@ public class collageQueue { return e; } + public static int privateQueueSize() { + return privateImageQueue.size(); + } + + public static int publicQueueSize() { + return publicImageQueue.size(); + } + public static class ImageOriginEntry { public htmlFilterImageEntry imageEntry; public yacyURL baseURL; diff --git a/source/de/anomic/plasma/plasmaSwitchboard.java b/source/de/anomic/plasma/plasmaSwitchboard.java index 847ebd91f..97513eaad 100644 --- a/source/de/anomic/plasma/plasmaSwitchboard.java +++ b/source/de/anomic/plasma/plasmaSwitchboard.java @@ -2129,7 +2129,7 @@ public final class plasmaSwitchboard extends serverAbstractSwitch