media stuff

diff --git a/bundles/admin_de.properties b/bundles/admin_de.properties
index f0355bc..43b898f 100755 (executable)
--- a/bundles/admin_de.properties
+++ b/bundles/admin_de.properties
@@ -219,7 +219,9 @@ start.generate.content.new=neuer content
 start.generate.topics.new=neue themen
 start.generate.postings.new=neue openpostings
 start.generate.images.new=neue bilder
-start.generate.wap.new=neues wap
+start.generate.audio.new=neue audio dateien
+start.generate.video.new=neue video dateien
+start.generate.other.new=neue andere medien
 start.generate.navigation=Navigation
 start.coverage.title=SCHWERPUNKTEs
 start.topics.title=THEMEN

diff --git a/bundles/admin_en.properties b/bundles/admin_en.properties
index 5194702..d5eaad1 100755 (executable)
--- a/bundles/admin_en.properties
+++ b/bundles/admin_en.properties
@@ -219,7 +219,9 @@ start.generate.content.new=new content
 start.generate.topics.new=new topics
 start.generate.postings.new=new openpostings
 start.generate.images.new=new images
-start.generate.wap.new=new wap
+start.generate.audio.new=new audio files
+start.generate.video.new=new video files
+start.generate.other.new=new other media
 start.generate.navigation=navigation
 start.coverage.title=COVERAGE
 start.topics.title=TOPICS

diff --git a/source/mircoders/servlet/ServletModuleLinksImcs.java b/source/mircoders/servlet/ServletModuleLinksImcs.java
index 37cdad2..78752d9 100755 (executable)
--- a/source/mircoders/servlet/ServletModuleLinksImcs.java
+++ b/source/mircoders/servlet/ServletModuleLinksImcs.java
@@ -1,23 +1,25 @@
 package mircoders.servlet;
 
-import java.io.*;
-import java.sql.*;
-import java.util.*;
-import java.net.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
-
-import freemarker.template.*;
-
-import mir.servlet.*;
-import mir.module.*;
-import mir.misc.*;
-import mir.entity.*;
-import mir.storage.*;
-
-import mircoders.entity.*;
-import mircoders.storage.*;
-import mircoders.module.*;
+import freemarker.template.SimpleHash;
+import mir.entity.EntityList;
+import mir.misc.HTMLParseException;
+import mir.misc.HTMLTemplateProcessor;
+import mir.misc.Logfile;
+import mir.misc.MirConfig;
+import mir.module.ModuleException;
+import mir.servlet.ServletModule;
+import mir.servlet.ServletModuleException;
+import mir.storage.StorageObjectException;
+import mircoders.module.ModuleLanguage;
+import mircoders.module.ModuleLinksImcs;
+import mircoders.storage.DatabaseLanguage;
+import mircoders.storage.DatabaseLinksImcs;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.net.URLEncoder;
 
 /*
  *  ServletModuleLinksImcs -
@@ -27,13 +29,15 @@ import mircoders.module.*;
  * @author RK
  */
 
