Merge pull request #26 from bwoodhead/6.x

6.x

fedora_repository.module

@@ -1319,71 +1319,6 @@ function fedora_repository_search_validate($form, &$form_state) {
   }
 }
 
-/**
- * fedora repository block
- * @param type $op
- * @param type $delta
- * @param type $edit
- * @return type 
- */
-function fedora_repository_block($op = 'list', $delta = 0, $edit = array()) {
-// The $op parameter determines what piece of information is being requested.
-  switch ($op) {
-    case 'list':
-// If $op is "list", we just need to return a list of block descriptions.
-// This is used to provide a list of possible blocks to the administrator,
-// end users will not see these descriptions.
-      $blocks[0] = array(
-        'info' => t('Repository advanced search block'),
-      );
-      return $blocks;
-    case 'configure':
-// If $op is "configure", we need to provide the administrator with a
-// configuration form. The $delta parameter tells us which block is being
-// configured. In this example, we'll allow the administrator to customize
-// the text of the first block.
-      $form = array();
-      switch ($delta) {
-        case 0:
-// All we need to provide is a text field, Drupal will take care of
-// the other block configuration options and the save button.
-          $form['fedora_repository_advanced_block_repeat'] = array(
-            '#type' => 'textfield',
-            '#title' => t('Number of times to repeat search fields'),
-            '#size' => 5,
-            '#description' => t('The number of times you would like the search blocks to be repeated'),
-            '#default_value' => variable_get('fedora_repository_advanced_block_repeat', t('3')),
-          );
-          break;
-      }
-      return $form;
-    case 'save':
-// If $op is "save", we need to save settings from the configuration form.
-// Since the first block is the only one that allows configuration, we
-// need to check $delta to make sure we only save it.
-      switch ($delta) {
-        case 0:
-// Have Drupal save the string to the database.
-          variable_set('fedora_repository_advanced_block_repeat', $edit['fedora_repository_advanced_block_repeat']);
-          break;
-      }
-    case 'view': default:
-// If $op is "view", then we need to generate the block for display
-// purposes. The $delta parameter tells us which block is being requested.
-      switch ($delta) {
-        case 0:
-// The subject is displayed at the top of the block. Note that it
-// should be passed through t() for translation.
-          $block['subject'] = t('Repository Advanced Search');
-// The content of the block is typically generated by calling a custom
-// function.
-          $block['content'] = drupal_get_form('fedora_repository_mnpl_advanced_search_form');
-          break;
-      }
-      return $block;
-  }
-}
-
 /**
  * fedora repository theme
  * @return type 

formClass.inc

@@ -97,6 +97,7 @@ class formClass {
       'type' => MENU_CALLBACK,
       'access arguments' => array('view fedora collection')
     );
+    
     $items['fedora/repository/editmetadata'] = array(
       'title' => t('Edit metadata'),
       'page callback' => 'fedora_repository_edit_qdc_page',
@@ -105,18 +106,21 @@ class formClass {
       'type' => MENU_CALLBACK,
       'access arguments' => array('edit fedora meta data')
     );
+    
     $items['fedora/repository/purgeStream'] = array(
       'title' => t('Purge data stream'),
       'page callback' => 'fedora_repository_purge_stream',
       'type' => MENU_CALLBACK,
       'access arguments' => array('purge objects and datastreams')
     );
+    
     $items['fedora/repository/replaceStream'] = array(
       'title' => t('Replace Stream'),
       'page callback' => 'fedora_repository_replace_stream',
       'type' => MENU_CALLBACK,
       'access arguments' => array('add fedora datastreams'),
     );
+    
     $items['fedora/repository/purgeObject'] = array(
       'title' => t('Purge object'),
       'page callback' => 'fedora_repository_purge_object',
@@ -124,6 +128,7 @@ class formClass {
       'type' => MENU_CALLBACK,
       'access arguments' => array('purge objects and datastreams')
     );
+    
     $items['fedora/repository/addStream'] = array(
       'title' => t('Add stream'),
       'page callback' => 'add_stream',
@@ -138,6 +143,7 @@ class formClass {
       'type' => MENU_CALLBACK,
       'access argruments' => array('view fedora collection')
     );
+    
     //new for mnpl******************************************
     $items['fedora/repository/mnpl_advanced_search'] = array(
       'title' => t('Repository advanced search'),
@@ -145,6 +151,7 @@ class formClass {
       'type' => MENU_CALLBACK,
       'access arguments' => array('view fedora collection')
     );
+    
     $items['fedora/ingestObject'] = array(
       'title' => t('Ingest object'),
       'page callback' => 'fedora_repository_ingest_object',
@@ -159,12 +166,6 @@ class formClass {
       'access arguments' => array('view fedora collection')
     );
 
-    $items['fedora/tagging/add_tag/js'] = array(
-      'page callback' => 'fedora_tagging_add_tag_js',
-      'access arguments' => array('edit tags datastream'),
-      'type' => MENU_CALLBACK,
-    );
-
     /* Export functionality */
     $items['fedora/basket'] = array(
       'title' => t('Fedora Basket'),