some corrections and parent-child-relation of topic
authoridfx <idfx>
Tue, 30 Sep 2003 19:26:01 +0000 (19:26 +0000)
committeridfx <idfx>
Tue, 30 Sep 2003 19:26:01 +0000 (19:26 +0000)
17 files changed:
source/mir/core/model/Audio.hbm.xml
source/mir/core/model/Comment.hbm.xml
source/mir/core/model/CommentStatus.hbm.xml
source/mir/core/model/Content.hbm.xml
source/mir/core/model/Feature.hbm.xml
source/mir/core/model/IMedia.java
source/mir/core/model/Image.hbm.xml
source/mir/core/model/Media.hbm.xml
source/mir/core/model/Media.java
source/mir/core/model/MediaFolder.hbm.xml
source/mir/core/model/OtherMedia.hbm.xml
source/mir/core/model/Rights.hbm.xml
source/mir/core/model/Topic.hbm.xml
source/mir/core/model/Topic.java
source/mir/core/model/TopicStub.java [deleted file]
source/mir/core/model/UploadedMedia.hbm.xml
source/mir/core/model/Video.hbm.xml

index 8592a01..b4e08d5 100755 (executable)
         name="description"
         type="java.lang.String"
         column="description"
-        length="-1"
-    />
-    <property
-        name="keywords"
-        type="java.lang.String"
-        column="keywords"
-        length="-1"
+        sqltype="text"
     />
     <property
         name="comment"
         type="java.lang.String"
         column="comment"
-        length="-1"
+               sql-type="text" 
     />
     <property
         name="source"
         column="to_media_folder"
     />
     <many-to-one
-        name="feature"
-        class="mir.core.model.Feature"
-        column="to_feature"
-    />
-    <many-to-one
         name="publisher"
         class="mir.core.model.MirUser"
         column="to_publisher"
index 4c1fcf9..69126ff 100755 (executable)
@@ -30,7 +30,7 @@
         type="java.lang.String"
         column="title"
         not-null="true"
-        length="80"
+        length="255"
     />
     <property
         name="creator"
@@ -44,7 +44,7 @@
         type="java.lang.String"
         column="description"
         not-null="true"
-        length="-1"
+        sql-type="text" 
     />
     <property
         name="mainUrl"
index 48f65c8..44c3554 100755 (executable)
@@ -22,7 +22,7 @@
         column="id"
     >
         <generator class="sequence">
-               <param name="sequence">comment_status_seq</param> 
+               <param name="sequence">comment_status_id_seq</param> 
         </generator> 
     </id>
     <property
index 0b04fbd..fc98f55 100755 (executable)
         type="java.lang.String"
         column="title"
         not-null="true"
-        length="80"
+        length="255"
     />
     <property
         name="subtitle"
         type="java.lang.String"
         column="subtitle"
-        length="30"
+        length="128"
     />
     <property
         name="edittitle"
         type="java.lang.String"
         column="edittitle"
-        length="30"
+        length="128"
     />
     <property
         name="date"
         name="description"
         type="java.lang.String"
         column="description"
-        length="-1"
-    />
-    <property
-        name="keywords"
-        type="java.lang.String"
-        column="keywords"
-        length="-1"
+        sql-type="text" 
     />
     <property
         name="comment"
         type="java.lang.String"
         column="comment"
-        length="-1"
+        sql-type="text" 
     />
     <property
         name="source"
         name="contentData"
         type="java.lang.String"
         column="content_data"
-        length="-1"
+        sql-type="text" 
     />
     <!-- associations -->
     <many-to-one
         column="to_article_type"
     />
     <many-to-one
-        name="feature"
-        class="mir.core.model.Feature"
-        column="to_feature"
-    />
-    <many-to-one
         name="publisher"
         class="mir.core.model.MirUser"
         column="to_publisher"
index b5e0370..5178f65 100755 (executable)
@@ -36,7 +36,7 @@
         name="description"
         type="java.lang.String"
         column="description"
-        length="-1"
+        sql-type="text" 
     />
     <property
         name="filename"