-public class ServletModuleLinksImcs extends ServletModule
-{
+public class ServletModuleLinksImcs extends ServletModule {
   private ModuleLanguage languageModule;
 
   // Singelton / Kontruktor
   private static ServletModuleLinksImcs instance = new ServletModuleLinksImcs();
-  public static ServletModule getInstance() { return instance; }
+
+  public static ServletModule getInstance() {
+    return instance;
+  }
 
 
   private ServletModuleLinksImcs() {
@@ -45,124 +49,134 @@ public class ServletModuleLinksImcs extends ServletModule
     try {
       mainModule = new ModuleLinksImcs(DatabaseLinksImcs.getInstance());
       languageModule = new ModuleLanguage(DatabaseLanguage.getInstance());
-    } catch (StorageObjectException e) {
+    }
+    catch (StorageObjectException e) {
       theLog.printDebugInfo("ServletModuleLinksImcs konnte nicht initialisiert werden");
     }
   }
 
   public void add(HttpServletRequest req, HttpServletResponse res)
-    throws ServletModuleException {
+          throws ServletModuleException {
     try {
       SimpleHash modelRoot = new SimpleHash();
-      EntityList   theParentList;
-      EntityList   theLanguageList;
+      EntityList theParentList;
+      EntityList theLanguageList;
       int offset = 0;
 
       theParentList = mainModule.getByWhereClause("to_parent_id=NULL", "title", offset, 1000);
       theLanguageList = languageModule.getByWhereClause(null, "name", 0);
 
       modelRoot.put("new", "1");
-      modelRoot.put("parentlist",theParentList);
-      modelRoot.put("languagelist",theLanguageList);
+      modelRoot.put("parentlist", theParentList);
+      modelRoot.put("languagelist", theLanguageList);
 
-      if (theParentList == null || theParentList.getCount() == 0 || theParentList.getCount()>1){
+      if (theParentList == null || theParentList.getCount() == 0 || theParentList.getCount() > 1) {
         HTMLTemplateProcessor.process(res, templateObjektString, modelRoot, res.getWriter(), getLocale(req));
-      } else {
+      }
+      else {
         deliver(req, res, modelRoot, templateObjektString);
       }
 
-    } catch(ModuleException e) {
+    }
+    catch (ModuleException e) {
       throw new ServletModuleException(e.toString());
-    } catch (HTMLParseException e) {
+    }
+    catch (HTMLParseException e) {
       throw new ServletModuleException(e.toString());
-    } catch (IOException e) {
+    }
+    catch (IOException e) {
       throw new ServletModuleException(e.toString());
     }
   }
 
   public void list(HttpServletRequest req, HttpServletResponse res)
-    throws ServletModuleException {
+          throws ServletModuleException {
     try {
 
-      SimpleHash   modelRoot = new SimpleHash();
-      EntityList   theParentList;
-      EntityList   theImcsList;
-      EntityList   theLanguageList;
-      String       offsetParam = req.getParameter("offset");
-      String       where = "";
-      String       offset = "";
-      PrintWriter  out = res.getWriter();
+      SimpleHash modelRoot = new SimpleHash();
+      EntityList theParentList;
+      EntityList theImcsList;
+      EntityList theLanguageList;
+      String offsetParam = req.getParameter("offset");
+      String where = "";
+      String offset = "";
+      PrintWriter out = res.getWriter();
 
       // Parameter auswerten
       String query_text = req.getParameter("query_text");
-      modelRoot.put("query_text",query_text);
-      if (query_text!=null) modelRoot.put("query_text_encoded",URLEncoder.encode(query_text));
+      modelRoot.put("query_text", query_text);
+      if (query_text != null) modelRoot.put("query_text_encoded", URLEncoder.encode(query_text));
       String query_field = req.getParameter("query_field");
-                       modelRoot.put("query_field",query_field);
+      modelRoot.put("query_field", query_field);
       String parent = req.getParameter("to_parent_id");
-                       modelRoot.put("to_parent_id",parent);
+      modelRoot.put("to_parent_id", parent);
       String language = req.getParameter("to_language");
-                       modelRoot.put("to_language",language);
+      modelRoot.put("to_language", language);
       modelRoot.put("language", getLanguage(req));
 
-      String whereClause=""; boolean isFirst=true;
-                       if (query_text!=null && !query_text.equalsIgnoreCase("")) {
-                               whereClause += "lower("+query_field+") like lower('%"+query_text+"%')"; isFirst=false;}
-                       if (parent != null && !parent.equals("")) {
-                               if (isFirst==false) whereClause+=" and ";
-                               whereClause += "to_parent_id='"+parent+"'";
-                               isFirst=false;
-                       }
+      String whereClause = "";
+      boolean isFirst = true;
+      if (query_text != null && !query_text.equalsIgnoreCase("")) {
+        whereClause += "lower(" + query_field + ") like lower('%" + query_text + "%')";
+        isFirst = false;
+      }
+      if (parent != null && !parent.equals("")) {
+        if (isFirst == false) whereClause += " and ";
+        whereClause += "to_parent_id='" + parent + "'";
+        isFirst = false;
+      }
       if (language != null && !language.equals("")) {
-                               if (isFirst==false) whereClause+=" and ";
-                               whereClause += "to_language='"+language+"'";
-                               isFirst=false;
-                       }
+        if (isFirst == false) whereClause += " and ";
+        whereClause += "to_language='" + language + "'";
+        isFirst = false;
+      }
 
       // hier offsetcode bearbeiten
-      if (offsetParam != null && !offsetParam.equals("")){
+      if (offsetParam != null && !offsetParam.equals("")) {
         offset = offsetParam;
       }
-      if (req.getParameter("next") != null){
-          offset= req.getParameter("nextoffset");
-      } else {
-          if (req.getParameter("prev") != null){
-            offset = req.getParameter("prevoffset");
-          }
+      if (req.getParameter("next") != null) {
+        offset = req.getParameter("nextoffset");
+      }
+      else {
+        if (req.getParameter("prev") != null) {
+          offset = req.getParameter("prevoffset");
+        }
       }
 
-                       if (offset==null || offset.equals("")) offset="0";
-                       modelRoot.put("offset",(new Integer(offset)).toString());
+      if (offset == null || offset.equals("")) offset = "0";
+      modelRoot.put("offset", (new Integer(offset)).toString());
 
       theParentList = mainModule.getByWhereClause("to_parent_id=NULL", "title", 0, 1000);
       theImcsList = mainModule.getByWhereClause(whereClause, "title", (new Integer(offset)).intValue());
       theLanguageList = languageModule.getByWhereClause(null, "name", 0);
 
-      modelRoot.put("parentlist",theParentList);
-      modelRoot.put("imcslist",theImcsList);
-      modelRoot.put("languagelist",theLanguageList);
+      modelRoot.put("parentlist", theParentList);
+      modelRoot.put("imcslist", theImcsList);
+      modelRoot.put("languagelist", theLanguageList);
       modelRoot.put("count", (new Integer(theImcsList.getCount())).toString());
-                       modelRoot.put("from", (new Integer(theImcsList.getFrom())).toString());
-                       modelRoot.put("to", (new Integer(theImcsList.getTo())).toString());
+      modelRoot.put("from", (new Integer(theImcsList.getFrom())).toString());
+      modelRoot.put("to", (new Integer(theImcsList.getTo())).toString());
       if (theImcsList.hasNextBatch())
-                               modelRoot.put("next", (new Integer(theImcsList.getNextBatch())).toString());
-                       if (theImcsList.hasPrevBatch())
-                               modelRoot.put("prev", (new Integer(theImcsList.getPrevBatch())).toString());
+        modelRoot.put("next", (new Integer(theImcsList.getNextBatch())).toString());
+      if (theImcsList.hasPrevBatch())
+        modelRoot.put("prev", (new Integer(theImcsList.getPrevBatch())).toString());
 
       HTMLTemplateProcessor.process(res, templateListString, modelRoot, res.getWriter(), getLocale(req));
 
-      } catch (Exception e) {
+    }
+    catch (Exception e) {
       throw new ServletModuleException(e.toString());
     }
   }
 
   public void edit(HttpServletRequest req, HttpServletResponse res)
-    throws ServletModuleException {
+          throws ServletModuleException {
     try {
 
       SimpleHash modelRoot = new SimpleHash();
-      EntityList   parentList;
-      EntityList   theLanguageList;
+      EntityList parentList;
+      EntityList theLanguageList;
       int offset = 0;
       String idParam = req.getParameter("id");
       String where = "";
@@ -170,12 +184,14 @@ public class ServletModuleLinksImcs extends ServletModule
       parentList = mainModule.getByWhereClause("to_parent_id=NULL", "title", offset, 1000);
       theLanguageList = languageModule.getByWhereClause(null, "name", 0);
 
-      modelRoot.put("parentlist",parentList);
-      modelRoot.put("languagelist",theLanguageList);
+      modelRoot.put("parentlist", parentList);
+      modelRoot.put("languagelist", theLanguageList);
       modelRoot.put("entity", mainModule.getById(idParam));
+      modelRoot.put("new", "0");
       deliver(req, res, modelRoot, templateObjektString);
 
-    } catch(ModuleException e) {
+    }
+    catch (ModuleException e) {
       throw new ServletModuleException(e.toString());
     }
   }

diff --git a/templates-dist/admin/linksimcs.template b/templates-dist/admin/linksimcs.template
index 6a9c547..490f2f4 100755 (executable)
--- a/templates-dist/admin/linksimcs.template
+++ b/templates-dist/admin/linksimcs.template
@@ -9,7 +9,7 @@ ${lang("linkimcs.htmltitle")}
 <include "admin/head.template">
 <form action="${config.actionRoot}" method="post">
        <input type=hidden name=module value=LinksImcs>
-       <input type="hidden" name="id" value=<if data.entity>"${entity.id}"<else>"${data.id}"</if>>
+       <input type="hidden" name="id" value="${data.entity.id}">
        <if data.new><input type="hidden" name="do" value="insert">
        <else><input type="hidden" name="do" value="update"></if>
 <table border="0">
@@ -17,17 +17,17 @@ ${lang("linkimcs.htmltitle")}
     <td align="right" bgcolor="#006600"><font face="Verdana, Arial, Helvetica, sans-serif" size="-1" color="#ffffff">
                <B>${lang("linkimcs.name")}:</B></font></td>
     <td>
-       <input type="text" size="40" name="title" value=<if data.entity>"${data.entity.title}"<else>"${data.title}"</if>>
+       <input type="text" size="40" name="title" value="${data.entity.title}">
     </td>
   </tr>
   <tr>
     <td align="right" bgcolor="#006600"><font face="Verdana, Arial, Helvetica, sans-serif" size="-1" color="#ffffff">
-               <B>${lang("linkimcs.continent")}Kontinent:</B></font></td>
+               <B>${lang("linkimcs.continent")}:</B></font></td>
     <td>
                <if data.parentlist>
        <select name="to_parent_id" size="1">
                        <option value=NULL> ${lang("linkimcs.new_parent")}
-                       <list data.parentlist as entry><option value="${entry.id}"<if entry.id == entity.to_parent_id> selected</if>> ${entry.title}</list>
+                       <list data.parentlist as entry><option value="${entry.id}"<if entry.id == data.entity.to_parent_id> selected</if>> ${entry.title}</list>
                </select>
                </if>
     </td>
@@ -35,7 +35,7 @@ ${lang("linkimcs.htmltitle")}
   <tr>
     <td align="right" bgcolor="#006600"><font color="#ffffff"><B>${lang("linkimcs.url")}:</B></font></td>
     <td>
-      <input type="text" size="40" name="url" value=<if entity>"${entity.url}"<else>"${url}"</if>>
+      <input type="text" size="40" name="url" value="${data.entity.url}">
     </td>
   </tr>
   <tr>

diff --git a/templates-dist/admin/start_admin.template b/templates-dist/admin/start_admin.template
index 7ac10f0..24dd61d 100755 (executable)
--- a/templates-dist/admin/start_admin.template
+++ b/templates-dist/admin/start_admin.template
@@ -131,12 +131,22 @@
                        <img src="${config.docRoot}/img/pointgris.gif" border=0>${lang("start.generate.images.new")}</a>
                                &nbsp;|&nbsp;
                                <a href="${config.actionRoot}?module=Producer&task=Images&forced=1">${lang("start.generate.all_forced")}</a>
-
-                               <br>
-                               <a href="${config.actionRoot}?module=Producer&task=Wap">
-                       <img src="${config.docRoot}/img/pointgris.gif" border=0>${lang("start.generate.wap.new")}</a>
+                <br>
+                               <a href="${config.actionRoot}?module=Producer&task=Audio">
+                       <img src="${config.docRoot}/img/pointgris.gif" border=0>${lang("start.generate.audio.new")}</a>
+                               &nbsp;|&nbsp;
+                               <a href="${config.actionRoot}?module=Producer&task=Audio&forced=1">${lang("start.generate.all_forced")}</a>
+<br>
+                               <a href="${config.actionRoot}?module=Producer&task=Video">
+                       <img src="${config.docRoot}/img/pointgris.gif" border=0>${lang("start.generate.video.new")}</a>
                                &nbsp;|&nbsp;
-                               <a href="${config.actionRoot}?module=Producer&task=Wap&forced=1">${lang("start.generate.all_forced")}</a>
+                               <a href="${config.actionRoot}?module=Producer&task=Video&forced=1">${lang("start.generate.all_forced")}</a>
+<br>
+                               <a href="${config.actionRoot}?module=Producer&task=Other">
+                       <img src="${config.docRoot}/img/pointgris.gif" border=0>${lang("start.generate.other.new")}</a>
+                               &nbsp;|&nbsp;
+                               <a href="${config.actionRoot}?module=Producer&task=Other&forced=1">${lang("start.generate.all_forced")}</a>
+
                                <br>
         <a href="${config.actionRoot}?module=Producer&task=Navigation">
                        <img src="${config.docRoot}/img/pointgris.gif" border=0>${lang("start.generate.navigation")}</a>