gets api import working with regular elements

Author: patrickmj

UserProfilesPlugin.php

@@ -170,7 +170,7 @@ public function filterSearchRecordTypes($recordTypes)
         return $recordTypes;
     }
 
-    public function filterApiResources($resources, $arg)
+    public function filterApiResources($resources)
     {
         $resources['user_profiles_types'] = array(
                 'record_type' => 'UserProfilesType',
@@ -198,11 +198,9 @@ public function filterApiImportOmekaAdapters($adapters, $args)
         $typesAdapter = new ApiImport_ResponseAdapter_Omeka_GenericAdapter(null, $args['endpointUri'], 'UserProfilesType');
         $typesAdapter->setResourceProperties(array('element_set' => 'ElementSet'));
         $adapters['user_profiles_types'] = $typesAdapter;
-
         $elementAdapter = new ApiImport_ResponseAdapter_Omeka_GenericAdapter(null, $args['endpointUri'], 'UserProfilesMultiElement)');
         $elementAdapter->setResourceProperties(array('element_set' => 'ElementSet'));
         $adapters['user_profiles_multielements'] = $elementAdapter;
-
         $profileAdapter = new ApiImport_ResponseAdapter_Omeka_UserProfilesProfile(null, $args['endpointUri'], 'UserProfilesProfile');
         $adapters['user_profiles'] = $profileAdapter; 
 
@@ -213,7 +211,6 @@ public function filterApiImportOmekaAdapters($adapters, $args)
                 'profile'      => 'UserProfilesProfile'
                 ));
         $adapters['user_profiles_multivalues'] = $valueAdapter;
-        
         return $adapters;
     }
 

controllers/ProfilesController.php

@@ -11,27 +11,27 @@ public function init()
     protected function _redirectAfterDelete($record)
     {
         $this->_helper->redirector('user');
-    }    
-    
+    }
+
     public function editAction()
     {
         $this->view->addHelperPath(USER_PROFILES_DIR . '/helpers', 'UserProfiles_View_Helper_');
         $allTypes = $this->_helper->db->getTable('UserProfilesType')->findAll();
         $typeId = $this->getParam('type');
-        
+
         //if no typeId
         if(!$typeId) {
             $typeId = $allTypes['0']->id;
         }
         $profileType = $this->_helper->db->getTable('UserProfilesType')->find($typeId);
-        
+
         $userId = $this->_getParam('id');
         if($userId) {
             $user = $this->_helper->db->getTable('User')->find($userId);
         } else {
             $user = current_user();
-            $userId = $user->id;            
-        }      
+            $userId = $user->id;
+        }
         $this->view->user = $user; 
         $userProfile = $this->_helper->db->getTable()->findByUserIdAndTypeId($userId, $typeId);
         if(!$userProfile) {
@@ -40,7 +40,7 @@ public function editAction()
             $userProfile->type_id = $typeId;
             $userProfile->setRelationData(array('subject_id'=>$userId));
         }
-        
+
         if(!is_allowed($userProfile, 'edit')) {
             throw new Omeka_Controller_Exception_403; 
         }
@@ -52,7 +52,6 @@ public function editAction()
             } else {
                 $this->_helper->flashMessenger($userProfile->getErrors());
             }
-            
         }
         $this->view->userprofilesprofile = $userProfile;
         $this->view->userprofilestype = $profileType;
@@ -63,9 +62,9 @@ public function userAction()
     {
         $allTypes = $this->_helper->db->getTable('UserProfilesType')->findAll();
         $userId = $this->_getParam('id');
-        
+
         $typeId = $this->getParam('type');
-        
+
         //if no typeId, as happens on the public side, give the first profile typeId
         if(!$typeId) {
             $typeId = $allTypes['0']->id;
@@ -84,26 +83,24 @@ public function userAction()
         $this->view->userprofilestype = $profileType;
         $this->view->profile_types = apply_filters('user_profiles_type', $allTypes);     
     }
-    
+
     public function elementFormAction()
     {
         $elementId = (int)$_POST['element_id'];
         $recordType = $_POST['record_type'];
         $recordId  = (int)$_POST['record_id'];
-         
+
         // Re-index the element form posts so that they are displayed in the correct order
         // when one is removed.
         if(isset($_POST['Elements'])) {
             $_POST['Elements'][$elementId] = array_merge($_POST['Elements'][$elementId]);
         }
         $element = $this->_helper->db->getTable('Element')->find($elementId);
         $record = $this->_helper->db->getTable($recordType)->find($recordId);
-    
+
         if (!$record) {
             $record = new $recordType;
         }
-    
         $this->view->assign(compact('element', 'record'));
-    }    
-    
+    }
 }

controllers/TypesController.php

@@ -85,7 +85,6 @@ public function addAction()
             } else {
                 $elementSet->delete();
             	$errors = $profileType->getErrors();
-            	debug($errors);
         		$this->_helper->flashMessenger($errors, 'error');
             }
         }

libraries/ApiImport/ResponseAdapter/Omeka/UserProfilesProfile.php

@@ -1,6 +1,6 @@
 <?php
 
-class ApiImport_ResponseAdapter_Omeka_UserProfilesProfile extends ApiImport_ResponseAdapter_GenericAdapter
+class ApiImport_ResponseAdapter_Omeka_UserProfilesProfile extends ApiImport_ResponseAdapter_Omeka_GenericAdapter
 {
 
     protected $resourceProperties = array('type' => 'UserProfilesType');
@@ -12,13 +12,17 @@ class ApiImport_ResponseAdapter_Omeka_UserProfilesProfile extends ApiImport_Resp
     public function import()
     {
         if(! $this->record) {
-            $this->record = new $this->recordType;
+            $this->record = new UserProfilesProfile;
         }
         $this->setFromResponseData();
         $elementTexts = $this->elementTexts();
+        $this->record->deleteElementTexts();
         $this->record->addElementTextsByArray($elementTexts);
         try {
+            $this->record->setRelationData(array('subject_id'=> $this->record->owner_id, 'object_id' => $this->record->id));
+            $relation = $this->record->getRelation();
             $this->record->save(true);
+            $relation->save(true);
             $this->addOmekaApiImportRecordIdMap();
         } catch (Exception $e) {
             _log($e);

models/UserProfilesProfile.php

@@ -99,20 +99,20 @@ protected function _initializeMixins()
         $this->_mixins[] = new Mixin_Owner($this);
         $this->_mixins[] = new Mixin_Timestamp($this);
         $this->_mixins[] = new Mixin_Search($this);
-    }    
-    
+    }
+
     public function afterSave($args)
     {
         if (!$this->public) {
             $this->setSearchTextPrivate();
         }
-        
-        $this->saveElementTexts();       
+
+        $this->saveElementTexts();
         $this->saveMultiElementValues();
         foreach ($this->getAllElementTexts() as $elementText) {
             $this->addSearchText($elementText->text);
-        }        
-        
+        }
+
         foreach($this->getAllMultiValues() as $multiValueRecord) {
             $displayValues = $multiValueRecord->getValuesForDisplay();
             foreach($displayValues as $value) {
@@ -121,6 +121,14 @@ public function afterSave($args)
         }
         $owner = $this->getOwner();
         $this->setSearchTextTitle($owner->name);
+        if(!empty($this->_relation)) {
+            if($this->_isSubject) {
+               $this->_relation->subject_id = $this->id;
+            } else {
+                $this->_relation->object_id = $this->id;
+            }
+            $this->_relation->save();
+        }
         parent::afterSave($args);
     }