From da46bfb18b924611a1bcaa866966803043c6497d Mon Sep 17 00:00:00 2001
From: Ben Woodhead <bwoodhead@upei.ca>
Date: Thu, 15 Sep 2011 12:02:46 -0300
Subject: [PATCH 1/3] Set the version to 11.2.beta1
---
fedora_repository.info | 2 +-
plugins/fedora_imageapi.info | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/fedora_repository.info b/fedora_repository.info
index 1f31d60c..7e808460 100644
--- a/fedora_repository.info
+++ b/fedora_repository.info
@@ -4,5 +4,5 @@ dependencies[] = imageapi
dependencies[] = tabs
description = Shows a list of items in a fedora collection.
package = Islandora
-version = 6.1
+version = 11.2.beta1
core = 6.x
diff --git a/plugins/fedora_imageapi.info b/plugins/fedora_imageapi.info
index 76f8688a..7cf3ea54 100644
--- a/plugins/fedora_imageapi.info
+++ b/plugins/fedora_imageapi.info
@@ -3,5 +3,5 @@ description = Adds image manipulation support through a REST interface
package = Islandora
dependencies[] = fedora_repository
dependencies[] = imageapi
-version = 6.1
+version = 11.2.beta1
core = 6.x
From 592e8a689bca8c2597d29fda3c4d3766dd71df94 Mon Sep 17 00:00:00 2001
From: Ben Woodhead <bwoodhead@upei.ca>
Date: Thu, 15 Sep 2011 12:49:26 -0300
Subject: [PATCH 2/3] Fixed naming and version
---
plugins/fedora_imageapi.info | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/plugins/fedora_imageapi.info b/plugins/fedora_imageapi.info
index 7cf3ea54..e54e3f05 100644
--- a/plugins/fedora_imageapi.info
+++ b/plugins/fedora_imageapi.info
@@ -1,6 +1,6 @@
name = Fedora ImageAPI
description = Adds image manipulation support through a REST interface
-package = Islandora
+package = Islandora Dependencies
dependencies[] = fedora_repository
dependencies[] = imageapi
version = 11.2.beta1
From 22ed8b376b2b91cb31457eff2d27120171d8d389 Mon Sep 17 00:00:00 2001
From: Ben Woodhead <bwoodhead@Islandora.(none)>
Date: Thu, 15 Sep 2011 13:30:31 -0300
Subject: [PATCH 3/3] Visiblity Problem
---
.CollectionClass.inc.swp | Bin 40960 -> 40960 bytes
CollectionClass.inc | 5 +++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/.CollectionClass.inc.swp b/.CollectionClass.inc.swp
index be96c5845215ffe475318a8f005b7360401f9414..4672c0ca8df7d485e2e91c61f6282cda6530a653 100644
GIT binary patch
delta 419
zcmZoTz|?SnNg>G~%+puFT+fIB2m}}yPO2CA{pDw22w`MkD9X<-nYdA9ql<+AW60)O
zfp&S`gFs<bW{A>|$$|!_>pQp@7~FyQGA9GWG$0NFVtydL!NI^V6Npc+Gcarh;<-TF
z1;k}Q90J60K+F!rr`Q-6T7WnNh^>J5B`X8Nb|5YTVhbQ<17Zds{=>q+FbjxXf%qNJ
z1rvcdhM7T%K^@2dIcXmg14A1ShXSz`5TBpCaia9Z1NM^@jU^{{7^`dN=BH$)RmP_z
zmLwLJ6s0ES#wS(AmnG(urfR69B<tEG7ROiQ=4fc@D5!(<FcqajwMsx~d6-e^L>dKB
zzq!MB1><Hz(|i_@ywvje<oukR)Z~)P{Ji*_#H7@m&Fd}07<p4llX5cifRaV2>Y9`1
MO?TMLWBnxs02FI$bN~PV
delta 337
zcmZoTz|?SnNg>G~%+puFT+fIB2m}}y#6^qzuE?=4oGxWxD9X<-nYdA9ql<+AWANr$
zfp&RbekKNnd}fH!;K_mpr|WyU7#Jjh_zoun!(1Sa0%Bz#e!{`PAPmI+*cljJ0P$5I
zJ_y9~fjAS0gMe5Rh|jYD#eldKh)sZ)35XA}GB7j)aUc+T1F<_0KVe~D=m%m8AifQB
z!7?B&WM+^CJ0}asu>xX6ApQk(;yNIn&9rf&Dx+{MCYXHQ&|&f{V;&%_4#bi`Y`|K}
zprDWfl@ZxoX`IW*SiJd}Nj{5Ua(+%uYH~?teqMZDVs5H}?d17M5|h{1aBuFjG-RCo
Mz+G^&nDwg^06#!dW&i*H
diff --git a/CollectionClass.inc b/CollectionClass.inc
index 7f191c80..964cd457 100644
--- a/CollectionClass.inc
+++ b/CollectionClass.inc
@@ -753,10 +753,11 @@ function collection_creation_form_validate($form, &$form_state) {
function collection_creation_form_submit($form, &$form_state) {
global $user;
module_load_include('inc', 'fedora_repository', 'api/fedora_item');
+ module_load_include('inc', 'fedora_repository', 'api/dublin_core');
$module_path = drupal_get_path('module', 'fedora_repository');
$thumbnail = drupal_get_path('module', 'Fedora_Repository') . '/images/Crystal_Clear_filesystem_folder_grey.png';
$collection_pid = $form_state['values']['collection_pid'];
- $collection_name = $form_state['values']['collection_name'];
+ $new_collection_label = $form_state['values']['collection_name'];
$parent_collection = $form_state['values']['parent_collection'];
$all_cModels = get_content_models_as_option_array();
$collection_policy = '<?xml version="1.0" encoding="UTF-8"?>
@@ -779,7 +780,7 @@ function collection_creation_form_submit($form, &$form_state) {
$node->addAttribute('pid', $content_model);
}
}
- $item = fedora_item::ingest_new_item($collection_pid, 'A', $new_collections_label, $user->name);
+ $item = fedora_item::ingest_new_item($collection_pid, 'A', $new_collection_label, $user->name);
$item->add_relationship('isMemberOfCollection', $parent_collection, RELS_EXT_URI);
$item->add_relationship('hasModel', 'islandora:collectionCModel', FEDORA_MODEL_URI);
$item->add_datastream_from_string($collection_policy_xml->saveXML(), 'COLLECTION_POLICY');