Conflicts resolved

api/fedora_item.inc

@@ -97,11 +97,9 @@ class Fedora_Item {
       'logMessage' => ($logMessage != null) ? $logMessage : 'Ingested object ' . $datastream_id
     );
 
-<<<<<<< HEAD
+
     return $this->soap_call( 'addDataStream', $params );
-=======
-    return $this->soap_call('addDataStream', $params)->datastreamID;
->>>>>>> ISLANDORA-125
+
   }
 
   function add_datastream_from_string($str, $datastream_id, $datastream_label = NULL, $datastream_mimetype = 'text/xml', $controlGroup = 'M', $logMessage = null) {

api/fedora_utils.inc

@@ -66,40 +66,10 @@ function do_curl($url, $return_to_variable = 1, $number_of_post_vars = 0, $post
 }
 
 function fedora_available() {
-<<<<<<< HEAD
+
   $response = drupal_http_request(variable_get('fedora_base_url', 'http://localhost:8080/fedora').'/describe');
   return ($response->code == 200);
-=======
-  
-  $ret = do_curl(variable_get('fedora_soap_url', 'http://localhost:8080/fedora/services/management?wsdl'), 1);
-  // A bit of a hack but the SOAP parser will cause a fatal error if you give it the wrong URL.
-  //return (strpos($ret, 'wsdl:definitions') != FALSE);
-      
-  module_load_include('inc', 'fedora_repository', 'ConnectionHelper');
-  return true;
-  
-  
-    try {
-      $connection_helper = new ConnectionHelper();
-      
-      $soap_client = $connection_helper->getSoapClient( variable_get('fedora_soap_url', 'http://localhost:8080/fedora/services/access?wsdl'));
-      if (!empty($soap_client)) { 
-        
-        $result = $soap_client->__soapCall('describeRepository', array());
-      }
-      
-      return TRUE;
-    }
-    catch (SoapFault $e) {
 
-      watchdog(t("FEDORA_REPOSITORY"), t("Error trying to get SOAP client connection."));
-      
-      return FALSE;
-    
-
-  }
-  
->>>>>>> ISLANDORA-125
 }
 
 /**

formClass.inc

@@ -652,8 +652,8 @@ class formClass {
         '#description' => t('Datastream IDs defined by the content model.'),
       );
 
-      $form['stream_id']['#options'] = $dsidsForForm;
-    } 
+      $form['stream_id']['#options'] = $unused_dsids;
+    }
 
     else {
       $form['stream_id'] = array(