You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2012/06/25 11:57:02 UTC

svn commit: r1353447 - in /incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app: data/basic/Fieldmanagment.java installation/ImportInitvalues.java persistence/beans/lang/Fieldvalues.java xmlimport/LanguageImport.java

Author: solomax
Date: Mon Jun 25 09:57:00 2012
New Revision: 1353447

URL: http://svn.apache.org/viewvc?rev=1353447&view=rev
Log:
OPENMEETINGS-334 is fixed

Modified:
    incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/basic/Fieldmanagment.java
    incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/installation/ImportInitvalues.java
    incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/lang/Fieldvalues.java
    incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/xmlimport/LanguageImport.java

Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/basic/Fieldmanagment.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/basic/Fieldmanagment.java?rev=1353447&r1=1353446&r2=1353447&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/basic/Fieldmanagment.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/basic/Fieldmanagment.java Mon Jun 25 09:57:00 2012
@@ -359,35 +359,15 @@ public class Fieldmanagment {
 
 	}
 
-	public Fieldvalues addField(String fieldName) {
+	public Fieldvalues addFieldById(String fieldName, Long fieldvalues_id) {
 		try {
 			Fieldvalues fl = new Fieldvalues();
-			fl.setStarttime(new Date());
-			fl.setName(fieldName);
-			fl.setDeleted("false");
-
-			fl = em.merge(fl);
-
-			return fl;
-		} catch (Exception ex2) {
-			log.error("[getConfKey]: ", ex2);
-		}
-		return null;
-	}
-
-	public Long addFieldById(String fieldName, Long fieldvalues_id) {
-		try {
-
-			Fieldvalues fl = new Fieldvalues();
 			fl.setFieldvalues_id(fieldvalues_id);
 			fl.setStarttime(new Date());
 			fl.setName(fieldName);
 			fl.setDeleted("false");
 
-			fl = em.merge(fl);
-			Long fieldId = fl.getFieldvalues_id();
-
-			return fieldId;
+			return em.merge(fl);
 		} catch (Exception ex2) {
 			log.error("[getConfKey]: ", ex2);
 		}
@@ -483,9 +463,14 @@ public class Fieldmanagment {
 		return new Long(-1);
 	}
 
+	public long getNextFieldvaluesId() {
+		TypedQuery<Long> q = em.createNamedQuery("getFieldCount", Long.class);
+		return q.getSingleResult() + 1;
+	}
+	
 	public Long addFieldAndLabel(String name, String value, Long language_id) {
 		try {
-			Fieldvalues fv = addField(name);
+			Fieldvalues fv = addFieldById(name, getNextFieldvaluesId());
 			if (fv.getFieldvalues_id() > 0) {
 				this.addFieldValueByFieldAndLanguage(fv,
 						language_id, value);

Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/installation/ImportInitvalues.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/installation/ImportInitvalues.java?rev=1353447&r1=1353446&r2=1353447&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/installation/ImportInitvalues.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/installation/ImportInitvalues.java Mon Jun 25 09:57:00 2012
@@ -945,7 +945,7 @@ public class ImportInitvalues {
 				Fieldvalues fv = null;
 				// Only do that for the first field-set
 				if (!langFieldIdIsInited) {
-					fv = fieldmanagment.addField(name);
+					fv = fieldmanagment.addFieldById(name, id);
 				} else {
 					fv = fieldmanagment.getFieldvaluesById(id);
 				}

Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/lang/Fieldvalues.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/lang/Fieldvalues.java?rev=1353447&r1=1353446&r2=1353447&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/lang/Fieldvalues.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/lang/Fieldvalues.java Mon Jun 25 09:57:00 2012
@@ -25,22 +25,22 @@ import java.util.Set;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
+import javax.persistence.NamedQueries;
+import javax.persistence.NamedQuery;
 import javax.persistence.OneToMany;
 import javax.persistence.Table;
 import javax.persistence.Transient;
 
 @Entity
+@NamedQueries({
+	@NamedQuery(name = "getFieldCount", query = "SELECT COUNT(fv) FROM Fieldvalues flv WHERE flv.deleted LIKE 'false' ")
+})
 @Table(name = "fieldvalues")
 public class Fieldvalues implements Serializable {
-
-	
 	private static final long serialVersionUID = -3439614511218028085L;
 	@Id
-	@GeneratedValue(strategy = GenerationType.IDENTITY)
 	@Column(name="fieldvalues_id")
 	private Long fieldvalues_id;
 	@Column(name="name")
@@ -111,5 +111,4 @@ public class Fieldvalues implements Seri
 	public void setFieldlanguagesvalue(Fieldlanguagesvalues fieldlanguagesvalue) {
 		this.fieldlanguagesvalue = fieldlanguagesvalue;
 	}
-	
 }

Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/xmlimport/LanguageImport.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/xmlimport/LanguageImport.java?rev=1353447&r1=1353446&r2=1353447&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/xmlimport/LanguageImport.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/xmlimport/LanguageImport.java Mon Jun 25 09:57:00 2012
@@ -77,7 +77,7 @@ public class LanguageImport {
 		Fieldvalues fv = fieldmanagment.getFieldvaluesById(fieldvalues_id);
 
 		if (fv == null) {
-			fieldmanagment.addFieldById(fieldName, fieldvalues_id);
+			fv = fieldmanagment.addFieldById(fieldName, fieldvalues_id);
 		}
 
 		Fieldlanguagesvalues flv = fieldmanagment.getFieldByIdAndLanguage(