just cleanup nothing to see here. move along.

omeka · Jan 14, 2016 · 4bee8d0 · 4bee8d0
1 parent 066deaa
commit 4bee8d0
Show file tree

Hide file tree

Showing 12 changed files with 37 additions and 95 deletions.
diff --git a/VraCorePlugin.php b/VraCorePlugin.php
@@ -20,7 +20,7 @@ class VraCorePlugin extends Omeka_Plugin_AbstractPlugin
             );
 
     protected $searchTexts = '';
-    
+
     protected $elementsData = array(
             'Title' => array('attrs' => array('type')),
             'Agent' => array(
@@ -199,7 +199,7 @@ public function hookAdminHead($args)
         queue_js_string($js);
         queue_js_file('vra-core');
     }
-    
+
     public function hookPublicHead($args)
     {
         queue_css_file('vra-core');
@@ -235,7 +235,6 @@ public function hookElementsShow($args)
             }
             $groupedElements = array();
             foreach($elements as $element) {
-                debug($element->name);
                 $groupedElements[$element->name][] = $element;
             }
             $view = get_view();
@@ -246,7 +245,7 @@ public function hookElementsShow($args)
                     );
         }
     }
-    
+
     public function hookAfterSaveItem($args)
     {
         $this->afterSaveRecord($args);
@@ -261,7 +260,7 @@ public function hookAfterSaveFile($args)
     {
         $this->afterSaveRecord($args);
     }
-    
+
     public function filterVraIdInput($components, $args)
     {
         $components['html_checkbox'] = false;
@@ -345,17 +344,17 @@ public function getGlobalAttrs()
     {
         return $this->globalAttrs;
     }
-    
+
     public function getElementsData()
     {
         return $this->elementsData;
     }
-    
+
     public function getSubelementsData()
     {
         return $this->subelementsData;
     }
-    
+
     protected function storeAttributes($attributesData, $omekaRecord, $omekaElementId, $vraElementId = null)
     {
         if(empty($attributesData)) {
@@ -386,8 +385,7 @@ protected function storeAttributes($attributesData, $omekaRecord, $omekaElementI
         }
     }
 
-    /*
-     * 
+    /**
      * $vraElementId the id of the VraCoreElement record, not the optional vra_element_id column value
      */
     protected function storeElement($elementData, $omekaRecord, $omekaElementId, $vraElementId = null)
@@ -402,8 +400,6 @@ protected function storeElement($elementData, $omekaRecord, $omekaElementId, $vr
             $vraElement->vra_element_id = isset($elementData['vra_element_id']) ? $elementData['vra_element_id'] : null;
             $vraElement->name = $elementData['name'];
         }
-
-
         $vraElement->content = isset($elementData['content']) ? $elementData['content'] :  null;
         $this->searchTexts .= ' ' . $vraElement->content . ' ';
         $vraElement->save();
@@ -427,21 +423,18 @@ protected function processNewElement($omekaRecord, $omekaElementId, $elementData
                                 'name'  => 'dates',
                                 'attrs' => $datesSubelements['attrs'],
                                 );
-                    
+
                         $datesSubelementObject = $this->processNewSubelement($omekaRecord,
                                                                              $omekaElementId,
                                                                              $newVraElement,
                                                                              $datesSubelementData);
-                        
+
                         $earliestDateData = $datesSubelements['earliestDate'];
                         $earliestDateData['name'] = 'earliestDate';
                         $latestDateData = $datesSubelements['latestDate'];
                         $latestDateData['name'] = 'latestDate';
-
-
+
                         if(!empty($earliestDateData['content'])) {
-
-
                             $this->processNewSubelement($omekaRecord,
                                                     $omekaElementId,
                                                     $datesSubelementObject,
@@ -464,8 +457,6 @@ protected function processNewElement($omekaRecord, $omekaElementId, $elementData
                         $this->processNewSubelement($omekaRecord, $omekaElementId, $newVraElement, $subelementData);
                     }
                 }
-
-
             }
         } else {
             if (empty($elementData['content'])) {
@@ -477,10 +468,9 @@ protected function processNewElement($omekaRecord, $omekaElementId, $elementData
         }
         return $newVraElement;
     }
-    
+
     protected function processExistingElement($omekaRecord, $omekaElementId, $vraElementId, $elementData)
     {
-
         $hasSubelements = !empty($elementData['hasSubElements']);
         $vraElementObject = $this->_db->getTable('VraCoreElement')->find($vraElementId);
         if ($hasSubelements) {
@@ -494,14 +484,13 @@ protected function processExistingElement($omekaRecord, $omekaElementId, $vraEle
                 }
                 $vraElementObject->content = $elementData['content'];
                 //@TODO: reuse the storeElement function if possible, or rename it for clarity
-
                 $vraElementObject->save();
                 $this->searchTexts .= ' ' . $vraElementObject->content;
                 $this->storeAttributes($elementData['attrs'], $omekaRecord, $omekaElementId, $vraElementId);
             }
         }
     }
-    
+
     protected function processNewSubelement($omekaRecord, $omekaElementId, $parentVraElement, $elementData)
     {
         //this is the id of the element in Omeka's Elements table
@@ -540,7 +529,7 @@ protected function hasNewSubelements($elementData)
         }
         return false;
     }
-    
+
     public function afterSaveRecord($args)
     {
         $insert = $args['insert'];

diff --git a/controllers/AjaxController.php b/controllers/AjaxController.php
@@ -3,13 +3,11 @@ class VraCore_AjaxController extends Omeka_Controller_AbstractActionController
 {
     public function elementAction()
     {
-
         //@todo there has to be a cleaner way to pass the data around with statics
         // or at least know that it already exists someplace
         $plugin = new VraCorePlugin();
         $globalAttrs = $plugin->getGlobalAttrs();
         $elementsData = $plugin->getElementsData();
-
         $nameBase = $this->getParam('nameBase');
         $omekaElementName = $this->getParam('omekaElementName');
         $newElementCount = $this->getParam('newElementCount');
@@ -33,7 +31,7 @@ public function subelementAction()
         $nameBase = $this->getParam('nameBase');
         $subelementName = $this->getParam('subelementName');
         $newSubelementCount = $this->getParam('newSubelementCount');
-        
+
         if (isset($subelementsData[$subelementName])) {
             $attributeNames = array_merge($subelementsData[$subelementName]['attrs'], $globalAttrs);
         } else {
@@ -44,9 +42,8 @@ public function subelementAction()
         $this->view->nameBase = $nameBase;
         $this->view->subelementName = $subelementName;
         $this->view->newSubelementCount  = $newSubelementCount;
-
     }
-    
+
     public function parentElementAction()
     {
         $plugin = new VraCorePlugin();
@@ -56,7 +53,6 @@ public function parentElementAction()
         $omekaElementName = $this->getParam('omekaElementName');
         $nameBase = $this->getParam('nameBase');
         $newElementCount = $this->getParam('newElementCount');
-
         $attributeNames = array_merge($elementsData[$omekaElementName]['attrs'], $globalAttrs);
 
         $this->view->attributeNames = $attributeNames;
@@ -67,4 +63,4 @@ public function parentElementAction()
         $this->view->subelementsData = $subelementsData;
         $this->view->globalAttrs = $globalAttrs;
     }
-}
+}
diff --git a/models/Table/VraCoreAttribute.php b/models/Table/VraCoreAttribute.php
@@ -13,7 +13,7 @@ public function getSelectForFindBy($params)
         }
         return $select;
     }
