Revision: 3150
Author: seba.wagner
Date: Tue Mar 16 15:04:26 2010
Log: Fixes Issue 1161
Try with this revision
http://code.google.com/p/openmeetings/source/detail?r=3150
Modified:
/trunk/singlewebapp/src/app/org/openmeetings/app/data/flvrecord/FlvRecordingDaoImpl.java
/trunk/singlewebapp/src/roomservice/org/openmeetings/axis/services/RoomService.java
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/data/flvrecord/FlvRecordingDaoImpl.java
Sun Mar 7 15:21:49 2010
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/data/flvrecord/FlvRecordingDaoImpl.java
Tue Mar 16 15:04:26 2010
@@ -209,6 +209,34 @@
}
return null;
}
+
+ public List<FlvRecording> getFlvRecordingByRoomId(Long room_id) {
+ try {
+
+ String hql = "SELECT c FROM FlvRecording c " +
+ "WHERE c.deleted != :deleted " +
+ "AND room_id = :room_id " +
+ "ORDER BY c.isFolder DESC, c.fileName ";
+
+ Object idf = HibernateUtil.createSession();
+ Session session = HibernateUtil.getSession();
+ Transaction tx = session.beginTransaction();
+ Query query = session.createQuery(hql);
+ query.setString("deleted", "true");
+ query.setLong("room_id",room_id);
+
+ List<FlvRecording> flvRecordingList = query.list();
+ tx.commit();
+ HibernateUtil.closeSession(idf);
+
+ return flvRecordingList;
+ } catch (HibernateException ex) {
+ log.error("[getFlvRecordingByOwner]: ",ex);
+ } catch (Exception ex2) {
+ log.error("[getFlvRecordingByOwner]: ",ex2);
+ }
+ return null;
+ }
public List<FlvRecording> getFlvRecordingByParent(Long
parentFileExplorerItemId) {
try {
=======================================
---
/trunk/singlewebapp/src/roomservice/org/openmeetings/axis/services/RoomService.java
Mon Mar 8 12:19:31 2010
+++
/trunk/singlewebapp/src/roomservice/org/openmeetings/axis/services/RoomService.java
Tue Mar 16 15:04:26 2010
@@ -98,6 +98,40 @@
recordingListItems[count] =
flvRecording;
count++;
}
+
+ return recordingListItems;
+ }
+
+ return null;
+ }
+
+ return null;
+ } catch (Exception err) {
+ log.error("[getFlvRecordingByExternalRoomType] ",err);
+ throw new AxisFault(err.getMessage());
+ }
+ }
+
+ public FlvRecording[] getFlvRecordingByRoomId(String SID, Long roomId)
throws AxisFault {
+ try {
+
+ Long users_id =
Sessionmanagement.getInstance().checkSession(SID);
+ Long user_level =
Usermanagement.getInstance().getUserLevelByID(users_id);
+
+ if
(AuthLevelmanagement.getInstance().checkAdminLevel(user_level)){
+
+ List<FlvRecording> recordingList =
FlvRecordingDaoImpl.getInstance().getFlvRecordingByRoomId(roomId);
+
+ //We need to re-marshal the Rooms object cause Axis2 cannot use our
objects
+ if (recordingList!=null &&
recordingList.size()!=0) {
+ //roomsListObject.setRoomList(roomList);
+ FlvRecording[] recordingListItems = new
FlvRecording[recordingList.size()];
+ int count = 0;
+ for (Iterator<FlvRecording>it =
recordingList.iterator();it.hasNext();){
+ FlvRecording flvRecording =
it.next();
+ recordingListItems[count] =
flvRecording;
+ count++;
+ }
return recordingListItems;
}
--
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.
