Author: solomax
Date: Thu Jan 23 09:16:29 2014
New Revision: 1560614
URL: http://svn.apache.org/r1560614
Log:
External user import is fixed; Interview converting is fixed;
Modified:
openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/user/AbstractUserDao.java
openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/entity/user/User.java
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/converter/BaseConverter.java
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/converter/FlvRecorderConverter.java
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/flvrecord/listener/async/BaseStreamWriter.java
Modified:
openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/user/AbstractUserDao.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/user/AbstractUserDao.java?rev=1560614&r1=1560613&r2=1560614&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/user/AbstractUserDao.java
(original)
+++
openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/user/AbstractUserDao.java
Thu Jan 23 09:16:29 2014
@@ -314,7 +314,6 @@ public class AbstractUserDao {
public User getUserByEmail(String email) {
TypedQuery<User> query = em.createNamedQuery("getUserByEmail",
User.class);
query.setParameter("email", email);
- query.setParameter("deleted", true);
User us = null;
try {
us = query.getSingleResult();
@@ -392,7 +391,13 @@ public class AbstractUserDao {
}
public User getContact(String email, String firstName, String lastName,
Long langId, String tzId, User owner) {
- User to = getUserByEmail(email);
+ User to = null;
+ try {
+ to = em.createNamedQuery("getContactByEmailAndUser",
User.class)
+ .setParameter("email",
email).setParameter("type", User.Type.contact).setParameter("ownerId",
owner.getUser_id()).getSingleResult();
+ } catch (Exception e) {
+ //no-op
+ }
if (to == null) {
to = new User();
to.setType(Type.contact);
Modified:
openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/entity/user/User.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/entity/user/User.java?rev=1560614&r1=1560613&r2=1560614&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/entity/user/User.java
(original)
+++
openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/entity/user/User.java
Thu Jan 23 09:16:29 2014
@@ -78,12 +78,11 @@ import org.simpleframework.xml.Root;
+ "AND u.adresses.email = :email AND u.deleted = false
AND u.type <> :type"),
@NamedQuery(name = "getUserByName", query = "SELECT u FROM User as u "
+ " where u.login = :login" + " AND u.deleted <>
:deleted"),
- @NamedQuery(name = "getUserByEmail", query = "SELECT u FROM User as u "
- + " where u.adresses.email = :email"
- + " AND u.deleted <> :deleted"),
+ @NamedQuery(name = "getUserByEmail", query = "SELECT u FROM User as u
WHERE deleted = false AND u.adresses.email = :email"),
@NamedQuery(name = "getUserByHash", query = "SELECT u FROM User as u "
+ " where u.resethash = :resethash"
+ " AND u.deleted <> :deleted"),
+ @NamedQuery(name = "getContactByEmailAndUser", query = "SELECT u FROM
User u WHERE u.deleted = false AND u.adresses.email = :email AND u.type = :type
AND u.ownerId = :ownerId"),
@NamedQuery(name = "selectMaxFromUsersWithSearch", query = "select
count(c.user_id) from User c "
+ "where c.deleted = false " + "AND ("
+ "lower(c.login) LIKE :search "
Modified:
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/converter/BaseConverter.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/converter/BaseConverter.java?rev=1560614&r1=1560613&r2=1560614&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/converter/BaseConverter.java
(original)
+++
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/converter/BaseConverter.java
Thu Jan 23 09:16:29 2014
@@ -110,18 +110,40 @@ public abstract class BaseConverter {
,
metaDataDao.getAudioMetaDataByRecording(flvRecording.getFlvRecordingId()));
}
- private String[] addSoxPad(List<ConverterProcessResult> returnLog,
String job, double length, double position,
- String inFile, String outFile) {
- if (length >= 0 && position >= 0 && (length > 0 || position >
0)) {
- String[] argv = new String[] { getPathToSoX(), inFile,
outFile, "pad", "" + length, "" + position };
+ private String[] addSoxPad(List<ConverterProcessResult> returnLog,
String job, double length, double position, String inFile, String outFile) {
+ //FIXME need to check this
+ if (length < 0 || position < 0) {
+ log.debug("::addSoxPad " + job + " Invalid parameters: "
+ + " length = " + length + "; position =
" + position + "; inFile = " + inFile);
+ }
+ length = length < 0 ? 0 : length;
+ position = position < 0 ? 0 : position;
+
+ String[] argv = new String[] { getPathToSoX(), inFile, outFile,
"pad", "" + length, "" + position };
- returnLog.add(ProcessHelper.executeScript(job, argv));
- return argv;
- } else {
- log.debug("::addSoxPad " + job + " Invalid parameters:
" + " length = " + length + "; position = "
- + position + "; inFile = " + inFile);
+ returnLog.add(ProcessHelper.executeScript(job, argv));
+ return argv;
+ }
+
+ protected FlvRecordingMetaData waitForTheStream(long metaId) throws
InterruptedException {
+ FlvRecordingMetaData metaData = metaDataDao.get(metaId);
+ if (metaData.getStreamStatus() != Status.STOPPED) {
+ log.debug("### meta Stream not yet written to disk " +
metaId);
+ boolean doStop = true;
+ while(doStop) {
+ log.trace("### Stream not yet written Thread
Sleep - " + metaId);
+
+ metaData = metaDataDao.get(metaId);
+
+ if (metaData.getStreamStatus() ==
Status.STOPPED) {
+ log.debug("### Stream now written
Thread continue - " );
+ doStop = false;
+ }
+
+ Thread.sleep(100L);
+ }
}
- return null;
+ return metaData;
}
protected void stripAudioFirstPass(FlvRecording flvRecording,
@@ -141,22 +163,7 @@ public abstract class BaseConverter {
continue;
}
- if (metaData.getStreamStatus() !=
Status.STOPPED) {
- log.debug("### meta Stream not yet
written to disk " + metaId);
- boolean doStop = true;
- while(doStop) {
- log.debug("### Stream not yet
written Thread Sleep - " + metaId);
-
- metaData =
metaDataDao.get(metaId);
-
- if (metaData.getStreamStatus()
== Status.STOPPED) {
- log.debug("### Stream
now written Thread continue - " );
- doStop = false;
- }
-
- Thread.sleep(100L);
- }
- }
+ metaData = waitForTheStream(metaId);
File inputFlvFile = new File(streamFolder,
metaData.getStreamName() + ".flv");
Modified:
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/converter/FlvRecorderConverter.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/converter/FlvRecorderConverter.java?rev=1560614&r1=1560613&r2=1560614&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/converter/FlvRecorderConverter.java
(original)
+++
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/converter/FlvRecorderConverter.java
Thu Jan 23 09:16:29 2014
@@ -91,26 +91,7 @@ public class FlvRecorderConverter extend
throw new Exception("Stream has not been
started, error in recording");
}
- if (screenMetaData.getStreamStatus() != Status.STOPPED)
{
-
- log.debug("### meta ScreenStream not yet
written to disk"
- +
screenMetaData.getFlvRecordingMetaDataId());
- boolean doStop = true;
- while (doStop) {
-
- log.debug("### Stream not yet written
Thread Sleep - "
- +
screenMetaData.getFlvRecordingMetaDataId());
-
- Thread.sleep(100L);
-
- screenMetaData =
metaDataDao.get(screenMetaData.getFlvRecordingMetaDataId());
-
- if (screenMetaData.getStreamStatus() ==
Status.STOPPED) {
- log.debug("### Screen Stream
now written Thread continue - ");
- doStop = false;
- }
- }
- }
+ screenMetaData =
waitForTheStream(screenMetaData.getFlvRecordingMetaDataId());
String hashFileFullName =
screenMetaData.getStreamName() + "_FINAL_WAVE.wav";
String outputFullWav = new File(streamFolder,
hashFileFullName).getCanonicalPath();
Modified:
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/flvrecord/listener/async/BaseStreamWriter.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/flvrecord/listener/async/BaseStreamWriter.java?rev=1560614&r1=1560613&r2=1560614&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/flvrecord/listener/async/BaseStreamWriter.java
(original)
+++
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/flvrecord/listener/async/BaseStreamWriter.java
Thu Jan 23 09:16:29 2014
@@ -128,7 +128,7 @@ public abstract class BaseStreamWriter i
CachedEvent item = queue.poll(100,
TimeUnit.MICROSECONDS);
if (item != null) {
if (dostopping) {
- log.debug("metadatId: {} ::
Recording stopped but still packets to write to file!", metaDataId);
+ log.trace("metadatId: {} ::
Recording stopped but still packets to write to file!", metaDataId);
}
packetReceived(item);