-    
+
     public function fetchElementDataDate($vraElement)
     {
         $select = $this->getSelectForFindBy(array(
@@ -26,4 +26,4 @@ public function fetchElementDataDate($vraElement)
                 );
         return $this->fetchObject($select);
     }
-}
+}
diff --git a/models/Table/VraCoreElement.php b/models/Table/VraCoreElement.php
@@ -13,7 +13,7 @@ public function getSelectForFindBy($params)
         }
         return $select;
     }
-    
+
     public function findNotesForRecordElement($omekaRecord, $omekaElementId)
     {
         $params = array(
@@ -25,7 +25,7 @@ public function findNotesForRecordElement($omekaRecord, $omekaElementId)
         $select = $this->getSelectForFindBy($params);
         return $this->fetchObject($select);
     }
-    
+
     public function omekaElementHasVraElements($omekaElement, $omekaRecord)
     {
         $count = $this->count(array('element_id' => $omekaElement->id,
@@ -37,4 +37,4 @@ public function omekaElementHasVraElements($omekaElement, $omekaRecord)
         }
         return false;
     }
-}
+}
diff --git a/models/VraCoreAttribute.php b/models/VraCoreAttribute.php
@@ -3,14 +3,14 @@
 class VraCoreAttribute extends Omeka_Record_AbstractRecord
 {
     public $record_id;
-    
+
     public $record_type;
-    
+
     public $element_id;
-    
+
     public $vra_element_id;
-    
+
     public $name;
-    
+
     public $content;
 }