index 6865d1e..b63244b 100755 (executable)
@@ -36,7 +36,7 @@ import java.util.Set;
 /**
  * IMedia
  * @author idefix
- * @version $Id: IMedia.java,v 1.3 2003/09/07 16:55:00 idfx Exp $
+ * @version $Id: IMedia.java,v 1.4 2003/09/30 19:26:02 idfx Exp $
  */
 public interface IMedia {
        public abstract java.lang.Integer getId();
@@ -61,8 +61,6 @@ public interface IMedia {
        public abstract void setCreatorPhone(java.lang.String creatorPhone);
        public abstract java.lang.String getDescription();
        public abstract void setDescription(java.lang.String description);
-       public abstract java.lang.String getKeywords();
-       public abstract void setKeywords(java.lang.String keywords);
        public abstract java.lang.String getComment();
        public abstract void setComment(java.lang.String comment);
        public abstract java.lang.String getSource();
@@ -77,8 +75,6 @@ public interface IMedia {
        public abstract void setWebdbCreate(java.util.Date webdbCreate);
        public abstract java.util.Date getWebdbLastchange();
        public abstract void setWebdbLastchange(java.util.Date webdbLastchange);
-       public abstract mir.core.model.Feature getFeature();
-       public abstract void setFeature(mir.core.model.Feature feature);
        public abstract mir.core.model.MirUser getPublisher();
        public abstract void setPublisher(mir.core.model.MirUser publisher);
        public abstract mir.core.model.Language getLanguage();
index 010fd66..0db3d7b 100755 (executable)
         type="java.lang.String"
         column="title"
         not-null="true"
-        length="80"
+        length="255"
     />
     <property
         name="subtitle"
         type="java.lang.String"
         column="subtitle"
-        length="30"
+        length="128"
     />
     <property
         name="edittitle"
         type="java.lang.String"
         column="edittitle"
-        length="30"
+        length="128"
     />
     <property
         name="date"
         name="description"
         type="java.lang.String"
         column="description"
-        length="-1"
-    />
-    <property
-        name="keywords"
-        type="java.lang.String"
-        column="keywords"
-        length="-1"
+        sql-type="text" 
     />
     <property
         name="comment"
         type="java.lang.String"
         column="comment"
-        length="-1"
+        sql-type="text" 
     />
     <property
         name="source"
         column="to_media_folder"
     />
     <many-to-one
-        name="feature"
-        class="mir.core.model.Feature"
-        column="to_feature"
-    />
-    <many-to-one
         name="publisher"
         class="mir.core.model.MirUser"
         column="to_publisher"
index fa9bb3c..510ecb4 100755 (executable)
         type="java.lang.String"
         column="title"
         not-null="true"
-        length="80"
+        length="255"
     />
     <property
         name="subtitle"
         type="java.lang.String"
         column="subtitle"
-        length="30"
+        length="128"
     />
     <property
         name="edittitle"
         type="java.lang.String"
         column="edittitle"
-        length="30"
+        length="128"
     />
     <property
         name="date"
         name="description"
         type="java.lang.String"
         column="description"
-        length="-1"
-    />
-    <property
-        name="keywords"
-        type="java.lang.String"
-        column="keywords"
-        length="-1"
+        sql-type="text" 
     />
     <property
         name="comment"
         type="java.lang.String"
         column="comment"
-        length="-1"
+        sql-type="text" 
     />
     <property
         name="source"
     />
     <!-- associations -->
     <many-to-one
-        name="feature"
-        class="mir.core.model.Feature"
-        column="to_feature"
-    />
-    <many-to-one
         name="publisher"
         class="mir.core.model.MirUser"
         column="to_publisher"
index 132fc46..ddcfc89 100755 (executable)
@@ -44,7 +44,7 @@ import org.apache.commons.lang.builder.ToStringBuilder;
  * 
  * Media
  * @author idefix
- * @version $Id: Media.java,v 1.5 2003/09/05 20:23:59 idfx Exp $
+ * @version $Id: Media.java,v 1.6 2003/09/30 19:26:02 idfx Exp $
  */
 public class Media implements Serializable, IMedia {
 
@@ -82,9 +82,6 @@ public class Media implements Serializable, IMedia {
     private String description;
 
     /** nullable persistent field */
-    private String keywords;
-
-    /** nullable persistent field */
     private String comment;
 
     /** nullable persistent field */
@@ -112,9 +109,6 @@ public class Media implements Serializable, IMedia {
     private Date webdbLastchange;
 
     /** nullable persistent field */
-    private mir.core.model.Feature feature;
-
-    /** nullable persistent field */
     private MirUser publisher;
 
     /** nullable persistent field */
@@ -218,14 +212,6 @@ public class Media implements Serializable, IMedia {
         this.description = description;
     }
 
-    public java.lang.String getKeywords() {
-        return this.keywords;
-    }
-
-    public void setKeywords(java.lang.String keywords) {
-        this.keywords = keywords;
-    }
-
     public java.lang.String getComment() {
         return this.comment;
     }
@@ -282,14 +268,6 @@ public class Media implements Serializable, IMedia {
         this.webdbLastchange = webdbLastchange;
     }
 
-    public mir.core.model.Feature getFeature() {
-        return this.feature;
-    }
-
-    public void setFeature(mir.core.model.Feature feature) {
-        this.feature = feature;
-    }
-
     public mir.core.model.MirUser getPublisher() {
         return this.publisher;
     }
index 8288cf3..6a08dd1 100755 (executable)
         name="keywords"
         type="java.lang.String"
         column="keywords"
-        length="-1"
+        sql-type="text" 
     />
     <property
         name="comment"
         type="java.lang.String"
         column="comment"
-        length="-1"
+        sql-type="text" 
     />
     <property
         name="webdbCreate"
index 9ef1dfe..74f5f2b 100755 (executable)
         type="java.lang.String"
         column="title"
         not-null="true"
-        length="80"
+        length="255"
     />
     <property
         name="subtitle"
         type="java.lang.String"
         column="subtitle"
-        length="30"
+        length="128"
     />
     <property
         name="edittitle"
         type="java.lang.String"
         column="edittitle"
-        length="30"
+        length="128"
     />
     <property
         name="date"
         name="description"
         type="java.lang.String"
         column="description"
-        length="-1"
-    />
-    <property
-        name="keywords"
-        type="java.lang.String"
-        column="keywords"
-        length="-1"
+        sql-type="text" 
     />
     <property
         name="comment"
         type="java.lang.String"
         column="comment"
-        length="-1"
+        sql-type="text" 
     />
     <property
         name="source"
         column="to_media_folder"
     />
     <many-to-one
-        name="feature"
-        class="mir.core.model.Feature"
-        column="to_feature"
-    />
-    <many-to-one
         name="publisher"
         class="mir.core.model.MirUser"
         column="to_publisher"
index 47405f6..1d8dade 100755 (executable)
@@ -22,7 +22,7 @@
         column="id"
     >
         <generator class="sequence">
-               <param name="sequence">rights_id_seq</param> 
+               <param name="sequence">media_id_seq</param> 
         </generator> 
     </id>
     <property
@@ -36,7 +36,7 @@
         name="description"
         type="java.lang.String"
         column="description"
-        length="-1"
+        sql-type="text" 
     />
 
     <!-- associations -->
index cb0d9f2..c2e0c68 100755 (executable)
@@ -20,6 +20,7 @@
         name="id"
         type="int"
         column="id"
+        unsaved-value="0"
     >
         <generator class="sequence">
                <param name="sequence">topic_id_seq</param> 
@@ -36,7 +37,7 @@
         name="description"
         type="java.lang.String"
         column="description"
-        length="-1"
+        sql-type="text" 
     />
     <property
         name="filename"
     />
 
     <!-- associations -->
-    <set name="content" table="content_x_topic" lazy="true">
-           <key column="topic_id"/>
-           <many-to-many column="content_id" class="mir.core.model.Content"/>
-       </set> 
-       
-       <!--
+    <many-to-one name="parentTopic"
+       class="mir.core.model.Topic"
+       column="parent_id"
+       cascade="none"
+       not-null="false"/>      
+    
     <set 
-       name="childTopics"> 
-       inverse="true" 
-       cascade="all">
+       name="childTopics"
+       table="topic"
+       cascade="all"
+       inverse="true"
+       > 
        <key 
                column="parent_id"
        />
                class="mir.core.model.Topic"
         />
     </set>
-    <many-to-one 
-       name="parentTopic" 
-       column="parent_id" 
-       class="mir.core.model.Topic"
-    />
-    -->
 </class>
 </hibernate-mapping>
index e6cbf74..3ab8249 100755 (executable)
@@ -1,5 +1,5 @@
 /*
- * Topic.java
+ * TopicStub.java created on 30.08.2003
  * 
  * Copyright (C) 2001, 2002, 2003 The Mir-coders group
  *
@@ -39,51 +39,68 @@ import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.commons.lang.builder.ToStringBuilder;
 
 /**
- * 
- * Topic
+ * TopicStub
  * @author idefix
- * @version $Id: Topic.java,v 1.3 2003/09/05 20:23:59 idfx Exp $
+ * @version $Id: Topic.java,v 1.4 2003/09/30 19:26:02 idfx Exp $
  */
-public class Topic extends TopicStub implements Serializable {
-    
-    private Set content;
+public class Topic extends TopicCore implements Serializable {
+       
+       private Set childTopics;
+       private Topic parentTopic;
+
+       /**
+        * 
+        */
+       public Topic() {
+               super();
+       }
 
-    /** default constructor */
-    public Topic() {
-                       super();
-    }
-               /**
-                * @return
-                */
-               public Set getContent() {
-                       return content;
-               }
+       /**
+        * @return
+        */
+       public Set getChildTopics() {
+               return childTopics;
+       }
 
-               /**
-                * @param content
-                */
-               public void setContent(Set content) {
-                       this.content = content;
-               }
+       /**
+        * @param set
+        */
+       public void setChildTopics(Set set) {
+               childTopics = set;
+       }
+       
+       /**
+        * @return
+        */
+       public Topic getParentTopic() {
+               return parentTopic;
+       }
 
-    public String toString() {
-        return new ToStringBuilder(this)
-            .append("id", getId())
-            .toString();
-    }
+       /**
+        * @param topic
+        */
+       public void setParentTopic(Topic topic) {
+               parentTopic = topic;
+       }
 
-    public boolean equals(Object other) {
-        if ( !(other instanceof Topic) ) return false;
-        Topic castOther = (Topic) other;
-        return new EqualsBuilder()
-            .append(this.getId(), castOther.getId())
-            .isEquals();
-    }
+       public String toString() {
+                       return new ToStringBuilder(this)
+                                       .append("id", getId())
+                                       .append("title", getTitle())
+                                       .toString();
+       }
 
-    public int hashCode() {
-        return new HashCodeBuilder()
-            .append(getId())
-            .toHashCode();
-    }
+       public boolean equals(Object other) {
+                       if ( !(other instanceof Topic) ) return false;
+                       Topic castOther = (Topic) other;
+                       return new EqualsBuilder()
+                                       .append(this.getId(), castOther.getId())
+                                       .isEquals();
+       }
 
+       public int hashCode() {
+                       return new HashCodeBuilder()
+                                       .append(getId())
+                                       .toHashCode();
+       }
 }
diff --git a/source/mir/core/model/TopicStub.java b/source/mir/core/model/TopicStub.java
deleted file mode 100755 (executable)
index cc9c1c8..0000000
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- * TopicStub.java created on 30.08.2003
- * 
- * Copyright (C) 2001, 2002, 2003 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  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.
- */
-package mir.core.model;
-
-import java.io.Serializable;
-
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
-
-/**
- * TopicStub
- * @author idefix
- * @version $Id: TopicStub.java,v 1.1 2003/09/05 20:23:59 idfx Exp $
- */
-public class TopicStub implements Serializable {
-       
-       /** identifier field */
-       private Integer id;
-
-       /** persistent field */
-       private String title;
-
-       /** nullable persistent field */
-       private String description;
-
-       /** persistent field */
-       private String filename;
-
-       /** nullable persistent field */
-       private String mainUrl;
-
-       /** nullable persistent field */
-       private String archivUrl;
-
-       /** nullable persistent field */
-       private mir.core.model.Topic parentTopic;
-
-       /**
-        * 
-        */
-       public TopicStub() {
-               super();
-       }
-
-       public java.lang.Integer getId() {
-                       return this.id;
-       }
-
-       public void setId(java.lang.Integer id) {
-                       this.id = id;
-       }
-
-       public java.lang.String getTitle() {
-                       return this.title;
-       }
-
-       public void setTitle(java.lang.String title) {
-                       this.title = title;
-       }
-
-       public java.lang.String getDescription() {
-                       return this.description;
-       }
-
-       public void setDescription(java.lang.String description) {
-                       this.description = description;
-       }
-
-       public java.lang.String getFilename() {
-                       return this.filename;
-       }
-
-       public void setFilename(java.lang.String filename) {
-                       this.filename = filename;
-       }
-
-       public java.lang.String getMainUrl() {
-                       return this.mainUrl;
-       }
-
-       public void setMainUrl(java.lang.String mainUrl) {
-                       this.mainUrl = mainUrl;
-       }
-
-       public java.lang.String getArchivUrl() {
-                       return this.archivUrl;
-       }
-
-       public void setArchivUrl(java.lang.String archivUrl) {
-                       this.archivUrl = archivUrl;
-       }
-
-       public mir.core.model.Topic getParentTopic() {
-                       return this.parentTopic;
-       }
-
-       public void setParentTopic(mir.core.model.Topic parentTopic) {
-                       this.parentTopic = parentTopic;
-       }
-
-       public String toString() {
-                       return new ToStringBuilder(this)
-                                       .append("id", getId())
-                                       .toString();
-       }
-
-       public boolean equals(Object other) {
-                       if ( !(other instanceof Topic) ) return false;
-                       Topic castOther = (Topic) other;
-                       return new EqualsBuilder()
-                                       .append(this.getId(), castOther.getId())
-                                       .isEquals();
-       }
-
-       public int hashCode() {
-                       return new HashCodeBuilder()
-                                       .append(getId())
-                                       .toHashCode();
-       }
-
-
-}
index 4944a74..aaedfed 100755 (executable)
         type="java.lang.String"
         column="title"
         not-null="true"
-        length="80"
+        length="255"
     />
     <property
         name="subtitle"
         type="java.lang.String"
         column="subtitle"
-        length="30"
+        length="128"
     />
     <property
         name="edittitle"
         type="java.lang.String"
         column="edittitle"
-        length="30"
+        length="128"
     />
     <property
         name="date"
         name="description"
         type="java.lang.String"
         column="description"
-        length="-1"
-    />
-    <property
-        name="keywords"
-        type="java.lang.String"
-        column="keywords"
-        length="-1"
+        sql-type="text" 
     />
     <property
         name="comment"
         type="java.lang.String"
         column="comment"
-        length="-1"
+        sql-type="text" 
     />
     <property
         name="source"
         column="to_media_folder"
     />
     <many-to-one
-        name="feature"
-        class="mir.core.model.Feature"
-        column="to_feature"
-    />
-    <many-to-one
         name="publisher"
         class="mir.core.model.MirUser"
         column="to_publisher"
index 4ae71c7..3d4df0d 100755 (executable)
         type="java.lang.String"
         column="title"
         not-null="true"
-        length="80"
+        length="255"
     />
     <property
         name="subtitle"
         type="java.lang.String"
         column="subtitle"
-        length="30"
+        length="128"
     />
     <property
         name="edittitle"
         type="java.lang.String"
         column="edittitle"
-        length="30"
+        length="128"
     />
     <property
         name="date"
         name="description"
         type="java.lang.String"
         column="description"
-        length="-1"
-    />
-    <property
-        name="keywords"
-        type="java.lang.String"
-        column="keywords"
-        length="-1"
+        sql-type="text" 
     />
     <property
         name="comment"
         type="java.lang.String"
         column="comment"
-        length="-1"
+        sql-type="text" 
     />
     <property
         name="source"
         column="to_media_folder"
     />
     <many-to-one
-        name="feature"
-        class="mir.core.model.Feature"
-        column="to_feature"
-    />
-    <many-to-one
         name="publisher"
         class="mir.core.model.MirUser"
         column="to_publisher"