popups in list

diff --git a/source/mircoders/servlet/ServletModuleUploadedMedia.java b/source/mircoders/servlet/ServletModuleUploadedMedia.java
index d304d6e..7fd35bc 100755 (executable)
--- a/source/mircoders/servlet/ServletModuleUploadedMedia.java
+++ b/source/mircoders/servlet/ServletModuleUploadedMedia.java
@@ -206,69 +206,74 @@ public abstract class ServletModuleUploadedMedia
 
   public void list(HttpServletRequest req, HttpServletResponse res)
   throws ServletModuleException {
-      // Parameter auswerten
-      SimpleHash mergeData = new SimpleHash();
-      String query_text = req.getParameter("query_text");
-      mergeData.put("query_text",query_text);
-      if (query_text!=null) mergeData.put("query_text_encoded",URLEncoder.encode(query_text));
-      String query_field = req.getParameter("query_field");
-      mergeData.put("query_field",query_field);
-      String query_is_published = req.getParameter("query_is_published");
-      mergeData.put("query_is_published",query_is_published);
-      String query_media_folder = req.getParameter("query_media_folder");
-      mergeData.put("query_media_folder",query_media_folder);
-      String offset = req.getParameter("offset");
-      if (offset==null || offset.equals("")) offset="0";
-      mergeData.put("offset",offset);
-
-      String order = req.getParameter("order");
-      if (order==null) order="webdb_lastchange desc";
-
-      // if in connection mode to content
-      String cid = req.getParameter("cid");
-      mergeData.put("cid",cid);
-
-
-      // sql basteln
-      String whereClause=""; boolean isFirst=true;
-      if (query_text!=null && !query_text.equalsIgnoreCase("")) {
-        whereClause += "lower("+query_field+") like lower('%"+query_text+"%')"; isFirst=false;}
-      if (query_is_published != null && !query_is_published.equals("")) {
-        if (isFirst==false) whereClause+=" and ";
-        whereClause += "is_published='"+query_is_published+"'";
-        isFirst=false;
-      }
-      if (query_media_folder != null && !query_media_folder.equals("")) {
-        if (isFirst==false) whereClause+=" and ";
-        whereClause += "to_media_folder='"+query_media_folder+"'";
-      }
-      //theLog.printDebugInfo("sql-whereclause: " + whereClause + " order: " + order + " offset: " + offset);
-
-      // fetch und ausliefern
-      try {
-        if (query_text!=null || query_is_published!=null || query_media_folder!=null) {
-          EntityList theList = mainModule.getByWhereClause(whereClause, order, (new Integer(offset)).intValue(),10);
-          if (theList != null) {
-            mergeData.put("contentlist",theList);
-            if(theList.getOrder()!=null) {
-              mergeData.put("order", theList.getOrder());
-              mergeData.put("order_encoded", URLEncoder.encode(theList.getOrder()));
-            }
-            mergeData.put("count", (new Integer(theList.getCount())).toString());
-            mergeData.put("from", (new Integer(theList.getFrom())).toString());
-            mergeData.put("to", (new Integer(theList.getTo())).toString());
-            if (theList.hasNextBatch())
-              mergeData.put("next", (new Integer(theList.getNextBatch())).toString());
-            if (theList.hasPrevBatch())
-              mergeData.put("prev", (new Integer(theList.getPrevBatch())).toString());
-          }
-        }
-        // raus damit
-        HTMLTemplateProcessor.process(res, templateListString, mergeData, res.getWriter(), getLocale(req));
-      }
-      catch (ModuleException e) {throw new ServletModuleException(e.toString());}
-      catch (IOException e) {throw new ServletModuleException(e.toString());}
-      catch (Exception e) {throw new ServletModuleException(e.toString());}
+    // Parameter auswerten
+    SimpleHash mergeData = new SimpleHash();
+               SimpleHash popups = new SimpleHash();
+               
+               String query_text = req.getParameter("query_text");
+               mergeData.put("query_text",query_text);
+               if (query_text!=null) mergeData.put("query_text_encoded",URLEncoder.encode(query_text));
+               String query_field = req.getParameter("query_field");
+               mergeData.put("query_field",query_field);
+               String query_is_published = req.getParameter("query_is_published");
+               mergeData.put("query_is_published",query_is_published);
+               String query_media_folder = req.getParameter("query_media_folder");
+               mergeData.put("query_media_folder",query_media_folder);
+               String offset = req.getParameter("offset");
+               if (offset==null || offset.equals("")) offset="0";
+               mergeData.put("offset",offset);
+
+               String order = req.getParameter("order");
+               if (order==null) order="webdb_lastchange desc";
+
+               // if in connection mode to content
+               String cid = req.getParameter("cid");
+               mergeData.put("cid",cid);
+
+
+               // sql basteln
+               String whereClause=""; boolean isFirst=true;
+               if (query_text!=null && !query_text.equalsIgnoreCase("")) {
+                       whereClause += "lower("+query_field+") like lower('%"+query_text+"%')"; isFirst=false;}
+               if (query_is_published != null && !query_is_published.equals("")) {
+                       if (isFirst==false) whereClause+=" and ";
+                       whereClause += "is_published='"+query_is_published+"'";
+                       isFirst=false;
+               }
+               if (query_media_folder != null && !query_media_folder.equals("")) {
+                       if (isFirst==false) whereClause+=" and ";
+                       whereClause += "to_media_folder='"+query_media_folder+"'";
+               }
+               //theLog.printDebugInfo("sql-whereclause: " + whereClause + " order: " + order + " offset: " + offset);
+
+               // fetch und ausliefern
+               try {
+                       if (query_text!=null || query_is_published!=null || query_media_folder!=null) {
+                               EntityList theList = mainModule.getByWhereClause(whereClause, order, (new Integer(offset)).intValue(),10);
+                               if (theList != null) {
+                                       mergeData.put("contentlist",theList);
+                                       if(theList.getOrder()!=null) {
+                                               mergeData.put("order", theList.getOrder());
+                                               mergeData.put("order_encoded", URLEncoder.encode(theList.getOrder()));
+                                       }
+                                       mergeData.put("count", (new Integer(theList.getCount())).toString());
+                                       mergeData.put("from", (new Integer(theList.getFrom())).toString());
+                                       mergeData.put("to", (new Integer(theList.getTo())).toString());
+                                       if (theList.hasNextBatch())
+                                               mergeData.put("next", (new Integer(theList.getNextBatch())).toString());
+                                       if (theList.hasPrevBatch())
+                                               mergeData.put("prev", (new Integer(theList.getPrevBatch())).toString());
+                               }
+                               //fetch the popups
+                               popups.put("mediafolderPopupData",DatabaseMediafolder.getInstance().getPopupData());
+                       }
+                       // raus damit
+                       deliver(req, res, mergeData, popups, templateListString);
+               } catch (ModuleException e) {
+                       throw new ServletModuleException(e.toString());
+               } catch (Exception e) {
+                       throw new ServletModuleException(e.toString());
+               }
   }