/ - Diff - EDIT - EDIT Project Management

.gitattributes
3	3	module_patches/nodefamily/nodefamily_create-others-nodes.patch -text
4	4	modules/cdm_dataportal/cdm/cdm_api.php -text
5	5	modules/cdm_dataportal/cdm/ws_stub/README.txt -text
	6	modules/cdm_dataportal/cdm/ws_stub/xml/name%2F%3Fuuid%3Duuid.xml -text
6	7	modules/cdm_dataportal/cdm_dataportal.info -text
7	8	modules/cdm_dataportal/cdm_dataportal.module -text
8	9	modules/cdm_dataportal/cdm_dataportal.theme.php -text

        return $out;
+    }
     /**
      * @return string
      * @param string $url
      * @desc Return string content from a remote file
      * @author Luiz Miguel Axcar (lmaxcar@yahoo.com.br)
     */
     function get_content($url)
+    {
         $ch = curl_init();
         curl_setopt ($ch, CURLOPT_URL, $url);
         curl_setopt ($ch, CURLOPT_HEADER, 0);
         ob_start();
         curl_exec ($ch);
         curl_close ($ch);
         $string = ob_get_contents();
         ob_end_clean();
         return $string;
+    }
     /**
      * Loads the XML response for the given url from the CDM Data Store Webservice.
      * The XML is turned into a object wich is retuned. Incase of an error a
-...
      */
     function cdm_ws_load($url){
       $obj = simplexml_load_file(variable_get('cdm_webservice_url', '').$url);
       if(variable_get('cdm_webservice_isStub', 0)){
         $url = urlencode($url);
+      }
       //TODO get_content() requires the php curl extension to be installed, maybe we should chose an other function
       $data = get_content($url);
       if(!$obj){
         $backtrace = debug_backtrace();
         watchdog('CDM', $backtrace[1]['function'].' - failed to load '.$url, WATCHDOG_ERROR);
+      }
       $obj->ws_url = $url;
       return $obj;
+    }
     /**
      * The whatis service returns the type
      * i.e. DTO class name and simplename & cdm class name and simplename of the instance referenced by the $uuid parameter.

     <?xml version="1.0" encoding="UTF-8"?>
     <NameTO>
     	<uuid>987129837</uuid>
     	<fullname>Acanthocephalus Kar. & Kir.</fullname>
     	<taggedName>
     		<TaggedText>
     			<tag>name</tag>
     			<text>Acanthocephalus</text>
     		</TaggedText>
     		<TaggedText>
     			<tag>Kar. & Kir.</tag>
     			<text>Acanthocephalus</text>
     		</TaggedText>
     	</taggedName>
     	<nomenclaturalReference>
     		in Bull. Soc. Imp. Naturalistes Moscou 15: 127. 1842
     	</nomenclaturalReference>
     </NameTO>

       return $items;
+    }
     /**
      * Implementation of hook_block()
+     *
      * Provides the following blocks:
      *  0: list of links useful during development
+     *
      * @param String $op
      * @param int $delta
      */
     function cdm_dataportal_block($op='list', $delta=0) {
       // listing of blocks, such as on the admin/block page
       if ($op == "list") {
         $block[0]["info"] = t("CDM DataPortal DevLinks");
         return $block;
+      }
       else if ($op == 'view') {
         switch($delta){
           case 0:
             $block['subject'] = t('CDM DataPortal DevLinks');
             $block['content'] = '<ul><li>'.l('Taxon Page', 'cdm_dataportal/taxon/uuid').'</li><li>'.l('Name List', 'cdm_dataportal/names').'</li></ul>';
             return $block;
+        }
+      }
+    }
     /**
      * Implementation of hook_validate()
-...
      * @param $element
      */
     function cdm_webservice_url_validate($element){
       if (!str_endsWith($element['#value'], $str_end)) {
       if (!str_endsWith($element['#value'], '/')) {
           form_set_error('cdm_webservice_url', t("The URL to the CDM Web Service must end with a slash: '/'."));
+        }
+    }
-...
     function cdm_dataportal_settings(){
        //TODO: settings are still incomplete, compare with trunk/dataportal/inc/config_default.php.inc
        $form['cdm_webservice_url'] =  array(
         $form['cdm_webservice'] = array(
           '#type' => 'fieldset',
           '#title' => t('CDM Web Servic'),
           '#collapsible' => FALSE,
           '#collapsed' => TRUE,
         );
        $form['cdm_webservice']['cdm_webservice_url'] =  array(
         '#type' => 'textfield',
         '#title'         => t('CDM Store Webservice'),
         '#default_value' => variable_get('cdm_webservice_url', 'none'),
         '#description'   => t('The URL to Webservice of the CDM Store which is to be published.'),
          // #validate is set by default in form.inc#L334 to cdm_webservice_url_validate, if
         '#validate'      => array('_cdm_form_validate_endswith' => array('/', 'cdm_webservice_url')),
         '#title'         => t('CDM Web Service URL'),
         '#description'   => t('The URL of CDM Webservice which delivers the data to be published.'),
         '#default_value' => variable_get('cdm_webservice_url', 'http://dev.e-taxonomy.eu/svn/trunk/drupal/modules/cdm_dataportal/cdm/ws_stub/xml/'),
         );
        return $form;
         $form['cdm_webservice']['cdm_webservice_isStub'] =  array(
         '#type' => 'checkbox',
         '#title'         => t('Use Web Service Stub'),
         '#default_value' => variable_get('cdm_webservice_isStub', 1),
         '#description'   => t('Use a static web service stub. Only for development. For further information please refer to the ')
                           .l('ws_stub/README.txt', 'http://dev.e-taxonomy.eu/svn/trunk/drupal/modules/cdm_dataportal/cdm/ws_stub/README.txt', array('target'=>'_blank')),
         );
        return system_settings_form($form);
+    }
-...
+     *
      * @param $name_uuid the $name_uuid of the taxon name
      */
     function cdm_dataportal_view_taxon($name_uuid){
     function cdm_dataportal_view_taxon($uuid){
       //FIXME this is a dummy implementation
       $name = cdm_ws_get_name();
       $name = cdm_ws_get_name($uuid);
       return theme('cdm_name', $name);
       // END of dummy implementation
+    }

+     *
      * @param NameTO $nameTO the taxon name
      */
     function theme_cdm_name(NameTO $nameTO){
     function theme_cdm_name($nameTO){
         //TODO: how to respect the different subtypes of eu.etaxonomy.cdm.model.name.TaxonNameBase ?
         return cdm_taggedtext2html($nameTO->taggedName, 'span');
         $out = '<h2>Dummy content</h2>';
         if($nameTO){
            $out .= '<pre>'.print_r($nameTO, true).'</pre>';
           $out .= '<div>'.$nameTO->ws_url.'</div>';
           //$out .= '<div>'.cdm_taggedtext2html($nameTO->taggedName).'</div>';
         } else {
           $out .= '<div>Item not found</div>';
+        }
         return $out;
+    }
     /**

Project

General

Profile

EDIT

Revision d946105e

Added by Andreas Kohlbecker over 16 years ago