LibreCCM
/
libreccm-legacy
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

- DaBInImporter: Trennung ContentSection Mitglieder und Externe 

- ccm-run2: Kleines Update


git-svn-id: https://svn.libreccm.org/ccm/trunk@849 8810af33-2d31-482b-a856-94f89814c4df
master
jensp 2011-04-12 18:32:46 +00:00
parent b1c5eed7cc
commit 025523f56e
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ccm-cms-dabinimporter/src/com/arsdigita/cms/dabin/DaBInImporter.java
View File

@ -99,7 +99,7 @@ public class DaBInImporter extends Program {
private static final Logger logger = Logger.getLogger(DaBInImporter.class); private static final Logger logger = Logger.getLogger(DaBInImporter.class);
private Properties config; private Properties config;
private String timestamp = null; private String timestamp = null;
private ContentSection section; private ContentSection section;
private ContentSection personsSection; private ContentSection personsSection;
private ContentSection projectsSection; private ContentSection projectsSection;
private ContentSection publicationsSection; private ContentSection publicationsSection;
@ -110,6 +110,7 @@ public class DaBInImporter extends Program {
private Connection connection = null; private Connection connection = null;
private Folder root; private Folder root;
private Folder personsRootFolder; private Folder personsRootFolder;
private Folder membersRootFolder;
private Folder projectsRootFolder; private Folder projectsRootFolder;
private Folder publicationsRootFolder; private Folder publicationsRootFolder;
private Folder authors; private Folder authors;
@ -202,6 +203,7 @@ public class DaBInImporter extends Program {
section = getContentSection(config.getProperty("ccm.contentsection")); section = getContentSection(config.getProperty("ccm.contentsection"));
personsSection = getContentSection(config.getProperty( personsSection = getContentSection(config.getProperty(
"ccm.personsContentSection")); "ccm.personsContentSection"));
projectsSection = getContentSection(config.getProperty( projectsSection = getContentSection(config.getProperty(
"ccm.projectsContentSection")); "ccm.projectsContentSection"));
publicationsSection = getContentSection(config.getProperty( publicationsSection = getContentSection(config.getProperty(
@ -256,6 +258,7 @@ public class DaBInImporter extends Program {
"\nCreating CCM folders (if they do not exist already)..."); "\nCreating CCM folders (if they do not exist already)...");
root = section.getRootFolder(); root = section.getRootFolder();
personsRootFolder = personsSection.getRootFolder(); personsRootFolder = personsSection.getRootFolder();
membersRootFolder = section.getRootFolder();
projectsRootFolder = projectsSection.getRootFolder(); projectsRootFolder = projectsSection.getRootFolder();
publicationsRootFolder = publicationsSection.getRootFolder(); publicationsRootFolder = publicationsSection.getRootFolder();
@ -266,7 +269,7 @@ public class DaBInImporter extends Program {
departments = createFolder(root, "abteilungen", "Abteilungen"); departments = createFolder(root, "abteilungen", "Abteilungen");
members = createFolder(personsRootFolder, "mitglieder", "Mitglieder"); members = createFolder(membersRootFolder, "mitglieder", "Mitglieder");
organization = createFolder(root, "organisationen", "Organisation(en)"); organization = createFolder(root, "organisationen", "Organisation(en)");

2
ccm-core/bin/ccm-run2
View File

@ -43,4 +43,4 @@ fi
CCM_HOME_DIR=`cd ${CCM_HOME_DIR}; pwd` CCM_HOME_DIR=`cd ${CCM_HOME_DIR}; pwd`
echo "executing ccm-run" echo "executing ccm-run"
java -cp ${CCM_LIB_DIR}/"*":${CATALINA_LIB_DIR}/"*" -Dccm.home=${CCM_HOME_DIR} "$*" java -cp ${CCM_LIB_DIR}/"*":${CATALINA_LIB_DIR}/"*" -Dccm.home=${CCM_HOME_DIR} "$@"