firstImage etc
[mir.git] / source / mircoders / localizer / basic / MirBasicDataModelLocalizer.java
index da5d8be..e48c04a 100755 (executable)
-/*
- * Copyright (C) 2001, 2002  The Mir-coders group
- *
- * This file is part of Mir.
- *
- * Mir is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * Mir is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mir; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * In addition, as a special exception, The Mir-coders gives permission to link
- * the code of this program with the com.oreilly.servlet library, any library
- * licensed under the Apache Software License, The Sun (tm) Java Advanced
- * Imaging library (JAI), The Sun JIMI library (or with modified versions of
- * the above that use the same license as the above), and distribute linked
- * combinations including the two.  You must obey the GNU General Public
- * License in all respects for all of the code used other than the above
- * mentioned libraries.  If you modify this file, you may extend this exception
- * to your version of the file, but you are not obligated to do so.  If you do
- * not wish to do so, delete this exception statement from your version.
- */
-
+/*\r
+ * Copyright (C) 2001, 2002 The Mir-coders group\r
+ *\r
+ * This file is part of Mir.\r
+ *\r
+ * Mir is free software; you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation; either version 2 of the License, or\r
+ * (at your option) any later version.\r
+ *\r
+ * Mir is distributed in the hope that it will be useful,\r
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
+ * GNU General Public License for more details.\r
+ *\r
+ * You should have received a copy of the GNU General Public License\r
+ * along with Mir; if not, write to the Free Software\r
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\r
+ *\r
+ * In addition, as a special exception, The Mir-coders gives permission to link\r
+ * the code of this program with  any library licensed under the Apache Software License,\r
+ * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library\r
+ * (or with modified versions of the above that use the same license as the above),\r
+ * and distribute linked combinations including the two.  You must obey the\r
+ * GNU General Public License in all respects for all of the code used other than\r
+ * the above mentioned libraries.  If you modify this file, you may extend this\r
+ * exception to your version of the file, but you are not obligated to do so.\r
+ * If you do not wish to do so, delete this exception statement from your version.\r
+ */\r
 package mircoders.localizer.basic;\r
 \r
