- Ergänzung am InternetArticle: Feld für letzte Änderung durch Autor vorbereitet, einige Fehler (falsche Labels) in Form korrigiert

- DaBIn-Importer: Externe werden jetzt in einem gemeinsamen Ordner abglegt
- Texte für Download bei den Arbeitspapieren können jetzt über die Import-Config-Datei des Importers konfiguriert werden
- Related Links Steps angepasst (Test steht noch aus)


git-svn-id: https://svn.libreccm.org/ccm/trunk@832 8810af33-2d31-482b-a856-94f89814c4df

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

@@ -259,7 +259,7 @@ public class DaBInImporter extends Program {
         projectsRootFolder = projectsSection.getRootFolder();
         publicationsRootFolder = publicationsSection.getRootFolder();
 
-        authors = createFolder(personsRootFolder, "autoren", "Autoren");
+        authors = createFolder(personsRootFolder, "externe", "Externe");
 
         contacts = createFolder(personsRootFolder, "kontaktdaten",
                                 "Kontaktdaten");
@@ -270,7 +270,9 @@ public class DaBInImporter extends Program {
 
         organization = createFolder(root, "organisationen", "Organisation(en)");
 
-        persons = createFolder(personsRootFolder, "personen", "Personen");
+        //Personen sollen beim ZeS in den gleichen Ordner wie Autoren.
+        //persons = createFolder(personsRootFolder, "persons", "persons");
+        persons = authors;
 
         projects = createFolder(projectsRootFolder, "projekte", "Projekte");
 
@@ -2733,14 +2735,14 @@ public class DaBInImporter extends Program {
                             //bundle.save();
 
                             RelatedLink download = new RelatedLink();
-                            download.setTitle("Download");
+                            download.setTitle(config.getProperty("workingpaper.download.de"));
                             download.setTargetType(Link.INTERNAL_LINK);
                             download.setTargetItem(fsi);
                             download.setLinkOwner(workingPaperDe);
 
                             download = new RelatedLink();
                             download.setTitle("Download");
-                            download.setTargetType(Link.INTERNAL_LINK);
+                            download.setTargetType(config.getProperty("workingpaper.download.en"));
                             download.setTargetItem(fsi);
                             download.setLinkOwner(workingPaperEn);
 

ccm-cms/src/com/arsdigita/cms/ui/folder/FolderBrowser.java

@@ -286,14 +286,6 @@ public class FolderBrowser extends Table {
                 Folder.ItemCollection itemColl = (Folder.ItemCollection) m_itemColl.
                         get(s);
                 s_log.debug(String.format("itemColl.size = %d", itemColl.size()));
-                /*if (itemColl.size() < 20) {
-                    s_log.debug("Setting filter invisible.");
-                    m_filterForm.setVisible(s, false);
-                } else {
-                    s_log.debug("Setting filter visible.");
-                    m_filterForm.setVisible(s, true);
-                }*/
-                
 
                 m_folderSize = itemColl.size();
                 if (s.getValue(m_filter) != null) {

ccm-cms/src/com/arsdigita/cms/ui/folder/FolderManipulator.java

@@ -118,9 +118,9 @@ public class FolderManipulator extends SimpleContainer
         m_action = new StringParameter("act");
         m_srcFolderSel = folderSel;
 
-        s_log.debug("Adding filter form...");
+        //s_log.debug("Adding filter form...");
-        m_filterForm = new FilterForm();
+        //m_filterForm = new FilterForm();
-        add(m_filterForm);
+        //add(m_filterForm);
 
         m_itemView = new ItemView();
         m_itemView.addProcessListener(this);
@@ -138,7 +138,7 @@ public class FolderManipulator extends SimpleContainer
     public void register(Page p) {
         super.register(p);
         p.setVisibleDefault(m_targetSelector, false);
-        p.setVisibleDefault(m_filterForm, true);
+        //p.setVisibleDefault(m_filterForm, true);
         p.addComponentStateParam(this, m_sources);
         p.addComponentStateParam(this, m_action);
         p.addComponentStateParam(this, m_filter);
@@ -361,23 +361,24 @@ public class FolderManipulator extends SimpleContainer
             m_folderTree.setCellRenderer(new FolderTreeCellRenderer());
 
             Label l = new Label(new PrintListener() {
+
                 @Override
                 public void prepare(PrintEvent e) {
                     PageState s = e.getPageState();
                     Label t = (Label) e.getTarget();
                     int n = getSources(s).length;
                     Folder f = (Folder) m_srcFolderSel.getSelectedObject(s);
-                        String msg = n + " " +
+                    String msg = n + " " + (String) globalize(
-                            (String) globalize("cms.ui.folder.items").localize() + " " +
+                            "cms.ui.folder.items").localize() + " " + (String) globalize(
-                            (String) globalize("cms.ui.folder.from").localize() +" /" +
+                            "cms.ui.folder.from").localize() + " /" + f.
-                            f.getPathNoJsp() + " " +
+                            getPathNoJsp() + " " + (String) globalize(
-                            (String) globalize("cms.ui.folder.to").localize();
+                            "cms.ui.folder.to").localize();
                     if (isMove(s)) {
-                            t.setLabel((String) globalize("cms.ui.folder.move").localize() +
+                        t.setLabel((String) globalize("cms.ui.folder.move").
-                                       " " + msg);
+                                localize() + " " + msg);
                     } else if (isCopy(s)) {
-                            t.setLabel((String) globalize("cms.ui.folder.copy").localize() +
+                        t.setLabel((String) globalize("cms.ui.folder.copy").
-                                       " " + msg);
+                                localize() + " " + msg);
                     }
                 }
             });
@@ -457,6 +458,11 @@ public class FolderManipulator extends SimpleContainer
             panel.add(m_paginator);
             panel.add(m_browser);
 
+            /*s_log.debug("Adding filter form...");
+            m_filterForm = new FilterForm((PaginationModelBuilder) m_browser.
+                    getModelBuilder());
+            getPanel().add(m_filterForm);*/
+
             m_checkboxGroup = new CheckboxGroup(m_sources);
             panel.add(m_checkboxGroup);
 
@@ -495,8 +501,10 @@ public class FolderManipulator extends SimpleContainer
 
         // The renderer for the first column in the itemView table
         private class CheckboxRenderer implements TableCellRenderer {
+
             @Override
-            public Component getComponent(Table table, PageState state, Object value,
+            public Component getComponent(Table table, PageState state,
+                                          Object value,
                                           boolean isSelected, Object key,
                                           int row, int column) {
                 BigDecimal n = (BigDecimal) key;
@@ -513,13 +521,16 @@ public class FolderManipulator extends SimpleContainer
                                                        FormSubmissionListener {
 
         private SimpleContainer panel;
+        private boolean visible;
+        private PaginationModelBuilder modelBuilder;
 
-        public FilterForm() {
+        public FilterForm(PaginationModelBuilder modelBuilder) {
             super("folderFilterForm");
-            // m_browser = browser;
 
             s_log.debug("Creating filter form...");
 
+            this.modelBuilder = modelBuilder;
+
             addProcessListener(this);
             addInitListener(this);
             addSubmissionListener(this);
@@ -568,12 +579,14 @@ public class FolderManipulator extends SimpleContainer
         public void submitted(FormSectionEvent fse) throws FormProcessException {
         }
 
-        @Override
+        public void setVisible(boolean visible) {
-        public void setVisible(PageState state, boolean visible) {
+            this.visible = visible;
-            s_log.debug("Setting visible to..." + visible);
+        }
-            panel.setVisible(state, visible);
-            super.setVisible(state, visible);
 
+        @Override
+        public boolean isVisible(PageState state) {
+            //return super.isVisible(state);
+            return visible;
         }
     }
 

ccm-sci-publications/pdl/com/arsdigita/content-types/InternetArticle.pdl

@@ -30,8 +30,10 @@ object type InternetArticle extends Publication {
        Integer[0..1] numberOfPages = ct_internet_article.number_of_pages INTEGER;
        String[0..1] edition = ct_internet_article.edition VARCHAR(256);
        String[0..1] issn = ct_internet_article.issn VARCHAR(9);
+       Date[0..1] lastAccessed = ct_internet_article.last_accessed DATE;
        Date[0..1] publicationDate = ct_internet_article.publicationDate DATE;
        
+
        reference key (ct_internet_article.internet_article_id);
 }
 

ccm-sci-publications/src/com/arsdigita/cms/contenttypes/InternetArticle.java

@@ -40,6 +40,7 @@ public class InternetArticle extends Publication {
     public static final String NUMBER_OF_PAGES = "numberOfPages";
     public static final String EDITION = "edition";
     public static final String ISSN = "issn";
+    public static final String LAST_ACCESSED = "lastAccessed";
     public static final String PUBLICATION_DATE = "publicationDate";
     public static final String BASE_DATA_OBJECT_TYPE =
                                "com.arsdigita.cms.contenttypes.InternetArticle";
@@ -139,6 +140,14 @@ public class InternetArticle extends Publication {
         set(ISSN, issn);
     }
 
+    public Date getLastAccessed() {
+        return (Date) get(LAST_ACCESSED);
+    }
+
+    public void setLastAccessed(Date lastAccessed) {
+        set(LAST_ACCESSED, lastAccessed);
+    }
+
     public Date getPublicationDate() {
         return (Date) get(PUBLICATION_DATE);
     }

ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/InternetArticlePropertiesStep.java

@@ -66,8 +66,8 @@ public class InternetArticlePropertiesStep extends PublicationPropertiesStep {
                 InternetArticle.ISSN);
 
         sheet.add(PublicationGlobalizationUtil.globalize(
-                "publications.ui.internetarticle.publication_date"),
+                "publications.ui.internetarticle.lastAccessed"),
-                InternetArticle.PUBLICATION_DATE);
+                InternetArticle.LAST_ACCESSED);
 
         return sheet;
     }

ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/InternetArticlePropertyForm.java

@@ -106,10 +106,10 @@ public class InternetArticlePropertyForm
 
         Calendar today = new GregorianCalendar();
         add(new Label((String) PublicationGlobalizationUtil.globalize(
-                "publications.ui.internetarticle.publicationdate").
+                "publications.ui.internetarticle.lastAccessed").
                 localize()));
         ParameterModel pubDateParam =
-                       new DateParameter(InternetArticle.PUBLICATION_DATE);
+                       new DateParameter(InternetArticle.LAST_ACCESSED);
         com.arsdigita.bebop.form.Date pubDate =
                                       new com.arsdigita.bebop.form.Date(
                 pubDateParam);
@@ -129,8 +129,8 @@ public class InternetArticlePropertyForm
         data.put(InternetArticle.NUMBER_OF_PAGES, article.getNumberOfPages());
         data.put(InternetArticle.EDITION, article.getEdition());
         data.put(InternetArticle.ISSN, article.getISSN());
-        data.put(InternetArticle.PUBLICATION_DATE,
+        data.put(InternetArticle.LAST_ACCESSED,
-                 article.getPublicationDate());
+                 article.getLastAccessed());
     }
 
     @Override
@@ -148,8 +148,8 @@ public class InternetArticlePropertyForm
                     (Integer) data.get(InternetArticle.NUMBER_OF_PAGES));
             article.setEdition((String) data.get(InternetArticle.EDITION));
             article.setISSN((String) data.get(InternetArticle.ISSN));
-            article.setPublicationDate(
+            article.setLastAccessed(
-                    (Date) data.get(InternetArticle.PUBLICATION_DATE));
+                    (Date) data.get(InternetArticle.LAST_ACCESSED));
 
             article.save();
         }

ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationResources.properties

@@ -301,3 +301,4 @@ publication.ui.internetarticle.organization.remove=Remove
 publications.ui.monograph.reviewed=Reviewed
 publications.ui.monograph.reviewed.yes=Yes
 publications.ui.monograph.reviewed.no=No
+publications.ui.internetarticle.lastAccessed=

ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationResources_de.properties

@@ -300,3 +300,4 @@ publication.ui.internetarticle.organization.remove=Entfernen
 publications.ui.monograph.reviewed=Begutachtet
 publications.ui.monograph.reviewed.yes=Ja
 publications.ui.monograph.reviewed.no=Nein
+publications.ui.internetarticle.lastAccessed=Letztes Zugriffsdatum

ccm-sci-types-organization/src/com/arsdigita/cms/contenttypes/ui/SciDepartmentPublicationsStep.java

@@ -30,12 +30,16 @@ import com.arsdigita.cms.ui.authoring.AuthoringKitWizard;
  */
 public class SciDepartmentPublicationsStep extends RelatedLinkPropertiesStep {
 
-    protected static String s_linkListName = "SciDepartmentPublications";
-    protected static ContentType s_contentType = ContentType.findByAssociatedObjectType(
-            "com.arsdigita.cms.contenttypes.Publication");
-
     public SciDepartmentPublicationsStep(ItemSelectionModel itemModel,
                                          AuthoringKitWizard parent) {     
         super(itemModel, parent);
     }
+
+    @Override
+    protected void setLinkSelectionModel() {
+        super.setLinkSelectionModel();
+        linkListName = "SciDepartmentPublications";
+        contentType = ContentType.findByAssociatedObjectType(
+            "com.arsdigita.cms.contenttypes.Publication");
+    }
 }

ccm-sci-types-organization/src/com/arsdigita/cms/contenttypes/ui/SciProjectPublicationsStep.java

@@ -30,12 +30,16 @@ import com.arsdigita.cms.ui.authoring.AuthoringKitWizard;
  */
 public class SciProjectPublicationsStep extends RelatedLinkPropertiesStep {
    
-    protected static String s_linkListName = "SciProjectPublications";
-    protected static ContentType s_contentType = ContentType.findByAssociatedObjectType(
-            "com.arsdigita.cms.contenttypes.Publication");
-
     public SciProjectPublicationsStep(ItemSelectionModel itemModel,
                                       AuthoringKitWizard parent) {
         super(itemModel, parent);
     }
+
+    @Override
+    protected void setLinkSelectionModel() {
+        super.setLinkSelectionModel();
+        linkListName = "SciProjectPublications";
+        contentType = ContentType.findByAssociatedObjectType(
+                "com.arsdigita.cms.contenttypes.Publication");
+    }
 }