Revision: 3862
Author: seba.wagner
Date: Sun Jun 26 03:21:14 2011
Log: Finalize importing files from external source
http://code.google.com/p/openmeetings/source/detail?r=3862
Modified:
/trunk/singlewebapp/src/app/org/openmeetings/app/data/file/FileProcessor.java
/trunk/singlewebapp/src/app/org/openmeetings/app/data/file/dao/FileExplorerItemDaoImpl.java
/trunk/singlewebapp/src/app/org/openmeetings/app/hibernate/beans/files/FileExplorerItem.hbm.xml
/trunk/singlewebapp/src/app/org/openmeetings/app/hibernate/beans/files/FileExplorerItem.java
/trunk/singlewebapp/src/app/org/openmeetings/app/remote/ConferenceLibrary.java
/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/FileExplorerUploadHandler.java
/trunk/singlewebapp/src/fileservice/org/openmeetings/axis/services/FileService.java
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/data/file/FileProcessor.java
Fri Jun 24 11:06:18 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/data/file/FileProcessor.java
Sun Jun 26 03:21:14 2011
@@ -72,7 +72,10 @@
}
- public HashMap<String, HashMap<String, Object>> processFile(Long userId,
Long room_id, boolean isOwner, InputStream is, Long parentFolderId, String
fileSystemName, String current_dir, Map<String, Object> hs) throws
Exception {
+ public HashMap<String, HashMap<String, Object>> processFile(Long userId,
Long room_id,
+ boolean isOwner, InputStream is, Long parentFolderId, String
fileSystemName,
+ String current_dir, Map<String, Object> hs, Long
externalFileId,
+ String externalType) throws Exception {
HashMap<String, HashMap<String, Object>> returnError = new
HashMap<String, HashMap<String, Object>>();
@@ -177,7 +180,8 @@
Long fileExplorerItemId =
FileExplorerItemDaoImpl.getInstance().add(
fileSystemName, fileHashName, // The Hashname of the file
parentFolderId, ownerId, room_id, userId, false, //
isFolder
- isImage, isPresentation, "", false, isChart);
+ isImage, isPresentation, "", false, isChart,
+ externalFileId, externalType);
log.debug("fileExplorerItemId: " + fileExplorerItemId);
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/data/file/dao/FileExplorerItemDaoImpl.java
Fri Jun 10 07:32:32 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/data/file/dao/FileExplorerItemDaoImpl.java
Sun Jun 26 03:21:14 2011
@@ -39,7 +39,8 @@
Long parentFileExplorerItemId, Long ownerId, Long room_id,
Long insertedBy, Boolean isFolder, Boolean isImage,
Boolean isPresentation, String wmlFilePath,
- Boolean isStoredWmlFile, Boolean isChart) {
+ Boolean isStoredWmlFile, Boolean isChart,
+ Long externalFileId, String externalType) {
log.debug(".add(): adding file " + fileName);
try {
FileExplorerItem fileItem = new FileExplorerItem();
@@ -58,6 +59,8 @@
fileItem.setWmlFilePath(wmlFilePath);
fileItem.setIsStoredWmlFile(isStoredWmlFile);
fileItem.setIsChart(isChart);
+ fileItem.setExternalFileId(externalFileId);
+ fileItem.setExternalType(externalType);
Object idf = HibernateUtil.createSession();
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/hibernate/beans/files/FileExplorerItem.hbm.xml
Mon May 30 13:39:45 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/hibernate/beans/files/FileExplorerItem.hbm.xml
Sun Jun 26 03:21:14 2011
@@ -26,5 +26,7 @@
<property name="wmlFilePath" type="string" column="wml_file_path"/>
<property name="isStoredWmlFile" type="boolean"
column="is_stored_wml_file"/>
<property name="isChart" type="boolean" column="is_chart"/>
+ <property name="externalFileId" type="long" column="external_file_id"/>
+ <property name="externalType" type="string" column="external_type"/>
</class>
</hibernate-mapping>
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/hibernate/beans/files/FileExplorerItem.java
Mon May 30 13:39:45 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/hibernate/beans/files/FileExplorerItem.java
Sun Jun 26 03:21:14 2011
@@ -37,6 +37,9 @@
private String wmlFilePath;
private Boolean isStoredWmlFile;
private Boolean isChart;
+
+ private Long externalFileId;
+ private String externalType;
/**
*
@@ -290,4 +293,29 @@
public void setIsChart(Boolean isChart) {
this.isChart = isChart;
}
-}
+
+ /**
+ * @hibernate.property
+ * column="external_file_id"
+ * type="long"
+ */
+ public Long getExternalFileId() {
+ return externalFileId;
+ }
+ public void setExternalFileId(Long externalFileId) {
+ this.externalFileId = externalFileId;
+ }
+
+ /**
+ * @hibernate.property
+ * column="external_type"
+ * type="string"
+ */
+ public String getExternalType() {
+ return externalType;
+ }
+ public void setExternalType(String externalType) {
+ this.externalType = externalType;
+ }
+
+}
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/remote/ConferenceLibrary.java
Sat Jun 11 00:57:08 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/remote/ConferenceLibrary.java
Sun Jun 26 03:21:14 2011
@@ -728,7 +728,7 @@
false, // isPresentation
localFileName, // WML localFileName
true, // isStoredWML file
- true);
+ true, 0L, "");
return fileExplorerId;
}
@@ -945,7 +945,7 @@
"", // WML Path
false, // isStoredWML file
false // isXmlFile
- );
+ , 0L, "");
} else {
return
FileExplorerItemDaoImpl.getInstance().add(fileName,
"", parentFileExplorerItemId, null, room_id,
@@ -955,7 +955,7 @@
"", // WML Paht
false, // isStoredWML file
false // isXmlFile
- );
+ , 0L, "");
}
}
} catch (Exception err) {
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/FileExplorerUploadHandler.java
Fri Jun 24 08:16:56 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/FileExplorerUploadHandler.java
Sun Jun 26 03:21:14 2011
@@ -75,7 +75,9 @@
FileProcessor fileProcessor = (FileProcessor)
context.getBean("openmeetings.FileProcessor");
- HashMap<String, HashMap<String, Object>> returnError =
fileProcessor.processFile(userId, room_id_to_Store, isOwner, is,
parentFolderId, fileSystemName, current_dir, hs);
+ HashMap<String, HashMap<String, Object>> returnError =
fileProcessor.processFile(userId, room_id_to_Store,
+ isOwner, is, parentFolderId, fileSystemName,
current_dir, hs,
+ 0L, ""); //externalFilesId, externalType
HashMap<String, Object> returnAttributes =
returnError.get("returnAttributes");
=======================================
---
/trunk/singlewebapp/src/fileservice/org/openmeetings/axis/services/FileService.java
Fri Jun 24 11:06:18 2011
+++
/trunk/singlewebapp/src/fileservice/org/openmeetings/axis/services/FileService.java
Sun Jun 26 03:21:14 2011
@@ -47,8 +47,8 @@
*
* @param SID
* @param externalUserId
- * @param externalUserType
* @param externalFileId
+ * @param externalType
* @param room_id
* @param isOwner
* @param path
@@ -57,8 +57,8 @@
* @return
* @throws AxisFault
*/
- public FileImportError[] importFile(String SID, Long externalUserId,
String externalUserType,
- String externalFileId, Long room_id,
boolean isOwner, String path,
+ public FileImportError[] importFile(String SID, Long externalUserId, Long
externalFileId,
+ String externalType, Long room_id,
boolean isOwner, String path,
Long parentFolderId, String
fileSystemName) throws AxisFault{
try {
@@ -76,12 +76,12 @@
URLConnection uc = url.openConnection();
InputStream inputstream = new
BufferedInputStream(uc.getInputStream());
- Users externalUser =
Usermanagement.getInstance().getUserByExternalIdAndType(externalUserId,
externalUserType);
+ Users externalUser =
Usermanagement.getInstance().getUserByExternalIdAndType(externalUserId,
externalType);
LinkedHashMap<String, Object> hs = new LinkedHashMap<String,
Object>();
hs.put("user", externalUser);
- HashMap<String, HashMap<String, Object>> returnError =
fileProcessor.processFile(externalUser.getExternalUserId(), room_id,
isOwner, inputstream, parentFolderId, fileSystemName, current_dir, hs);
+ HashMap<String, HashMap<String, Object>> returnError =
fileProcessor.processFile(externalUser.getExternalUserId(), room_id,
isOwner, inputstream, parentFolderId, fileSystemName, current_dir, hs,
externalFileId, externalType);
HashMap<String, Object> returnAttributes =
returnError.get("returnAttributes");
@@ -103,10 +103,10 @@
HashMap<String, Object> returnAttribute =
returnError.get(iter.next());
fileImportErrors[i] = new
FileImportError();
-
fileImportErrors[i].setCommand(returnAttribute.get("command").toString());
-
fileImportErrors[i].setError(returnAttribute.get("error").toString());
-
fileImportErrors[i].setExitValue(Integer.valueOf(returnAttribute.get("exitValue").toString()).intValue());
-
fileImportErrors[i].setProcess(returnAttribute.get("process").toString());
+
fileImportErrors[i].setCommand((returnAttribute.get("command")!=null) ?
returnAttribute.get("command").toString() : "");
+ fileImportErrors[i].setError((returnAttribute.get("error")!=null) ?
returnAttribute.get("error").toString() : "");
+
fileImportErrors[i].setExitValue((returnAttribute.get("exitValue")!=null) ?
Integer.valueOf(returnAttribute.get("exitValue").toString()).intValue() :
0);
+
fileImportErrors[i].setProcess((returnAttribute.get("process")!=null) ?
returnAttribute.get("process").toString() : "");
i++;
}
--
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.