-import java.util.*;\r
-import mir.entity.*;\r
-import mir.entity.adapter.*;\r
-import mir.media.*;\r
-import mir.misc.*;\r
-import mir.util.*;\r
-import mircoders.storage.*;\r
-import mircoders.global.*;\r
-import mircoders.entity.*;\r
-import mircoders.localizer.*;\r
+import java.util.HashMap;\r
+import java.util.Iterator;\r
+import java.util.List;\r
+import java.util.Map;\r
+import java.util.Vector;\r
+\r
+import mir.config.MirPropertiesConfiguration;\r
+import mir.entity.Entity;\r
+import mir.entity.adapter.EntityAdapter;\r
+import mir.entity.adapter.EntityAdapterDefinition;\r
+import mir.entity.adapter.EntityAdapterModel;\r
+import mir.log.LoggerWrapper;\r
+import mir.media.MediaHandler;\r
+import mir.misc.NumberUtils;\r
+import mir.util.ParameterExpander;\r
+import mir.util.RewindableIterator;\r
+import mir.util.StructuredContentParser;\r
+import mircoders.entity.EntityUploadedMedia;\r
+import mircoders.global.MirGlobal;\r
+import mircoders.localizer.MirAdminInterfaceLocalizer;\r
+import mircoders.localizer.MirDataModelLocalizer;\r
+import mircoders.localizer.MirLocalizerExc;\r
+import mircoders.localizer.MirLocalizerFailure;\r
+import mircoders.media.MediaHelper;\r
+import mircoders.module.ModuleContent;\r
+import mircoders.storage.DatabaseArticleType;\r
+import mircoders.storage.DatabaseAudio;\r
+import mircoders.storage.DatabaseBreaking;\r
+import mircoders.storage.DatabaseComment;\r
+import mircoders.storage.DatabaseCommentStatus;\r
+import mircoders.storage.DatabaseContent;\r
+import mircoders.storage.DatabaseContentToMedia;\r
+import mircoders.storage.DatabaseContentToTopics;\r
+import mircoders.storage.DatabaseImageType;\r
+import mircoders.storage.DatabaseImages;\r
+import mircoders.storage.DatabaseLanguage;\r
+import mircoders.storage.DatabaseMediaType;\r
+import mircoders.storage.DatabaseMediafolder;\r
+import mircoders.storage.DatabaseMessages;\r
+import mircoders.storage.DatabaseOther;\r
+import mircoders.storage.DatabaseTopics;\r
+import mircoders.storage.DatabaseUploadedMedia;\r
+import mircoders.storage.DatabaseUsers;\r
+import mircoders.storage.DatabaseVideo;\r
 \r
 public class MirBasicDataModelLocalizer implements MirDataModelLocalizer {\r
-  private EntityAdapterModel model;\r
+  protected LoggerWrapper logger;\r
+  protected MirPropertiesConfiguration configuration;\r
 \r
-  public MirBasicDataModelLocalizer() {\r
+  public MirBasicDataModelLocalizer() throws MirLocalizerFailure, MirLocalizerExc {\r
+    logger = new LoggerWrapper("Localizer.DataModel");\r
+\r
+    try {\r
+      configuration = MirPropertiesConfiguration.instance();\r
+    }\r
+    catch (Throwable e) {\r
+      throw new MirLocalizerFailure("Can't get configuration: " + e.getMessage(), e);\r
+    }\r
   }\r
 \r
-  public EntityAdapterModel adapterModel() throws MirLocalizerFailure {\r
-    if (model==null)\r
-      model = buildModel();\r
+  protected void constructContentAdapterDefinition(EntityAdapterDefinition anEntityAdapterDefinition) throws MirLocalizerFailure, MirLocalizerExc {\r
+    try {\r
+      anEntityAdapterDefinition.addDBDateField("creationdate", "webdb_create", configuration.getString("Mir.DefaultTimezone"));\r
+      anEntityAdapterDefinition.addDBDateField("changedate", "webdb_lastchange", configuration.getString("Mir.DefaultTimezone"));\r
+      anEntityAdapterDefinition.addMirDateField("date", "date", configuration.getString("Mir.DefaultTimezone"));\r
 \r
-    return model;\r
-  };\r
+      anEntityAdapterDefinition.addCalculatedField("lockinguser", new ContentToUserField("to_locking_user"));\r
+      anEntityAdapterDefinition.addCalculatedField("is_locked", new ContentToIsLockedField());\r
 \r
-  protected void constructContentAdapterDefinition(EntityAdapterDefinition anEntityAdapterDefinition) throws MirLocalizerFailure {\r
-    try {\r
-      anEntityAdapterDefinition.addDBDateField("creationdate", "webdb_create");\r
-      anEntityAdapterDefinition.addDBDateField("changedate", "webdb_lastchange");\r
-      anEntityAdapterDefinition.addMirDateField("date", "date");\r
       anEntityAdapterDefinition.addCalculatedField("to_topics", new ContentToTopicsField());\r
       anEntityAdapterDefinition.addCalculatedField("to_comments", new ContentToCommentsField());\r
+      anEntityAdapterDefinition.addCalculatedField("language", new ContentToLanguageField());\r
+\r
+      anEntityAdapterDefinition.addCalculatedField("commentcount", new ContentCommentCountField(" and is_published='1'"));\r
+      anEntityAdapterDefinition.addCalculatedField("fullcommentcount", new ContentCommentCountField(""));\r
+\r
+\r
+      anEntityAdapterDefinition.addCalculatedField("mediacount", new ContentMediaCountField("uploaded_media", true));\r
+      anEntityAdapterDefinition.addCalculatedField("fullmediacount", new ContentMediaCountField("uploaded_media", false));\r
 \r
-      anEntityAdapterDefinition.addCalculatedField("to_media_images",  new ContentToMediaField( "image" ));\r
       anEntityAdapterDefinition.addCalculatedField("to_uploaded_media", new ContentToMediaField( "uploadedMedia" ));\r
+      anEntityAdapterDefinition.addCalculatedField("to_media_images",  new ContentToMediaField( "image" ));\r
       anEntityAdapterDefinition.addCalculatedField("to_media_audio", new ContentToMediaField( "audio" ));\r
       anEntityAdapterDefinition.addCalculatedField("to_media_video", new ContentToMediaField( "video" ));\r
       anEntityAdapterDefinition.addCalculatedField("to_media_other", new ContentToMediaField( "otherMedia" ));\r
+\r
+      anEntityAdapterDefinition.addCalculatedField("firstImage",  new ContentToFirstMediaField( "image" ));\r
+      anEntityAdapterDefinition.addCalculatedField("firstAudio", new ContentToFirstMediaField( "audio" ));\r
+      anEntityAdapterDefinition.addCalculatedField("firstVideo", new ContentToFirstMediaField( "video" ));\r
+      anEntityAdapterDefinition.addCalculatedField("firstOther", new ContentToFirstMediaField( "otherMedia" ));\r
+\r
+      anEntityAdapterDefinition.addCalculatedField("to_all_uploaded_media", new ContentToMediaField( "uploadedMedia", false));\r
+      anEntityAdapterDefinition.addCalculatedField("to_all_media_images",  new ContentToMediaField( "image", false));\r
+      anEntityAdapterDefinition.addCalculatedField("to_all_media_audio", new ContentToMediaField( "audio", false));\r
+      anEntityAdapterDefinition.addCalculatedField("to_all_media_video", new ContentToMediaField( "video", false));\r
+      anEntityAdapterDefinition.addCalculatedField("to_all_media_other", new ContentToMediaField( "otherMedia", false));\r
       anEntityAdapterDefinition.addCalculatedField("to_media_icon", new ContentToIconField());\r
 \r
+      anEntityAdapterDefinition.addCalculatedField("article_type", new ContentToArticleTypeField());\r
+\r
       anEntityAdapterDefinition.addCalculatedField("description_parsed", new FilteredField("description"));\r
       anEntityAdapterDefinition.addCalculatedField("content_data_parsed", new FilteredField("content_data"));\r
+\r
+      anEntityAdapterDefinition.addCalculatedField("children", new ContentToChildrenField());\r
+      anEntityAdapterDefinition.addCalculatedField("parent", new ContentToParentField());\r
+\r
+      anEntityAdapterDefinition.addCalculatedField("publicurl", new ExpandedField(configuration.getString("Article.PublicUrl")));\r
+\r
+      anEntityAdapterDefinition.addCalculatedField("operations",\r
+          new EntityToSimpleOperationsField(MirGlobal.localizer().adminInterface().simpleArticleOperations()));\r
     }\r
     catch (Throwable t) {\r
       throw new MirLocalizerFailure(t.getMessage(), t);\r
@@ -80,18 +147,33 @@ public class MirBasicDataModelLocalizer implements MirDataModelLocalizer {
 \r
   protected void constructCommentAdapterDefinition(EntityAdapterDefinition anEntityAdapterDefinition) throws MirLocalizerFailure {\r
     try {\r
-      anEntityAdapterDefinition.addDBDateField("creationdate", "webdb_create");\r
+      anEntityAdapterDefinition.addDBDateField("creationdate", "webdb_create", configuration.getString("Mir.DefaultTimezone"));\r
       anEntityAdapterDefinition.addCalculatedField("to_content", new CommentToContentField());\r
+      anEntityAdapterDefinition.addCalculatedField("status", new CommentToStatusField());\r
+\r
+      anEntityAdapterDefinition.addCalculatedField("to_uploaded_media", new CommentToMediaField( "uploadedMedia" ));\r
+      anEntityAdapterDefinition.addCalculatedField("to_media_images",  new CommentToMediaField( "image" ));\r
+      anEntityAdapterDefinition.addCalculatedField("to_media_audio", new CommentToMediaField( "audio" ));\r
+      anEntityAdapterDefinition.addCalculatedField("to_media_video", new CommentToMediaField( "video" ));\r
+      anEntityAdapterDefinition.addCalculatedField("to_media_other", new CommentToMediaField( "otherMedia" ));\r
+      anEntityAdapterDefinition.addCalculatedField("to_all_uploaded_media", new CommentToMediaField( "uploadedMedia", false));\r
+      anEntityAdapterDefinition.addCalculatedField("to_all_media_images",  new CommentToMediaField( "image", false));\r
+      anEntityAdapterDefinition.addCalculatedField("to_all_media_audio", new CommentToMediaField( "audio", false));\r
+      anEntityAdapterDefinition.addCalculatedField("to_all_media_video", new CommentToMediaField( "video", false));\r
+      anEntityAdapterDefinition.addCalculatedField("to_all_media_other", new CommentToMediaField( "otherMedia", false));\r
+\r
+      anEntityAdapterDefinition.addCalculatedField("publicurl", new ExpandedField(configuration.getString("Comment.PublicUrl")));\r
 \r
       anEntityAdapterDefinition.addCalculatedField("description_parsed", new FilteredField("description"));\r
-      anEntityAdapterDefinition.addCalculatedField("operations", new CommentToOperationsField());\r
+      anEntityAdapterDefinition.addCalculatedField("operations",\r
+          new EntityToSimpleOperationsField(MirGlobal.localizer().adminInterface().simpleCommentOperations()));\r
     }\r
     catch (Throwable t) {\r
       throw new MirLocalizerFailure(t.getMessage(), t);\r
     }\r
   }\r
 \r
-  protected EntityAdapterModel buildModel() throws MirLocalizerFailure {\r
+  public EntityAdapterModel adapterModel() throws MirLocalizerFailure, MirLocalizerExc {\r
     EntityAdapterModel result = new EntityAdapterModel();\r
 \r
     try {\r
@@ -104,23 +186,73 @@ public class MirBasicDataModelLocalizer implements MirDataModelLocalizer {
       definition = new EntityAdapterDefinition();\r
       constructCommentAdapterDefinition( definition );\r
       result.addMapping( "comment", DatabaseComment.getInstance(), definition);\r
+      result.addMapping( "commentStatus", DatabaseCommentStatus.getInstance(), new EntityAdapterDefinition());\r
 \r
       result.addMapping( "articleType", DatabaseArticleType.getInstance(), new EntityAdapterDefinition());\r
-      result.addMapping( "breakingNews", DatabaseBreaking.getInstance(), new EntityAdapterDefinition());\r
-      result.addMapping( "feature", DatabaseFeature.getInstance(), new EntityAdapterDefinition());\r
+\r
+      result.addMapping( "mediaType", DatabaseMediaType.getInstance(), new EntityAdapterDefinition());\r
+\r
+\r
+      definition = new EntityAdapterDefinition();\r
+      definition.addDBDateField("creationdate", "webdb_create", configuration.getString("Mir.DefaultTimezone"));\r
+      result.addMapping( "breakingNews", DatabaseBreaking.getInstance(), definition);\r
+\r
+      definition = new EntityAdapterDefinition();\r
+      definition.addDBDateField("creationdate", "webdb_create", configuration.getString("Mir.DefaultTimezone"));\r
+      result.addMapping( "internalMessage", DatabaseMessages.getInstance(), definition);\r
+\r
+      definition = new EntityAdapterDefinition();\r
+      definition.addCalculatedField("mediafolder", new MediaToMediaFolderField());\r
+      definition.addCalculatedField("human_readable_size", new HumanReadableSizeField("value"));\r
+      definition.addDBDateField("creationdate", "webdb_create", configuration.getString("Mir.DefaultTimezone"));\r
+      definition.addCalculatedField("info", new MediaToMediaInfoField());\r
+      result.addMapping( "uploadedMedia", DatabaseUploadedMedia.getInstance(), definition);\r
+      definition = new EntityAdapterDefinition();\r
+      definition.addCalculatedField("mediafolder", new MediaToMediaFolderField());\r
+      definition.addCalculatedField("human_readable_size", new HumanReadableSizeField("value"));\r
+      definition.addDBDateField("creationdate", "webdb_create", configuration.getString("Mir.DefaultTimezone"));\r
+      definition.addCalculatedField("info", new MediaToMediaInfoField());\r
+      definition.addCalculatedField("big_icon", new MediaToBigIconField());\r
+      result.addMapping( "image", DatabaseImages.getInstance(), definition);\r
+      definition = new EntityAdapterDefinition();\r
+      definition.addCalculatedField("mediafolder", new MediaToMediaFolderField());\r
+      definition.addCalculatedField("human_readable_size", new HumanReadableSizeField("value"));\r
+      definition.addDBDateField("creationdate", "webdb_create", configuration.getString("Mir.DefaultTimezone"));\r
+      definition.addCalculatedField("info", new MediaToMediaInfoField());\r
+      definition.addCalculatedField("big_icon", new MediaToBigIconField());\r
+      result.addMapping( "audio", DatabaseAudio.getInstance(), definition);\r
+      definition = new EntityAdapterDefinition();\r
+      definition.addCalculatedField("mediafolder", new MediaToMediaFolderField());\r
+      definition.addCalculatedField("human_readable_size", new HumanReadableSizeField("value"));\r
+      definition.addDBDateField("creationdate", "webdb_create", configuration.getString("Mir.DefaultTimezone"));\r
+      definition.addCalculatedField("info", new MediaToMediaInfoField());\r
+      definition.addCalculatedField("big_icon", new MediaToBigIconField());\r
+      result.addMapping( "video", DatabaseVideo.getInstance(), definition);\r
+      definition = new EntityAdapterDefinition();\r
+      definition.addCalculatedField("mediafolder", new MediaToMediaFolderField());\r
+      definition.addCalculatedField("human_readable_size", new HumanReadableSizeField("value"));\r
+      definition.addDBDateField("creationdate", "webdb_create", configuration.getString("Mir.DefaultTimezone"));\r
+      definition.addCalculatedField("info", new MediaToMediaInfoField());\r
+      definition.addCalculatedField("big_icon", new MediaToBigIconField());\r
+      result.addMapping( "otherMedia", DatabaseOther.getInstance(), definition);\r
+\r
+\r
+      result.addMapping( "mediaFolder", DatabaseMediafolder.getInstance(), new EntityAdapterDefinition());\r
       result.addMapping( "imageType", DatabaseImageType.getInstance(), new EntityAdapterDefinition());\r
       result.addMapping( "language", DatabaseLanguage.getInstance(), new EntityAdapterDefinition());\r
-      result.addMapping( "mediaFolder", DatabaseMediafolder.getInstance(), new EntityAdapterDefinition());\r
       result.addMapping( "mediaType", DatabaseMediaType.getInstance(), new EntityAdapterDefinition());\r
-      result.addMapping( "internalMessage", DatabaseMessages.getInstance(), new EntityAdapterDefinition());\r
       result.addMapping( "topic", DatabaseTopics.getInstance(), new EntityAdapterDefinition());\r
-      result.addMapping( "user", DatabaseUsers.getInstance(), new EntityAdapterDefinition());\r
-      result.addMapping( "media", DatabaseMedia.getInstance(), new EntityAdapterDefinition());\r
-      result.addMapping( "uploadedMedia", DatabaseUploadedMedia.getInstance(), new EntityAdapterDefinition());\r
-      result.addMapping( "image", DatabaseImages.getInstance(), new EntityAdapterDefinition());\r
-      result.addMapping( "audio", DatabaseAudio.getInstance(), new EntityAdapterDefinition());\r
-      result.addMapping( "video", DatabaseVideo.getInstance(), new EntityAdapterDefinition());\r
+\r
+      definition = new EntityAdapterDefinition();\r
+      definition.addDBDateField("creationdate", "webdb_create", configuration.getString("Mir.DefaultTimezone"));\r
+      definition.addDBDateField("lastlogindate", "lastlogin", configuration.getString("Mir.DefaultTimezone"));\r
+      definition.addCalculatedField("structuredProfile", new StructuredContentField("profile"));\r
+      result.addMapping( "user", DatabaseUsers.getInstance(), definition);\r
+\r
       result.addMapping( "otherMedia", DatabaseOther.getInstance(), new EntityAdapterDefinition());\r
+\r
+      result.addMapping( "content_x_topic", DatabaseContentToTopics.getInstance(), new EntityAdapterDefinition());\r
+\r
     }\r
     catch (Throwable t) {\r
       throw new MirLocalizerFailure(t.getMessage(), t);\r
@@ -132,7 +264,7 @@ public class MirBasicDataModelLocalizer implements MirDataModelLocalizer {
   protected class CommentToContentField implements EntityAdapterDefinition.CalculatedField {\r
     public Object getValue(EntityAdapter anEntityAdapter) {\r
       try {\r
-        return anEntityAdapter.getRelation(\r
+        return anEntityAdapter.getToOneRelation(\r
                     "id="+anEntityAdapter.get("to_media"),\r
                     "id",\r
                     "content" );\r
@@ -143,21 +275,38 @@ public class MirBasicDataModelLocalizer implements MirDataModelLocalizer {
     }\r
   }\r
 \r
-  protected class CommentToOperationsField implements EntityAdapterDefinition.CalculatedField {\r
+  protected class CommentToStatusField implements EntityAdapterDefinition.CalculatedField {\r
     public Object getValue(EntityAdapter anEntityAdapter) {\r
       try {\r
-        Map operations = MirGlobal.localizer().adminInterface().simpleCommentOperations();\r
-        Iterator i = operations.entrySet().iterator();\r
+        return anEntityAdapter.getToOneRelation(\r
+                    "id="+anEntityAdapter.get("to_comment_status"),\r
+                    "id",\r
+                    "commentStatus" );\r
+      }\r
+      catch (Throwable t) {\r
+        throw new RuntimeException(t.getMessage());\r
+      }\r
+    }\r
+  }\r
+\r
+  protected class EntityToSimpleOperationsField implements EntityAdapterDefinition.CalculatedField {\r
+    private List operations;\r
+\r
+    public EntityToSimpleOperationsField(List anOperations) {\r
+      operations = anOperations;\r
+    }\r
+\r
+    public Object getValue(EntityAdapter anEntityAdapter) {\r
+      try {\r
+        Iterator i = operations.iterator();\r
         List availableOperations = new Vector();\r
 \r
         while (i.hasNext()) {\r
-          Map.Entry entry = (Map.Entry) i.next();\r
-\r
           MirAdminInterfaceLocalizer.MirSimpleEntityOperation operation =\r
-            (MirAdminInterfaceLocalizer.MirSimpleEntityOperation) entry.getValue();\r
+            (MirAdminInterfaceLocalizer.MirSimpleEntityOperation) i.next();\r
 \r
           if (operation.isAvailable(anEntityAdapter)) {\r
-            availableOperations.add(entry.getKey());\r
+            availableOperations.add(operation.getName());\r
           }\r
         };\r
 \r
@@ -170,7 +319,7 @@ public class MirBasicDataModelLocalizer implements MirDataModelLocalizer {
   }\r
 \r
   protected class FilteredField implements EntityAdapterDefinition.CalculatedField {\r
-    String fieldName;\r
+    private String fieldName;\r
 \r
     public FilteredField(String aFieldName) {\r
       fieldName = aFieldName;\r
@@ -179,10 +328,10 @@ public class MirBasicDataModelLocalizer implements MirDataModelLocalizer {
     public Object getValue(EntityAdapter anEntityAdapter) {\r
       try {\r
         if (anEntityAdapter.get("is_html")!=null && anEntityAdapter.get("is_html").equals("1")) {\r
-          return anEntityAdapter.get(fieldName);\r
+          return MirGlobal.localizer().producerAssistant().filterHTMLText((String) anEntityAdapter.get(fieldName));\r
         }\r
         else {\r
-          return MirGlobal.localizer().producerAssistant().filterText((String) anEntityAdapter.get(fieldName));\r
+          return MirGlobal.localizer().producerAssistant().filterNonHTMLText((String) anEntityAdapter.get(fieldName));\r
         }\r
       }\r
       catch (Throwable t) {\r
@@ -191,12 +340,195 @@ public class MirBasicDataModelLocalizer implements MirDataModelLocalizer {
     }\r
   }\r
 \r
+  protected class StructuredContentField implements EntityAdapterDefinition.CalculatedField {\r
+    private String expression;\r
+\r
+    public StructuredContentField(String anExpression) {\r
+      expression = anExpression;\r
+    }\r
+\r
+    public Object getValue(EntityAdapter anEntityAdapter) {\r
+      try {\r
+        return StructuredContentParser.parse(ParameterExpander.evaluateStringExpression(anEntityAdapter, expression));\r
+      }\r
+      catch (Throwable t) {\r
+        throw new RuntimeException(t.getMessage());\r
+      }\r
+    }\r
+  }\r
+\r
+  protected class ExpandedField implements EntityAdapterDefinition.CalculatedField {\r
+    private String expression;\r
+\r
+    public ExpandedField(String anExpression) {\r
+      expression = anExpression;\r
+    }\r
+\r
+    public Object getValue(EntityAdapter anEntityAdapter) {\r
+      try {\r
+        return ParameterExpander.expandExpression(anEntityAdapter, expression);\r
+      }\r
+      catch (Throwable t) {\r
+        throw new RuntimeException(t.getMessage());\r
+      }\r
+    }\r
+  }\r
+\r
+  protected class EvaluatedField implements EntityAdapterDefinition.CalculatedField {\r
+    private String expression;\r
+\r
+    public EvaluatedField(String anExpression) {\r
+      expression = anExpression;\r
+    }\r
+\r
+    public Object getValue(EntityAdapter anEntityAdapter) {\r
+      try {\r
+        return ParameterExpander.evaluateExpression(anEntityAdapter, expression);\r
+      }\r
+      catch (Throwable t) {\r
+        throw new RuntimeException(t.getMessage());\r
+      }\r
+    }\r
+  }\r
+\r
+  protected class ContentToParentField implements EntityAdapterDefinition.CalculatedField {\r
+    public Object getValue(EntityAdapter anEntityAdapter) {\r
+      try {\r
+        logger.debug("ContentToParentField.getFieldValue");\r
+        return anEntityAdapter.getToOneRelation(\r
+                    "id="+anEntityAdapter.get("to_content"),\r
+                    "id",\r
+                    "content" );\r
+      }\r
+      catch (Throwable t) {\r
+        throw new RuntimeException(t.getMessage());\r
+      }\r
+    }\r
+  }\r
+\r
+  protected class ContentToChildrenField implements EntityAdapterDefinition.CalculatedField {\r
+    public Object getValue(EntityAdapter anEntityAdapter) {\r
+      try {\r
+        return anEntityAdapter.getRelation(\r
+                    "to_content="+anEntityAdapter.get("id"),\r
+                    "id",\r
+                    "content" );\r
+      }\r
+      catch (Throwable t) {\r
+        throw new RuntimeException(t.getMessage());\r
+      }\r
+    }\r
+  }\r
+\r
+  protected class ContentToLanguageField implements EntityAdapterDefinition.CalculatedField {\r
+    public Object getValue(EntityAdapter anEntityAdapter) {\r
+      try {\r
+        return anEntityAdapter.getToOneRelation(\r
+                    "id="+anEntityAdapter.get("to_language"),\r
+                    "id",\r
+                    "language" );\r
+      }\r
+      catch (Throwable t) {\r
+        throw new RuntimeException(t.getMessage());\r
+      }\r
+    }\r
+  }\r
+\r
+  protected class ContentToArticleTypeField implements EntityAdapterDefinition.CalculatedField {\r
+    public Object getValue(EntityAdapter anEntityAdapter) {\r
+      try {\r
+        return anEntityAdapter.getToOneRelation(\r
+                    "id="+anEntityAdapter.get("to_article_type"),\r
+                    "id",\r
+                    "articleType" );\r
+      }\r
+      catch (Throwable t) {\r
+        throw new RuntimeException(t.getMessage());\r
+      }\r
+    }\r
+  }\r
+\r
+  protected class MediaToMediaFolderField implements EntityAdapterDefinition.CalculatedField {\r
+    public Object getValue(EntityAdapter anEntityAdapter) {\r
+      try {\r
+        return anEntityAdapter.getToOneRelation(\r
+                    "id="+anEntityAdapter.get("to_media_folder"),\r
+                    "id",\r
+                    "mediaFolder" );\r
+      }\r
+      catch (Throwable t) {\r
+        throw new RuntimeException(t.getMessage());\r
+      }\r
+    }\r
+  }\r
+\r
+  public static class MediaInfo {\r
+    private MediaHandler mediaHandler;\r
+\r
+    public MediaInfo(MediaHandler aHandler) {\r
+      mediaHandler = aHandler;\r
+    }\r
+    public String getBigIcon() {\r
+      if (mediaHandler == null)\r
+        return "bla";\r
+      else\r
+        return mediaHandler.getBigIconName();\r
+    }\r
+\r
+    public String getSmallIcon() {\r
+      if (mediaHandler == null)\r
+        return "bla";\r
+      else\r
+        return mediaHandler.getTinyIconName();\r
+    }\r
+\r
+    public String getMediaType() {\r
+      return "";\r
+    }\r
+  }\r
+\r
+  protected class MediaToMediaInfoField implements EntityAdapterDefinition.CalculatedField {\r
+    public Object getValue(EntityAdapter anEntityAdapter) {\r
+      try {\r
+        MediaHandler mediaHandler = MediaHelper.getHandler(((EntityUploadedMedia) anEntityAdapter.getEntity()).getMediaType());\r
+\r
+        return new MediaInfo(mediaHandler);\r
+      }\r
+      catch (Throwable t) {\r
+        throw new RuntimeException(t.getMessage());\r
+      }\r
+    }\r
+  }\r
+\r
+  protected class MediaToBigIconField implements EntityAdapterDefinition.CalculatedField {\r
+    public Object getValue(EntityAdapter anEntityAdapter) {\r
+      try {\r
+        return MediaHelper.getHandler(((EntityUploadedMedia) anEntityAdapter.getEntity()).getMediaType()).getBigIconName();\r
+      }\r
+      catch (Throwable t) {\r
+        throw new RuntimeException(t.getMessage());\r
+      }\r
+    }\r
+  }\r
+\r
   protected class ContentToCommentsField implements EntityAdapterDefinition.CalculatedField {\r
+    private String extracondition;\r
+    private String order;\r
+\r
+    public ContentToCommentsField() {\r
+      this ( " and is_published='1'", "webdb_create");\r
+    }\r
+\r
+    public ContentToCommentsField(String anExtraCondition, String anOrder) {\r
+      order = anOrder;\r
+      extracondition = anExtraCondition;\r
+    }\r
+\r
     public Object getValue(EntityAdapter anEntityAdapter) {\r
       try {\r
         return anEntityAdapter.getRelation(\r
-                    "to_media="+anEntityAdapter.get("id")+" and is_published='1'",\r
-                    "webdb_create",\r
+                    "to_media="+anEntityAdapter.get("id")+" " + extracondition,\r
+                    order,\r
                     "comment" );\r
       }\r
       catch (Throwable t) {\r
@@ -206,12 +538,35 @@ public class MirBasicDataModelLocalizer implements MirDataModelLocalizer {
   }\r
 \r
   protected class ContentToTopicsField implements EntityAdapterDefinition.CalculatedField {\r
+    private String topicCondition;\r
+    private String topicOrder;\r
+\r
+    public ContentToTopicsField() {\r
+      this(null);\r
+    }\r
+\r
+    public ContentToTopicsField(String aTopicCondition) {\r
+      this(aTopicCondition, "title");\r
+    }\r
+\r
+    public ContentToTopicsField(String aTopicCondition, String aTopicOrder) {\r
+      topicCondition = aTopicCondition;\r
+      topicOrder = aTopicOrder;\r
+    }\r
+\r
     public Object getValue(EntityAdapter anEntityAdapter) {\r
       try {\r
-        return anEntityAdapter.getRelation(\r
-                    "exists (select * from content_x_topic where content_id="+anEntityAdapter.get("id")+" and topic_id=id)",\r
-                    "title",\r
-                    "topic" );\r
+\r
+        Vector extraTable = new Vector();\r
+        extraTable.add("content_x_topic cxt");\r
+        String condition = "cxt.content_id="+anEntityAdapter.get("id")+\r
+          " and cxt.topic_id=t.id";\r
+\r
+        if (topicCondition!=null && topicCondition.length()>0)\r
+          condition = "(" + topicCondition + ") and " + condition;\r
+\r
+        return anEntityAdapter.getComplexRelation("t", extraTable,\r
+                    condition, topicOrder, "topic" );\r
       }\r
       catch (Throwable t) {\r
         throw new RuntimeException(t.getMessage());\r
@@ -220,18 +575,92 @@ public class MirBasicDataModelLocalizer implements MirDataModelLocalizer {
   }\r
 \r
   protected class ContentToMediaField implements EntityAdapterDefinition.CalculatedField {\r
-    String definition;\r
+    private String definition;\r
+    private boolean published;\r
+\r
+    public ContentToMediaField(String aDefinition, boolean anOnlyPublished) {\r
+      definition = aDefinition;\r
+      published = anOnlyPublished;\r
+    }\r
 \r
     public ContentToMediaField(String aDefinition) {\r
+      this(aDefinition, true);\r
+    }\r
+\r
+    public Object getValue(EntityAdapter anEntityAdapter) {\r
+      try {\r
+        String condition = "cxm.content_id="+ anEntityAdapter.get("id") +\r
+          " and cxm.media_id = m.id";\r
+        if (published)\r
+          condition = "is_published='t' and " + condition;\r
+\r
+        List extraTables = new Vector();\r
+        extraTables.add("content_x_media cxm");\r
+\r
+        return anEntityAdapter.getComplexRelation("m", extraTables, condition, "id", definition);\r
+      }\r
+      catch (Throwable t) {\r
+        throw new RuntimeException(t.getMessage());\r
+      }\r
+    }\r
+  }\r
+\r
+  protected class ContentToFirstMediaField implements EntityAdapterDefinition.CalculatedField {\r
+    private String definition;\r
+    private boolean published;\r
+\r
+    public ContentToFirstMediaField(String aDefinition, boolean anOnlyPublished) {\r
       definition = aDefinition;\r
+      published = anOnlyPublished;\r
+    }\r
+\r
+    public ContentToFirstMediaField(String aDefinition) {\r
+      this(aDefinition, true);\r
     }\r
 \r
     public Object getValue(EntityAdapter anEntityAdapter) {\r
       try {\r
-        return anEntityAdapter.getRelation(\r
-          "exists (select * from content_x_media where content_id="+anEntityAdapter.get("id")+" and media_id=id)",\r
-          "title",\r
-          definition);\r
+        String condition = "cxm.content_id="+ anEntityAdapter.get("id") +\r
+          " and cxm.media_id = m.id";\r
+        if (published)\r
+          condition = "is_published='t' and " + condition;\r
+\r
+        List extraTables = new Vector();\r
+        extraTables.add("content_x_media cxm");\r
+\r
+        return anEntityAdapter.getComplexToOneRelation("m", extraTables, condition, "id", definition)\r
+      }\r
+      catch (Throwable t) {\r
+        throw new RuntimeException(t.getMessage());\r
+      }\r
+    }\r
+  }\r
+\r
+  protected class CommentToMediaField implements EntityAdapterDefinition.CalculatedField {\r
+    private String definition;\r
+    private boolean published;\r
+\r
+    public CommentToMediaField(String aDefinition, boolean anOnlyPublished) {\r
+      definition = aDefinition;\r
+      published = anOnlyPublished;\r
+    }\r
+\r
+    public CommentToMediaField(String aDefinition) {\r
+      this(aDefinition, true);\r
+    }\r
+\r
+    public Object getValue(EntityAdapter anEntityAdapter) {\r
+      try {\r
+\r
+        String condition = "cxm.comment_id="+ anEntityAdapter.get("id") +\r
+                  " and cxm.media_id = m.id";\r
+        if (published)\r
+           condition = "is_published='t' and " + condition;\r
+\r
+        List extraTables = new Vector();\r
+        extraTables.add("comment_x_media cxm");\r
+        return anEntityAdapter.getComplexRelation("m", extraTables, condition, "id", definition);\r
+\r
       }\r
       catch (Throwable t) {\r
         throw new RuntimeException(t.getMessage());\r
@@ -245,7 +674,7 @@ public class MirBasicDataModelLocalizer implements MirDataModelLocalizer {
       Entity mediaType;\r
       RewindableIterator iterator;\r
       Map result;\r
-      MirMedia mediaHandler;\r
+      MediaHandler mediaHandler;\r
       String tinyIcon;\r
       String iconAlt;\r
 \r
@@ -253,7 +682,7 @@ public class MirBasicDataModelLocalizer implements MirDataModelLocalizer {
         iterator = (RewindableIterator) (anEntityAdapter.get("to_uploaded_media"));\r
         iterator.rewind();\r
 \r
-        tinyIcon = MirGlobal.getConfigProperty("Producer.Icon.TinyText");\r
+        tinyIcon = MirGlobal.config().getString("Producer.Icon.TinyText");\r
         iconAlt = "Text";\r
 \r
         if (iterator.hasNext()) {\r
@@ -262,36 +691,132 @@ public class MirBasicDataModelLocalizer implements MirDataModelLocalizer {
           mediaType = ((EntityUploadedMedia) (media.getEntity())).getMediaType();\r
           mediaHandler = MediaHelper.getHandler( mediaType );\r
 \r
-          if (mediaHandler.isVideo()) {\r
-            tinyIcon = MirGlobal.getConfigProperty("Producer.Icon.TinyVideo");\r
-            iconAlt = "Video";\r
-          }\r
-          else if (mediaHandler.isAudio()) {\r
-            tinyIcon = MirGlobal.getConfigProperty("Producer.Icon.TinyAudio");\r
-            iconAlt = "Audio";\r
-          }\r
-          else if (mediaHandler.isImage()) {\r
-            tinyIcon = MirGlobal.getConfigProperty("Producer.Icon.TinyImage");\r
-            iconAlt = "Image";\r
-          }\r
-          else {\r
-            tinyIcon = mediaHandler.getTinyIcon();\r
-            iconAlt = mediaHandler.getIconAlt();\r
-          }\r
-\r
+          tinyIcon = mediaHandler.getTinyIconName();\r
+          iconAlt = mediaHandler.getIconAltName();\r
         }\r
       }\r
       catch (Throwable t) {\r
-        System.out.println("ContentToIconField: exception: " +t.getMessage());\r
-        t.printStackTrace(System.out);\r
+        logger.error("ContentToIconField: " +t.getMessage());\r
         throw new RuntimeException(t.getMessage());\r
       }\r
 \r
       result = new HashMap();\r
-      result.put("tiny_icon", MirGlobal.getConfigProperty("Producer.ImageRoot") + "/" + tinyIcon);\r
+      result.put("tiny_icon", MirGlobal.config().getString("Producer.ImageRoot") + "/" + tinyIcon);\r
       result.put("icon_alt", iconAlt);\r
 \r
       return result;\r
     }\r
   }\r
-}
\ No newline at end of file
+\r
+  protected class ContentCommentCountField implements EntityAdapterDefinition.CalculatedField {\r
+    private String extraCondition;\r
+\r
+    public ContentCommentCountField(String anExtraCondition) {\r
+      super();\r
+\r
+      extraCondition = anExtraCondition;\r
+    }\r
+\r
+    public Object getValue(EntityAdapter anEntityAdapter) {\r
+      try {\r
+        return Integer.toString(\r
+            DatabaseComment.getInstance().getSize(\r
+                  "to_media="+anEntityAdapter.get("id")+" " + extraCondition));\r
+      }\r
+      catch (Throwable t) {\r
+        throw new RuntimeException(t.getMessage());\r
+      }\r
+    }\r
+  }\r
+\r
+  protected class HumanReadableSizeField implements EntityAdapterDefinition.CalculatedField {\r
+      private String fieldName;\r
+\r
+      public HumanReadableSizeField(String aFieldName) {\r
+        fieldName= aFieldName;\r
+      }\r
+\r
+      public Object getValue(EntityAdapter anEntityAdapter) {\r
+        try {\r
+          String size = (String) anEntityAdapter.get(fieldName);\r
+          if (size!=null)\r
+            return NumberUtils.humanReadableSize(Double.parseDouble(size));\r
+          else\r
+            return "";\r
+        }\r
+        catch (Throwable t) {\r
+          throw new RuntimeException(t.getMessage());\r
+        }\r
+      }\r
+    }\r
+\r
+\r
+  protected class ContentMediaCountField implements EntityAdapterDefinition.CalculatedField {\r
+    private String table;\r
+    private boolean published;\r
+\r
+    public ContentMediaCountField(String aTable, boolean anOnlyPublished) {\r
+      table = aTable;\r
+      published = anOnlyPublished;\r
+    }\r
+\r
+    public ContentMediaCountField(String aTable) {\r
+      this(aTable, true);\r
+    }\r
+\r
+    public Object getValue(EntityAdapter anEntityAdapter) {\r
+      try {\r
+        Vector extraTable = new Vector();\r
+        extraTable.add(table+" m");\r
+        String selectSql = "cxm.media_id=m.id and cxm.content_id="+\r
+          anEntityAdapter.get("id");\r
+        if (published)\r
+          selectSql+= " and m.is_published='t'";\r
+\r
+        return Integer.toString(\r
+            DatabaseContentToMedia.getInstance().getSize(\r
+              "cxm", extraTable, selectSql));\r
+      }\r
+      catch (Throwable t) {\r
+        throw new RuntimeException(t.getMessage());\r
+      }\r
+    }\r
+  }\r
+\r
+  protected class ContentToUserField implements EntityAdapterDefinition.CalculatedField {\r
+    private String fieldName;\r
+\r
+    public ContentToUserField(String aFieldName) {\r
+      fieldName = aFieldName;\r
+    }\r
+\r
+    public Object getValue(EntityAdapter anEntityAdapter) {\r
+      try {\r
+        return anEntityAdapter.getToOneRelation(\r
+            "id=" + anEntityAdapter.get(fieldName),\r
+            "id",\r
+            "user");\r
+      }\r
+      catch (Throwable t) {\r
+        throw new RuntimeException(t.getMessage());\r
+      }\r
+    }\r
+  }\r
+\r
+  protected class ContentToIsLockedField implements EntityAdapterDefinition.CalculatedField {\r
+    private ModuleContent contentModule;\r
+\r
+    public ContentToIsLockedField() {\r
+      contentModule = new ModuleContent(DatabaseContent.getInstance());\r
+    }\r
+\r
+    public Object getValue(EntityAdapter anEntityAdapter) {\r
+      try {\r
+        return new Boolean(contentModule.queryArticleLock(anEntityAdapter.getEntity().getId())!=null);\r
+      }\r
+      catch (Throwable t) {\r
+        throw new RuntimeException(t.getMessage());\r
+      }\r
+    }\r
+  }\r
+}\r