From c3ade037a9b0e213ac4fe5dc4edf76f38762d623 Mon Sep 17 00:00:00 2001
From: jensp <jensp@8810af33-2d31-482b-a856-94f89814c4df>
Date: Wed, 29 May 2013 18:15:58 +0000
Subject: [PATCH] =?UTF-8?q?Feld=20f=C3=BCr=20Band=20der=20Reihe=20ist=20je?=
 =?UTF-8?q?tzt=20alphanumerisch=20(Upgradeskript=20enthalten)=20(Ticket=20?=
 =?UTF-8?q?#1559)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: https://svn.libreccm.org/ccm/trunk@2156 8810af33-2d31-482b-a856-94f89814c4df
---
 .../pdl/com/arsdigita/content-types/Series.pdl            | 2 +-
 .../upgrade/6.6.4-6.6.5/vol_of_series_alphanum.sql        | 2 ++
 .../ccm-sci-publications/upgrade/postgres-6.6.4-6.6.5.sql | 8 ++++++++
 ccm-sci-publications/src/ccm-sci-publications.upgrade     | 4 ++++
 .../src/com/arsdigita/cms/contenttypes/Series.java        | 2 +-
 .../src/com/arsdigita/cms/contenttypes/SeriesBundle.java  | 2 +-
 .../com/arsdigita/cms/contenttypes/SeriesCollection.java  | 6 +++---
 7 files changed, 20 insertions(+), 6 deletions(-)
 create mode 100644 ccm-sci-publications/sql/ccm-sci-publications/default/upgrade/6.6.4-6.6.5/vol_of_series_alphanum.sql
 create mode 100644 ccm-sci-publications/sql/ccm-sci-publications/upgrade/postgres-6.6.4-6.6.5.sql

diff --git a/ccm-sci-publications/pdl/com/arsdigita/content-types/Series.pdl b/ccm-sci-publications/pdl/com/arsdigita/content-types/Series.pdl
index 832c51990..f0f630c90 100644
--- a/ccm-sci-publications/pdl/com/arsdigita/content-types/Series.pdl
+++ b/ccm-sci-publications/pdl/com/arsdigita/content-types/Series.pdl
@@ -73,5 +73,5 @@ association {
 					           join ct_publications_volume_in_series.publication_id
 					             to ct_publication_bundles.bundle_id;
             // Additional attributes
-	    Integer[0..1] volumeOfSeries = ct_publications_volume_in_series.volumeOfSeries INTEGER;
+	    String[0..1] volumeOfSeries = ct_publications_volume_in_series.volumeOfSeries VARCHAR(128);
 }
\ No newline at end of file
diff --git a/ccm-sci-publications/sql/ccm-sci-publications/default/upgrade/6.6.4-6.6.5/vol_of_series_alphanum.sql b/ccm-sci-publications/sql/ccm-sci-publications/default/upgrade/6.6.4-6.6.5/vol_of_series_alphanum.sql
new file mode 100644
index 000000000..ba7429b28
--- /dev/null
+++ b/ccm-sci-publications/sql/ccm-sci-publications/default/upgrade/6.6.4-6.6.5/vol_of_series_alphanum.sql
@@ -0,0 +1,2 @@
+-- Make volume_of_series alpha numerical
+ALTER TABLE ct_publications_volume_in_series ALTER COLUMN volumeofseries TYPE VARCHAR(128);
\ No newline at end of file
diff --git a/ccm-sci-publications/sql/ccm-sci-publications/upgrade/postgres-6.6.4-6.6.5.sql b/ccm-sci-publications/sql/ccm-sci-publications/upgrade/postgres-6.6.4-6.6.5.sql
new file mode 100644
index 000000000..d2121dd73
--- /dev/null
+++ b/ccm-sci-publications/sql/ccm-sci-publications/upgrade/postgres-6.6.4-6.6.5.sql
@@ -0,0 +1,8 @@
+\echo 'ScientificCMS Publications module 6.6.4 -> 6.6.5 Upgrade script (PostgreSQL)'
+
+begin;
+
+\i ../default/upgrade/6.6.4-6.6.5/vol_of_series_alphanum.sql
+
+end;
+
diff --git a/ccm-sci-publications/src/ccm-sci-publications.upgrade b/ccm-sci-publications/src/ccm-sci-publications.upgrade
index aba4aa798..6403e0396 100644
--- a/ccm-sci-publications/src/ccm-sci-publications.upgrade
+++ b/ccm-sci-publications/src/ccm-sci-publications.upgrade
@@ -11,4 +11,8 @@
     <version from="6.6.3" to="6.6.4">
         <script sql="ccm-sci-publications/upgrade/::database::-6.6.3-6.6.4.sql" />       
     </version>
+    <!-- Upgrade to version 6.6.5, included in ScientificCMS 2.1.0 -->
+    <version from="6.6.4" to="6.6.5">
+        <script sql="ccm-sci-publications/upgrade/::database::-6.6.4-6.6.5.sql" />       
+    </version>
 </upgrade>
\ No newline at end of file
diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/Series.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/Series.java
index 6caeac1aa..244bf3ce3 100644
--- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/Series.java
+++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/Series.java
@@ -108,7 +108,7 @@ public class Series extends ContentPage {
         return getSeriesBundle().getVolumes();
     }
 
-    public void addVolume(final Publication publication, final Integer volume) {
+    public void addVolume(final Publication publication, final String volume) {
         getSeriesBundle().addVolume(publication, volume);
     }
 
diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/SeriesBundle.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/SeriesBundle.java
index 19f5d9102..889944542 100644
--- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/SeriesBundle.java
+++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/SeriesBundle.java
@@ -242,7 +242,7 @@ public class SeriesBundle extends ContentBundle {
     }
 
     public void addVolume(final Publication publication,
-                          final Integer volume) {
+                          final String volume) {
         Assert.exists(publication, Publication.class);
 
         DataObject link = add(PUBLICATIONS, publication.getPublicationBundle());
diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/SeriesCollection.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/SeriesCollection.java
index dd54bd3a9..b7269ca4e 100644
--- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/SeriesCollection.java
+++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/SeriesCollection.java
@@ -39,11 +39,11 @@ public class SeriesCollection extends DomainCollection {
         super(dataCollection);
     }
 
-    public Integer getVolumeOfSeries() {
-        return (Integer) m_dataCollection.get(LINK_VOLUME_OF_SERIES);
+    public String getVolumeOfSeries() {
+        return (String) m_dataCollection.get(LINK_VOLUME_OF_SERIES);
     }
 
-    public void setVolumeOfSeries(Integer volumeOfSeries) {
+    public void setVolumeOfSeries(String volumeOfSeries) {
         DataObject link = (DataObject) this.get("link");
 
         link.set(VOLUME_OF_SERIES, volumeOfSeries);