PersonImporter importiert nun nur Mitglieder
git-svn-id: https://svn.libreccm.org/ccm/trunk@1103 8810af33-2d31-482b-a856-94f89814c4dfmaster
parent
de59739566
commit
eefcdf2029
|
|
@ -10,9 +10,7 @@
|
||||||
<ccm:requires name="ccm-cms" version="6.6.0" relation="ge"/>
|
<ccm:requires name="ccm-cms" version="6.6.0" relation="ge"/>
|
||||||
<ccm:requires name="ccm-cms-types-address" version="6.6.0" relation="ge"/>
|
<ccm:requires name="ccm-cms-types-address" version="6.6.0" relation="ge"/>
|
||||||
<ccm:requires name="ccm-cms-types-contact" version="6.6.0" relation="ge"/>
|
<ccm:requires name="ccm-cms-types-contact" version="6.6.0" relation="ge"/>
|
||||||
<ccm:requires name="ccm-cms-types-person" version="6.6.0" relation="ge"/>
|
|
||||||
<ccm:requires name="ccm-sci-types-member" version="6.6.0" relation="ge"/>
|
<ccm:requires name="ccm-sci-types-member" version="6.6.0" relation="ge"/>
|
||||||
<ccm:requires name="ccm-sci-publications" version="6.6.0" relation="ge"/>
|
|
||||||
<ccm:requires name="ccm-cms-assets-relatedlink" version="6.6.0" relation="ge"/>
|
<ccm:requires name="ccm-cms-assets-relatedlink" version="6.6.0" relation="ge"/>
|
||||||
</ccm:dependencies>
|
</ccm:dependencies>
|
||||||
<ccm:contacts>
|
<ccm:contacts>
|
||||||
|
|
|
||||||
|
|
@ -11,8 +11,6 @@ import com.arsdigita.cms.contenttypes.Contact;
|
||||||
import com.arsdigita.cms.contenttypes.GenericContactEntry;
|
import com.arsdigita.cms.contenttypes.GenericContactEntry;
|
||||||
import com.arsdigita.cms.contenttypes.GenericPerson;
|
import com.arsdigita.cms.contenttypes.GenericPerson;
|
||||||
import com.arsdigita.cms.contenttypes.Link;
|
import com.arsdigita.cms.contenttypes.Link;
|
||||||
import com.arsdigita.cms.contenttypes.Person;
|
|
||||||
import com.arsdigita.cms.contenttypes.SciAuthor;
|
|
||||||
import com.arsdigita.cms.contenttypes.SciMember;
|
import com.arsdigita.cms.contenttypes.SciMember;
|
||||||
import com.arsdigita.cms.lifecycle.Lifecycle;
|
import com.arsdigita.cms.lifecycle.Lifecycle;
|
||||||
import com.arsdigita.cms.lifecycle.LifecycleDefinition;
|
import com.arsdigita.cms.lifecycle.LifecycleDefinition;
|
||||||
|
|
@ -24,7 +22,6 @@ import com.arsdigita.persistence.TransactionContext;
|
||||||
import java.io.FileInputStream;
|
import java.io.FileInputStream;
|
||||||
import java.io.FileNotFoundException;
|
import java.io.FileNotFoundException;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.io.UnsupportedEncodingException;
|
|
||||||
import java.math.BigDecimal;
|
import java.math.BigDecimal;
|
||||||
import java.sql.Connection;
|
import java.sql.Connection;
|
||||||
import java.sql.DriverManager;
|
import java.sql.DriverManager;
|
||||||
|
|
@ -399,6 +396,7 @@ public class PersonImporter extends Program {
|
||||||
+ "FROM person "
|
+ "FROM person "
|
||||||
+ "JOIN abteilunglink "
|
+ "JOIN abteilunglink "
|
||||||
+ "ON person.Person_Id = abteilunglink.Person_Id "
|
+ "ON person.Person_Id = abteilunglink.Person_Id "
|
||||||
|
+ "WHERE Eigenschaft = 'Aktiv' OR Eigenschaft = 'Ehemalig' "
|
||||||
+ "ORDER BY person.Name");
|
+ "ORDER BY person.Name");
|
||||||
|
|
||||||
result.last();
|
result.last();
|
||||||
|
|
@ -455,13 +453,13 @@ public class PersonImporter extends Program {
|
||||||
"abteilunglink.Abteilung_Id"));
|
"abteilunglink.Abteilung_Id"));
|
||||||
System.out.println("");
|
System.out.println("");
|
||||||
|
|
||||||
GenericPerson person;
|
GenericPerson person = null;
|
||||||
ContentSection section;
|
ContentSection section = null;
|
||||||
ContentSection contactsSection;
|
ContentSection contactsSection = null;
|
||||||
Folder folder;
|
Folder folder = null;
|
||||||
Folder contactsFolder;
|
Folder contactsFolder = null;
|
||||||
LifecycleDefinition lifecycleDefinition;
|
LifecycleDefinition lifecycleDefinition = null;
|
||||||
LifecycleDefinition contactLifecycleDefinition;
|
LifecycleDefinition contactLifecycleDefinition = null;
|
||||||
Category category = null;
|
Category category = null;
|
||||||
if ("Aktiv".equals(result.getString("person.Eigenschaft"))) {
|
if ("Aktiv".equals(result.getString("person.Eigenschaft"))) {
|
||||||
person = new SciMember();
|
person = new SciMember();
|
||||||
|
|
@ -495,23 +493,6 @@ public class PersonImporter extends Program {
|
||||||
lifecycleDefinition = membersLifecycle;
|
lifecycleDefinition = membersLifecycle;
|
||||||
category = membersAssociatedCategory;
|
category = membersAssociatedCategory;
|
||||||
contactLifecycleDefinition = membersContactsLifecycle;
|
contactLifecycleDefinition = membersContactsLifecycle;
|
||||||
} else if ("Autor".equals(result.getString(
|
|
||||||
"person.Eigenschaft"))) {
|
|
||||||
person = new SciAuthor();
|
|
||||||
section = authorsSection;
|
|
||||||
folder = authorsFolder;
|
|
||||||
contactsSection = authorsContactsSection;
|
|
||||||
contactsFolder = authorsContactsFolder;
|
|
||||||
lifecycleDefinition = authorsLifecycle;
|
|
||||||
contactLifecycleDefinition = authorsContactsLifecycle;
|
|
||||||
} else {
|
|
||||||
person = new Person();
|
|
||||||
section = personsSection;
|
|
||||||
folder = personsFolder;
|
|
||||||
contactsSection = personsContactsSection;
|
|
||||||
contactsFolder = personsContactsFolder;
|
|
||||||
lifecycleDefinition = personsLifecycle;
|
|
||||||
contactLifecycleDefinition = personsContactsLifecycle;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
person.setSurname(result.getString("person.Name"));
|
person.setSurname(result.getString("person.Name"));
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue