[MMBASE CVS] contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/forms ReferenceImportExportAction.java

[kevinshen]

Update of 
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/forms
In directory james.mmbase.org:/tmp/cvs-serv25813

Modified Files:
      Tag: b1_6
        ReferenceImportExportAction.java 
Log Message:
CMSC-1265  Community: improve import and export options of community users  
Import data from XML file .lose the group


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/forms
See also: http://www.mmbase.org/jira/browse/CMSC-1265


Index: ReferenceImportExportAction.java
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/forms/ReferenceImportExportAction.java,v
retrieving revision 1.8.2.3
retrieving revision 1.8.2.4
diff -u -b -r1.8.2.3 -r1.8.2.4
--- ReferenceImportExportAction.java    3 Mar 2009 10:29:56 -0000       1.8.2.3
+++ ReferenceImportExportAction.java    4 Mar 2009 06:11:11 -0000       1.8.2.4
@@ -202,7 +202,7 @@
 
       if (isXML) {
          try {
-            int size = importFromFile(fileData, level);
+            int size = importFromFile(fileData, level,groupId);
             request.setAttribute("confirm_userNum", size);
          } catch (Exception e) {
             log.error(e);
@@ -310,7 +310,7 @@
       return pre;
    }
 
-   private int importFromFile(byte[] fileData, String level) throws Exception {
+   private int importFromFile(byte[] fileData, String level,String groupId) 
throws Exception {
       String xml = new String(fileData);
       CommunityExport communityExport;
       communityExport = (CommunityExport) getXStream().fromXML(xml);
@@ -320,10 +320,17 @@
       }
       for (PersonExportImportVO importPerson : xpersons) {
          Authentication authentication = importPerson.getAuthentication();
-         if (null == authentication || 
StringUtils.isWhitespace(authentication.getUserId())
-               || StringUtils.isWhitespace(authentication.getPassword())) {
+         if (null == authentication || 
StringUtils.isBlank(authentication.getUserId())
+               || StringUtils.isBlank(authentication.getPassword())) {
             continue;
          }
+         importPerson.setRegisterDate(new Date(System.currentTimeMillis()));
+         if (StringUtils.isBlank(importPerson.getActive())) {
+            importPerson.setActive("active");
+         }
+         if (null != groupId && groupId != "0" && groupId != "") {
+            importPerson.setAuthorityId(new Long(groupId));
+         }
          personService.addRelationRecord(level, importPerson);
       }
       return xpersons.size();
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs