Revision: 4448
Author: solomax666
Date: Fri Oct 21 07:54:09 2011
Log: - organization import was broken
- install option "Create Default Rooms" with default value "Yes" is added
- code clean up
http://code.google.com/p/openmeetings/source/detail?r=4448
Modified:
/tags/1_8
/tags/1_8/src/app/org/openmeetings/servlet/outputhandler/BackupImport.java
/tags/1_8/src/app/org/openmeetings/servlet/outputhandler/Install.java
/tags/1_8/src/templates/install_step1_EN.vm
=======================================
---
/tags/1_8/src/app/org/openmeetings/servlet/outputhandler/BackupImport.java
Sun Sep 4 06:59:47 2011
+++
/tags/1_8/src/app/org/openmeetings/servlet/outputhandler/BackupImport.java
Fri Oct 21 07:54:09 2011
@@ -782,8 +782,8 @@
Element
organisationObject = organisationIterator
.next();
- Long organisation_id =
importLongType(unformatString(organisationObject
-
.element("organisation_id").getText()));
+ Long organisation_id =
getNewId(importLongType(unformatString(organisationObject
+
.element("organisation_id").getText())), Maps.ORGANISATIONS);
Long user_id =
importLongType(unformatString(organisationObject
.element("user_id").getText()));
Boolean isModerator =
importBooleanType(unformatString(organisationObject
@@ -1327,37 +1327,19 @@
return null;
}
- private void importOrganizsations(File orgFile) throws Exception {
-
- List<Organisation> orgList =
this.getOrganisationsByXML(orgFile);
-
- for (Organisation org : orgList) {
- Long orgId = org.getOrganisation_id();
-
- org.setOrganisation_id(null);
- Long newOrgID =
organisationmanagement.addOrganisationObj(org);
- organisationsMap.put(orgId, newOrgID);
-
- }
-
- }
-
- @SuppressWarnings("unchecked")
- private List<Organisation> getOrganisationsByXML(File orgFile) {
+ private void importOrganizsations(File orgFile) {
try {
-
- List<Organisation> orgList = new
LinkedList<Organisation>();
-
SAXReader reader = new SAXReader();
Document document = reader.read(orgFile);
Element root = document.getRootElement();
- for (Iterator<Element> i = root.elementIterator();
i.hasNext();) {
+ for (@SuppressWarnings("unchecked")
+ Iterator<Element> i = root.elementIterator();
i.hasNext();) {
Element itemObject = i.next();
if
(itemObject.getName().equals("organisations")) {
-
- for (Iterator<Element> innerIter =
itemObject
+ for (@SuppressWarnings("unchecked")
+ Iterator<Element> innerIter = itemObject
.elementIterator("organisation"); innerIter
.hasNext();) {
@@ -1371,23 +1353,17 @@
"deleted").getText());
Organisation organisation = new
Organisation();
-
organisation.setOrganisation_id(organisation_id);
organisation.setName(name);
organisation.setDeleted(deleted);
- orgList.add(organisation);
-
- }
-
+ Long newOrgID =
organisationmanagement.addOrganisationObj(organisation);
+
organisationsMap.put(organisation_id, newOrgID);
+ }
}
}
-
- return orgList;
-
} catch (Exception err) {
log.error("[getOrganisationsByXML]", err);
}
- return null;
}
private String unformatString(String str) {
=======================================
--- /tags/1_8/src/app/org/openmeetings/servlet/outputhandler/Install.java
Sat Sep 24 01:51:38 2011
+++ /tags/1_8/src/app/org/openmeetings/servlet/outputhandler/Install.java
Fri Oct 21 07:54:09 2011
@@ -260,6 +260,8 @@
.getParameter("sendEmailAtRegister");
String sendEmailWithVerficationCode =
httpServletRequest
.getParameter("sendEmailWithVerficationCode");
+ String createDefaultRooms =
httpServletRequest
+
.getParameter("createDefaultRooms");
String default_export_font =
httpServletRequest
.getParameter("default_export_font");
@@ -361,7 +363,9 @@
getImportInitvalues().loadInitUserAndOrganisation(username,
userpass, useremail,
orgname, timeZone, configdefaultLang);
-
getImportInitvalues().loadDefaultRooms();
+ if ("1".equals(createDefaultRooms)) {
+
getImportInitvalues().loadDefaultRooms();
+ }
// AppointMent Categories
getImportInitvalues().loadInitAppointmentCategories();
=======================================
--- /tags/1_8/src/templates/install_step1_EN.vm Tue Jul 5 02:10:59 2011
+++ /tags/1_8/src/templates/install_step1_EN.vm Fri Oct 21 07:54:09 2011
@@ -142,7 +142,7 @@
</li><li>
<label for="userpass">Userpass</label>
<input name="userpass" id="userpass" size="27"
- title="Enter a password" type="text" /><br />
+ title="Enter a password" type="password" /><br />
</li><li>
<label for="useremail">EMail</label>
<input name="useremail" id="useremail" size="27"
@@ -189,6 +189,13 @@
<label for="sendEmailWithVerficationCode">New Users need to verify
their EMail (sendEmailWithVerficationCode)</label>
<select name="sendEmailWithVerficationCode"
id="sendEmailWithVerficationCode"
size="1">
+ <option value="1" selected>Yes</option>
+ <option value="0">No</option>
+ </select><br />
+ </li><li>
+ <label for="createDefaultRooms">Default Rooms of all types will be
created</label>
+ <select name="createDefaultRooms" id="createDefaultRooms"
+ size="1">
<option value="1" selected>Yes</option>
<option value="0">No</option>
</select><br />
--
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.
