Author: seba.wagner
Date: Wed Dec 24 08:49:08 2008
New Revision: 1732
Modified:
trunk/webapp/filetest.keystore
trunk/webapp/src/app/hibernate.cfg.xml
trunk/webapp/src/app/org/openmeetings/app/data/record/WhiteboardConvertionJobManager.java
trunk/webapp/src/app/org/openmeetings/app/hibernate/beans/recording/RecordingConversionJob.hbm.xml
trunk/webapp/src/app/org/openmeetings/app/hibernate/beans/recording/RecordingConversionJob.java
trunk/webapp/src/app/org/openmeetings/app/hibernate/utils/HibernateUtil.java
Log:
Fixes:
Issue 550 Rework of Recording
Batch Conversion in 100 Blocks and counter
Modified: trunk/webapp/filetest.keystore
==============================================================================
Binary files. No diff available.
Modified: trunk/webapp/src/app/hibernate.cfg.xml
==============================================================================
--- trunk/webapp/src/app/hibernate.cfg.xml (original)
+++ trunk/webapp/src/app/hibernate.cfg.xml Wed Dec 24 08:49:08 2008
@@ -3,6 +3,7 @@
<hibernate-configuration>
<session-factory>
+
<!-- User / Password -->
<property name="connection.username">root</property>
<property name="connection.password"></property>
@@ -22,8 +23,8 @@
<!-- properties -->
- <property name="show_sql">false</property>
- <property name="format_sql">false</property>
+ <property name="show_sql">true</property>
+ <property name="format_sql">true</property>
<property name="use_outer_join">false</property>
<property
name="hibernate.query.factory_class">org.hibernate.hql.ast.ASTQueryTranslatorFactory</property>
<property
name="connection.provider_class
">org.hibernate.connection.C3P0ConnectionProvider</property>
Modified:
trunk/webapp/src/app/org/openmeetings/app/data/record/WhiteboardConvertionJobManager.java
==============================================================================
---
trunk/webapp/src/app/org/openmeetings/app/data/record/WhiteboardConvertionJobManager.java
(original)
+++
trunk/webapp/src/app/org/openmeetings/app/data/record/WhiteboardConvertionJobManager.java
Wed Dec 24 08:49:08 2008
@@ -71,6 +71,7 @@
recordingConversionJob.setRecording(recording);
recordingConversionJob.setStarted(new
Date());
recordingConversionJob.setEndTimeInMilliSeconds(0L);
+
recordingConversionJob.setImageNumber(0L);
recordingConversionJob.setCurrentWhiteBoardAsXml("");
RecordingConversionJobDaoImpl.getInstance().addRecordingConversionJob(recordingConversionJob);
@@ -236,8 +237,6 @@
//log.debug(out.toString());
- Long fileNumber = recordingConversionJob.getEndTimeInMilliSeconds();
-
// String firstImageName =
this.generateFileName(recordingConversionJob.getRecordingConversionJobId(),
fileNumber);
// log.debug("Write File To: "+firstImageName);
//
@@ -251,7 +250,7 @@
//
// log.debug("stringWriter"+stringWriter.toString());
- String firstImageName =
this.generateSVGFileDebug(recordingConversionJob.getRecordingConversionJobId(),
fileNumber);
+ String firstImageName =
this.generateSVGFileDebug(recordingConversionJob.getRecordingConversionJobId(),
recordingConversionJob.getImageNumber());
log.debug("Write File To: " + firstImageName);
FileWriter fileWriter = new FileWriter(firstImageName);
@@ -259,12 +258,12 @@
recordingConversionJob.setEndTimeInMilliSeconds(recordingConversionJob.getEndTimeInMilliSeconds()
+ numberOfMilliseconds);
recordingConversionJob.setCurrentWhiteBoardAsXml(roomRecordingInXML);
-
+
recordingConversionJob.setImageNumber(recordingConversionJob.getImageNumber()+1);
RecordingConversionJobDaoImpl.getInstance().updateRecordingConversionJobs(recordingConversionJob);
}
- private String generateSVGFileDebug(Long conversionJobId, Long
fileNumber) throws Exception {
+ private String generateSVGFileDebug(Long conversionJobId, Long
imageNumber) throws Exception {
String recordingRootDir
=
"/Users/swagner/Documents/work/red5_distros/red5_r3200_snapshot/webapps/openmeetings/test/";
String recordingFileDir = recordingRootDir + File.separatorChar +
conversionJobId;
@@ -272,8 +271,16 @@
if (!recordingFileDirFolder.exists()) {
recordingFileDirFolder.mkdir();
}
+ Double numberOfFolder = Math.floor(imageNumber / 100);
+ String folderDir = ""+numberOfFolder.intValue();
+
+ String batchFileSVGDir = recordingFileDir + File.separatorChar +
folderDir;
+ File recordingBatchFileDirFolder = new File(batchFileSVGDir);
+ if (!recordingBatchFileDirFolder.exists()) {
+ recordingBatchFileDirFolder.mkdir();
+ }
- return recordingFileDir + File.separatorChar + fileNumber + ".svg";
+ return batchFileSVGDir + File.separatorChar + imageNumber + ".svg";
}
private String generateSVGFileName(Long conversionJobId, Long
fileNumber)
throws Exception {
Modified:
trunk/webapp/src/app/org/openmeetings/app/hibernate/beans/recording/RecordingConversionJob.hbm.xml
==============================================================================
---
trunk/webapp/src/app/org/openmeetings/app/hibernate/beans/recording/RecordingConversionJob.hbm.xml
(original)
+++
trunk/webapp/src/app/org/openmeetings/app/hibernate/beans/recording/RecordingConversionJob.hbm.xml
Wed Dec 24 08:49:08 2008
@@ -7,6 +7,7 @@
<generator class="increment"/>
</id>
<many-to-one outer-join="true" insert="true" column="recording_id"
lazy="false" update="true" name="recording"
class="org.openmeetings.app.hibernate.beans.recording.Recording"/>
+ <property name="imageNumber" type="long" column="imagenumber"/>
<property name="started" type="java.util.Date" column="started"/>
<property name="ended" type="java.util.Date" column="ended"/>
<property name="currentWhiteBoardAsXml" type="text"
column="currentwhiteboardasxml"/>
Modified:
trunk/webapp/src/app/org/openmeetings/app/hibernate/beans/recording/RecordingConversionJob.java
==============================================================================
---
trunk/webapp/src/app/org/openmeetings/app/hibernate/beans/recording/RecordingConversionJob.java
(original)
+++
trunk/webapp/src/app/org/openmeetings/app/hibernate/beans/recording/RecordingConversionJob.java
Wed Dec 24 08:49:08 2008
@@ -11,6 +11,7 @@
public class RecordingConversionJob {
private long recordingConversionJobId;
+ private Long imageNumber = 0L;
private Recording recording;
private Date started;
private Date ended;
@@ -44,6 +45,18 @@
}
public void setRecording(Recording recording) {
this.recording = recording;
+ }
+
+ /**
+ * @hibernate.property
+ * column="imagenumber"
+ * type="long"
+ */
+ public Long getImageNumber() {
+ return imageNumber;
+ }
+ public void setImageNumber(Long imageNumber) {
+ this.imageNumber = imageNumber;
}
/**
Modified:
trunk/webapp/src/app/org/openmeetings/app/hibernate/utils/HibernateUtil.java
==============================================================================
---
trunk/webapp/src/app/org/openmeetings/app/hibernate/utils/HibernateUtil.java
(original)
+++
trunk/webapp/src/app/org/openmeetings/app/hibernate/utils/HibernateUtil.java
Wed Dec 24 08:49:08 2008
@@ -22,7 +22,7 @@
private static final Owner fakeOwner = new Owner(false);
/** set this to false to test with JUnit **/
- private static final boolean isLife = true;
+ private static final boolean isLife = false;
/**
* get the hibernate session and set it on the thread local. Returns
trueOwner if
* it actually opens a session
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"OpenMeetings developers" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/openmeetings-dev?hl=en
-~----------~----~----~----~------~----~------~--~---
