- Zusätzliches Feld für library signatures asset für weitere Angaben

- Asset umbenannt, um den Namenskonventionen zu entsprechen (Erster Teil)


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

ccm-sci-assets-publicationslibrarysignatures/application.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
-                 name="ccm-sci-publications-librarysignatures"
+                 name="ccm-sci-assets-publicationslibrarysignatures"
                  prettyName="ScientificCMS Publications module asset for library signatures"
                  version="6.6.5"
                  release="1"
@@ -26,4 +26,4 @@
         An asset for library signatures of publications
     </ccm:description>
     
-</ccm:application>
+</ccm:application>

ccm-sci-assets-publicationslibrarysignatures/pdl/com/arsdigita/cms/contentassets/SciPublicationsLibrarySignatures.pdl

@@ -28,6 +28,7 @@ object type LibrarySignature extends ACSObject {
     String[1..1] signature = ca_publications_librarysignatures.signature VARCHAR(512);
 
     String[0..1] librarylink = ca_publications_librarysignatures.librarylink VARCHAR(2048);
+    String[0..1] misc   = ca_publications_librarysignatures.misc VARCHAR(4096);
 
     reference key(ca_publications_librarysignatures.signature_id);
 }

ccm-sci-assets-publicationslibrarysignatures/src/ccm-sci-publications-librarysignatures.load

@@ -15,7 +15,7 @@
     </provides>
 
     <scripts>
-        <schema directory="ccm-sci-publications-librarysignatures"/>
+        <schema directory="ccm-sci-assets-publicationslibrarysignatures"/>
         <data class="com.arsdigita.cms.contentassets.LibrarySignaturesLoader"/>
     </scripts>
-</load>
+</load>

ccm-sci-assets-publicationslibrarysignatures/src/com/arsdigita/cms/contentassets/LibrarySignature.java

@@ -40,6 +40,7 @@ public class LibrarySignature extends ACSObject {
     public static final String SIGNATURE = "signature";
     public static final String LIBRARY_LINK = "librarylink";
     public static final String PUBLICATION = "publication";
+    public static final String MISC = "misc";
     
     public LibrarySignature() {
         super(BASE_DATA_OBJECT_TYPE);
@@ -102,6 +103,14 @@ public class LibrarySignature extends ACSObject {
         set(LIBRARY_LINK, libraryLink);
     }
     
+    public String getMisc() {
+        return (String) get(MISC);
+    }
+    
+    public void setMisc(final String misc) {
+        set(MISC, misc);
+    }
+    
     public Publication getPublication() {
         final DataObject dataObject = (DataObject) get(PUBLICATION);
         

ccm-sci-assets-publicationslibrarysignatures/src/com/arsdigita/cms/contentassets/LibrarySignaturesInitializer.java

@@ -35,7 +35,7 @@ import com.arsdigita.runtime.DomainInitEvent;
 public class LibrarySignaturesInitializer extends ContentAssetInitializer {
 
     public LibrarySignaturesInitializer() {
-        super("ccm-sci-publications-librarysignatures.pdl.mf");
+        super("ccm-sci-assets-publicationslibrarysignatures.pdl.mf");
     }
 
     @Override

ccm-sci-assets-publicationslibrarysignatures/src/com/arsdigita/cms/contentassets/LibrarySignaturesResources.properties

@@ -16,3 +16,4 @@ scipublications.librarysignatures.form.library=Library
 scipublications.librarysignatures.form.signature=Signature
 scipublications.librarysignatures.form.link=Link to the library catalog
 scipublications.librarysignatures.delete.confirm=Are you sure to delete this signature
+scipublications.librarysignatures.form.misc=Details

ccm-sci-assets-publicationslibrarysignatures/src/com/arsdigita/cms/contentassets/LibrarySignaturesResources_de.properties

@@ -16,3 +16,4 @@ scipublications.librarysignatures.form.library=Bibliothek
 scipublications.librarysignatures.form.signature=Signatur
 scipublications.librarysignatures.form.link=Link zum Bibliothekskatalog
 scipublications.librarysignatures.delete.confirm=Sind Sie sicher, dass Sie diese Bibliothekssignatur entfernen wollen?
+scipublications.librarysignatures.form.misc=Weitere Angaben

ccm-sci-assets-publicationslibrarysignatures/src/com/arsdigita/cms/contentassets/ui/LibrarySignaturesAddForm.java

@@ -42,6 +42,7 @@ public class LibrarySignaturesAddForm extends BasicItemForm {
     private final static String LIBRARY = "library";
     private final static String SIGNATURE = "signature";
     private final static String LINK = "link";
+    private final static String MISC = "misc";
     private final ItemSelectionModel itemModel;
     private final ACSObjectSelectionModel signatureModel;
 
@@ -72,6 +73,9 @@ public class LibrarySignaturesAddForm extends BasicItemForm {
 
         add(new Label(LibrarySignaturesGlobalizationUtil.globalize("scipublications.librarysignatures.form.link")));
         add(new TextField(LINK));
+        
+        add(new Label(LibrarySignaturesGlobalizationUtil.globalize("scipublications.librarysignatures.form.misc")));
+        add(new TextField(MISC));
     }
 
     @Override
@@ -85,6 +89,7 @@ public class LibrarySignaturesAddForm extends BasicItemForm {
             data.put(LIBRARY, signature.getLibrary());
             data.put(SIGNATURE, signature.getSignature());
             data.put(LINK, signature.getLibraryLink());
+            data.put(MISC, signature.getMisc());
         }
 
         setVisible(state, true);
@@ -109,6 +114,7 @@ public class LibrarySignaturesAddForm extends BasicItemForm {
         signature.setLibrary(data.getString(LIBRARY));
         signature.setSignature(data.getString(SIGNATURE));
         signature.setLibraryLink(data.getString(LINK));
+        signature.setMisc(data.getString(MISC));
 
         signature.save();
     }

ccm-sci-publications/src/com/arsdigita/cms/scipublications/exporter/SciPublicationsExporters.java

@@ -44,7 +44,7 @@ public final class SciPublicationsExporters {
                                                  new HashMap<String, SciPublicationsExporter>();
 
     /**
-     * The one and only instance of this class. The pattern here ensures that
+     * The one and only instance of this class. The pattern used here ensures that
      * the instance is created at the first access, but not earlier.
      */
     private static class Instance {