From a6c005a183c679d3f730ba6cfeb41d4c4526f8e1 Mon Sep 17 00:00:00 2001
From: Jesper Kristensen <cableman@linuxdev.dk>
Date: Mon, 3 Jun 2013 13:00:43 +0200
Subject: [PATCH] Moved profile create into features from hook_enable()

---
 alma.features.field_base.inc |  2 +-
 alma.features.inc            | 21 +++++++++++++++++++++
 alma.info                    |  4 +++-
 alma.install                 | 17 -----------------
 alma.module                  |  8 +++++---
 5 files changed, 30 insertions(+), 22 deletions(-)
 create mode 100644 alma.features.inc

diff --git a/alma.features.field_base.inc b/alma.features.field_base.inc
index 201aca3..fd8dc6f 100644
--- a/alma.features.field_base.inc
+++ b/alma.features.field_base.inc
@@ -154,7 +154,7 @@ function alma_field_default_field_bases() {
         60 => '2 months',
         90 => '3 months',
         180 => '6 months',
-        360 => '12 months'
+        360 => '12 months',
       ),
       'allowed_values_function' => '',
       'profile2_private' => 0,
diff --git a/alma.features.inc b/alma.features.inc
new file mode 100644
index 0000000..70cdb4b
--- /dev/null
+++ b/alma.features.inc
@@ -0,0 +1,21 @@
+<?php
+/**
+ * @file
+ * alma.features.inc
+ */
+
+/**
+ * Implements hook_default_profile2_type().
+ */
+function alma_default_profile2_type() {
+  $items = array();
+  $items['provider_alma'] = entity_import('profile2_type', '{
+    "userCategory" : true,
+    "userView" : true,
+    "type" : "provider_alma",
+    "label" : "Profile for Alma",
+    "weight" : "0",
+    "data" : { "registration" : 0 }
+  }');
+  return $items;
+}
diff --git a/alma.info b/alma.info
index bb82a58..28736ff 100644
--- a/alma.info
+++ b/alma.info
@@ -3,12 +3,13 @@ description = Implementation of Axiell’s Alma API for DDELibra.
 core = 7.x
 package = Providers
 php = 5.2.4
-version = 7.x-1.0-beta1
+version = 7.x-1.0-beta2
 project = alma
 dependencies[] = date
 dependencies[] = ding_provider
 dependencies[] = ding_reservation
 dependencies[] = email
+dependencies[] = entity
 dependencies[] = features
 dependencies[] = list
 dependencies[] = options
@@ -38,6 +39,7 @@ features[field_instance][] = profile2-provider_alma-field_alma_postal_code
 features[field_instance][] = profile2-provider_alma-field_alma_preferred_branch
 features[field_instance][] = profile2-provider_alma-field_alma_reservation_pause
 features[field_instance][] = profile2-provider_alma-field_alma_street_name
+features[profile2_type][] = provider_alma
 files[] = alma.module
 files[] = includes/alma.availability.inc
 files[] = includes/alma.debt.inc
diff --git a/alma.install b/alma.install
index 911ef63..5077573 100644
--- a/alma.install
+++ b/alma.install
@@ -1,23 +1,6 @@
 <?php
 
 
-/**
- * Implements hook_enable().
- *
- * Adds a profile2 type to use as this providers user profile.
- */
-function alma_enable() {
-  $profile_type = new ProfileType(
-    array(
-      'type' => 'provider_alma',
-      'label' => t('Profile for Alma'),
-      'userCategory' => TRUE,
-      'userView' => TRUE,
-    )
-  );
-  $profile_type->save();
-}
-
 /**
  * Update system table set alma weight=10 to ensure form_alter hooks are called
  * AFTER ding_user and ding_provider
diff --git a/alma.module b/alma.module
index 189391a..c943fc4 100644
--- a/alma.module
+++ b/alma.module
@@ -1,8 +1,7 @@
 <?php
-
 /**
  * @file
- *
+ * Code for the Alma feature.
  */
 
 define('ALMA_AUTH_BLOCKED', '4e5531951f55ab8f6895684999c69c2');
@@ -612,4 +611,7 @@ function alma_profile2_load($entities) {
       $wrapper->field_alma_mail->set($patron->email);
     }
   }
-}
\ No newline at end of file
+}
+
+// Include the feature code.
+include_once 'alma.features.inc';