diff --git a/models/VraCoreElement.php b/models/VraCoreElement.php
@@ -4,22 +4,21 @@ class VraCoreElement extends Omeka_Record_AbstractRecord
 {
 
     public $record_id;
-    
+
     public $record_type;
-    
+
     public $element_id;
-    
+
     public $vra_element_id;
-    
+
     public $name;
-    
+
     public $content;
-    
+
     protected $attributes;
-    
+
     protected $subelements;
-
-
+
     public function getAttributes()
     {
         if(! $this->attributes) {

diff --git a/views/admin/ajax/element.php b/views/admin/ajax/element.php
@@ -1,6 +1,4 @@
-
 <div class='vra-element-inputs new added'>
-
     <textarea name='<?php echo $nameBase; ?>[newElements][<?php echo $newElementCount; ?>][content]' value=''></textarea>
     <input type='hidden' name='<?php echo $nameBase; ?>[newElements][<?php echo $newElementCount; ?>][name]' value='<?php echo $omekaElementName; ?>'></input>
         <?php echo $this->partial('element-attribute-form.php', 
@@ -15,4 +13,3 @@
                 );
         ?>
 </div>
-
diff --git a/views/admin/ajax/parent-element.php b/views/admin/ajax/parent-element.php
@@ -7,15 +7,11 @@
         <input type='hidden' name='<?php echo $nameBase; ?>[newElements][<?php echo $newElementCount; ?>][hasSubelements]' value='1'></input>
         <div class='vra-subelements'>
         <?php foreach($elementsData[$omekaElementName]['subelements'] as $subelementName): ?>
-            <?php debug($subelementName); ?>
-
             <?php if($subelementName == 'dates'): ?>
-
             <div class='vra-subelement-container'>
                 <div class='vra-element-header'>
                     <div class='drawer closed'></div><label class='vra-subelement-label'><?php echo $subelementName; ?></label>
                 </div>
-
                 <fieldset style='display:none'>
                     <input class='subelement-add' type='submit' value='Add Dates Element' data-namebase='<?php echo $nameBase; ?>' data-subelement-name='<?php echo $subelementName; ?>' data-omeka-element-name='<?php echo $omekaElement->name; ?>'></input>
                     <?php echo $this->partial('element-attribute-form.php', 
@@ -44,15 +40,6 @@
                 ?>
                 </fieldset>
             </div>
-
-
-
-
-
-
-
-
-
             <?php else: ?>
             <div class='vra-subelement-container'>
                 <div class='vra-element-header'>
@@ -61,15 +48,13 @@
                 <fieldset style='display: none'>
                     <input class='subelement-add' type='submit' value='Add Input' data-namebase='<?php echo $nameBase; ?>' data-subelement-name='<?php echo $subelementName; ?>' data-omeka-element-name='<?php echo $omekaElementName; ?>'></input>
                     <div class='vra-subelement vra-element-inputs new'>
-
                         <?php
                             if (isset($subelementsData[$subelementName])) {
                                 $attributeNames = array_merge($subelementsData[$subelementName]['attrs'], $globalAttrs);
                             } else {
                                 $attributeNames = $globalAttrs;
                             }
                         ?>
-
                         <textarea name='<?php echo $nameBase; ?>[newElements][<?php echo $newElementCount; ?>][newSubelements][<?php echo $subelementName; ?>][0][content]' value=''></textarea>
                             <?php echo $this->partial('element-attribute-form.php', 
                                     array(
@@ -89,4 +74,4 @@
         <?php endforeach; ?>
         </div>
     </fieldset>
-</div>
+</div>
diff --git a/views/admin/ajax/subelement.php b/views/admin/ajax/subelement.php
@@ -1,8 +1,6 @@
 <?php if ($subelementName == 'dates'): ?>
-
     <?php echo $this->partial('dates-form.php',
                           array(
-
                               'elementsData'     => $this->elementsData,
                               'subelementsData'  => $this->subelementsData,
                               'subelementName'   => $subelementName,
@@ -11,12 +9,9 @@
                                 //@todo : how many of these are still actually used?
                               'globalAttributes' => $this->globalAttrs,
                               'attributeNames'    => $attributeNames,
-
                               'attributeObjects'  => array()
-
                         )
             );
-
     ?>
 
 <?php else: ?>