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 2016/11/08 01:31:16 UTC
svn commit: r1768617 - in /openmeetings/application/branches/3.1.x:
openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryDocumentConverter.java
openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java
Author: solomax
Date: Tue Nov 8 01:31:16 2016
New Revision: 1768617
URL: http://svn.apache.org/viewvc?rev=1768617&view=rev
Log:
[OPENMEETINGS-1503] saved wml file can be loaded to WB
Modified:
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryDocumentConverter.java
openmeetings/application/branches/3.1.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java
Modified: openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryDocumentConverter.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryDocumentConverter.java?rev=1768617&r1=1768616&r2=1768617&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryDocumentConverter.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryDocumentConverter.java Tue Nov 8 01:31:16 2016
@@ -18,6 +18,8 @@
*/
package org.apache.openmeetings.core.documents;
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_WML;
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
import java.io.File;
@@ -25,11 +27,9 @@ import java.io.FileOutputStream;
import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.io.Writer;
-import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import org.apache.openmeetings.util.OmFileHelper;
-import org.apache.openmeetings.util.stringhandlers.StringComparer;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
@@ -39,25 +39,11 @@ import com.thoughtworks.xstream.io.xml.X
public class LibraryDocumentConverter {
private static final Logger log = Red5LoggerFactory.getLogger(LibraryDocumentConverter.class, webAppRootKey);
- private static final String fileExt = ".wml";
-
public static String writeToLocalFolder(String fileName, @SuppressWarnings("rawtypes")ArrayList objList) {
try {
log.debug("filePath: " + OmFileHelper.getUploadWmlDir().getCanonicalPath());
- String fileNameExtName = fileName.substring(fileName.length()-4,fileName.length());
- if (fileNameExtName.equals(fileExt)){
- fileName = StringComparer.getInstance().compareForRealPaths(fileName.substring(0, fileName.length()-4));
- } else {
- fileName = StringComparer.getInstance().compareForRealPaths(fileName.substring(0, fileName.length()));
- }
-
- if (fileName.length() <= 0){
- //return new Long(-21);
- return "-20";
- }
- //Add the Folder for the wmlFiles if it does not exist yet
- File file = new File(OmFileHelper.getUploadWmlDir(), fileName + fileExt);
+ File file = new File(OmFileHelper.getUploadWmlDir(), OmFileHelper.getName(fileName, EXTENSION_WML));
if (file.exists()){
return "-20";
@@ -70,14 +56,11 @@ public class LibraryDocumentConverter {
log.debug("Write to " + file);
try (OutputStream os = new FileOutputStream(file);
- Writer out = new OutputStreamWriter(os, StandardCharsets.UTF_8))
+ Writer out = new OutputStreamWriter(os, UTF_8))
{
out.write(xmlString);
out.flush();
}
-
- //return new Long(1);
-
return file.getCanonicalPath();
} catch (Exception err){
log.error("writeToLocalFolder",err);
Modified: openmeetings/application/branches/3.1.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java?rev=1768617&r1=1768616&r2=1768617&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java Tue Nov 8 01:31:16 2016
@@ -230,7 +230,11 @@ public class OmFileHelper {
public static File getStreamsSubDir(String name) {
return getDir(getStreamsDir(), name);
}
-
+
+ public static String getName(String name, String ext) {
+ return String.format("%s.%s", name, ext);
+ }
+
public static File getRecordingMetaData(Long roomId, String name) {
return new File(getStreamsSubDir(roomId), name + FLV_EXTENSION);
}