Revision: 3779
Author: seba.wagner
Date: Wed Jun 8 06:54:38 2011
Log: [No log message]
http://code.google.com/p/openmeetings/source/detail?r=3779
Modified:
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/whiteboard/base/remoteWhiteboard.lzx
/trunk/singlewebapp/src/app/org/openmeetings/app/documents/LibraryDocumentConverter.java
/trunk/singlewebapp/src/app/org/openmeetings/app/documents/LibraryWmlLoader.java
/trunk/singlewebapp/src/app/org/openmeetings/app/remote/ConferenceLibrary.java
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/whiteboard/base/remoteWhiteboard.lzx
Tue Jun 7 03:24:12 2011
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/whiteboard/base/remoteWhiteboard.lzx
Wed Jun 8 06:54:38 2011
@@ -133,8 +133,8 @@
<method name="prepareLoadWMLFile" args="itemObj">
if ($debug) Debug.write("loadWMLFile: ",itemObj);
- var Itemfilename = itemObj.fileName;
- this.loadWMLFile.setAttribute('filename', Itemfilename);
+
+ this.loadWMLFile.setAttribute('fileExplorerItemId',
itemObj.fileExplorerItemId);
this.loadWMLFile.doCall();
</method>
@@ -142,10 +142,10 @@
<netRemoteCallHib name="loadWMLFile"
funcname="fileservice.loadWmlObject"
remotecontext="$once{ canvas.thishib }" >
- <attribute name="filename" type="string" value=""/>
+ <attribute name="fileExplorerItemId" type="number" value="0"/>
<netparam><method name="getValue">return
canvas.sessionId;</method></netparam>
<netparam><method name="getValue">return
hib.currentroomid;</method></netparam>
- <netparam><method name="getValue">return
parent.filename;</method></netparam>
+ <netparam><method name="getValue">return
parent.fileExplorerItemId;</method></netparam>
<handler name="ondata" args="value">
<![CDATA[
//The onResult-Handler will be called be the rtmpconnection
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/documents/LibraryDocumentConverter.java
Wed Apr 20 05:32:18 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/documents/LibraryDocumentConverter.java
Wed Jun 8 06:54:38 2011
@@ -33,7 +33,7 @@
private static final String fileExt = ".wml";
- private static final String wmlFolderName = "stored/";
+ private static final String wmlFolderName = "stored" +
File.separatorChar;
private static LibraryDocumentConverter instance;
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/documents/LibraryWmlLoader.java
Wed Apr 20 05:32:18 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/documents/LibraryWmlLoader.java
Wed Jun 8 06:54:38 2011
@@ -40,7 +40,7 @@
public ArrayList loadWmlFile(String filePath, String fileName){
try {
LinkedHashMap lMap = new LinkedHashMap();
- String filepathComplete =
filePath+wmlFolderName+fileName+fileExt;
+ String filepathComplete =
filePath+wmlFolderName+fileName;
log.error("filepathComplete: "+filepathComplete);
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/remote/ConferenceLibrary.java
Mon May 30 13:39:45 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/remote/ConferenceLibrary.java
Wed Jun 8 06:54:38 2011
@@ -33,6 +33,8 @@
import org.openmeetings.app.remote.red5.ClientListManager;
import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
import org.openmeetings.utils.StoredFile;
+import org.openmeetings.utils.crypt.MD5;
+import org.openmeetings.utils.math.CalendarPatterns;
import org.red5.logging.Red5LoggerFactory;
import org.red5.server.api.IConnection;
import org.red5.server.api.Red5;
@@ -699,13 +701,14 @@
String roomName = room_id.toString();
String current_dir = ScopeApplicationAdapter.webAppPath
- + File.separatorChar + "upload" +
File.separatorChar
- + roomName + File.separatorChar;
+ + File.separatorChar + "upload" +
File.separatorChar;
log.debug("### this is my working directory: " +
current_dir);
+
+ String localFileName = MD5.do_checksum(new
Date().toString())+".wml";
String wmlPath = LibraryDocumentConverter.getInstance()
- .writeToLocalFolder(current_dir, fileName,
tObject);
+ .writeToLocalFolder(current_dir, localFileName,
tObject);
// String wmlPath = current_dir +
File.separatorChar+fileName
// +".xml";
@@ -714,35 +717,37 @@
.add(fileName, "", 0L, null, room_id, users_id,
false, // isFolder
false, // isImage
false, // isPresentation
- wmlPath, // WML Path
+ localFileName, // WML localFileName
true, // isStoredWML file
true);
return fileExplorerId;
}
} catch (Exception err) {
- log.error("[saveAsImage] ", err);
+ log.error("[saveAsObject] ", err);
}
return -1L;
}
- public ArrayList loadWmlObject(String SID, Long room_id, String
fileName) {
+ public ArrayList loadWmlObject(String SID, Long room_id, Long
fileExplorerItemId) {
try {
Long users_id =
Sessionmanagement.getInstance().checkSession(SID);
Long user_level =
Usermanagement.getInstance().getUserLevelByID(
users_id);
+
if
(AuthLevelmanagement.getInstance().checkUserLevel(user_level)) {
String roomName = room_id.toString();
String current_dir = ScopeApplicationAdapter.webAppPath
- + File.separatorChar + "upload" +
File.separatorChar
- + roomName + File.separatorChar;
+ + File.separatorChar + "upload" +
File.separatorChar;
log.debug("### this is my working directory: " +
current_dir);
+
+ FileExplorerItem fileExplorerItem =
FileExplorerItemDaoImpl.getInstance().getFileExplorerItemsById(fileExplorerItemId);
return
LibraryWmlLoader.getInstance().loadWmlFile(current_dir,
- fileName);
+ fileExplorerItem.getWmlFilePath());
}
} catch (Exception err) {
- log.error("[saveAsImage] ", err);
+ log.error("[loadWmlObject] ", err);
}
return null;
}
--
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.
