[MOBY-dev] Re: [MISC] CommonSubs.pm

[Mark Wilkinson]

Hi Simon, 

This is likely specific to you - it looks like you have done some
tweaking of that part of the code, which caused a CVS versioning
conflict when you merged the public code into your own (the <<<<< and
>>>>> sections reveal what the conflict was)  just pick the more recent
one and delete the rest.

cheers!

M


On Wed, 2004-06-16 at 12:20, Simon Twigger wrote:
> Hi Mark,
> 
> I updated my copy of the cvs today to get CommonSubs working with
> myservices - I had been using some of Ken's modules before.
> 
> To get it to work I had to go in and hack the code
> aroundCommonSubs::responseHeader() (See below)
> 
> I had to comment out the <<<<<<<, ========= and >>>>>>>>> linesas they
> were causing things to break, Im guessing they were diffannotations or
> similar?
> 
> 
> Thought Id let you know, I didnt want to mess with the CVS
> bycommitting anything just in case its meant to be like this and Im
> justmissing something!
> 
> Simon.
> 
> sub responseHeader {
> # <<<<<<< CommonSubs.pm
> 
> warn "responseHeader Called..\n";
> 
>     my ($auth) = @_;
> # =======
>     use HTML::Entities ();
>     my ($auth, $notes) = &_rearrange([qw[AUTHORITY NOTE]], @_);
> # >>>>>>> 1.50
>     $auth ||="not_provided";
>     $notes ||="";
>     my $xml = "<?xml version='1.0' encoding='UTF-8'?>".
>         "<moby:MOBY
> xmlns:moby='http://www.biomoby.org/moby'xmlns='http://www.biomoby.org/moby'>".
>         "<moby:mobyContent moby:authority='$auth'>";
>     if ($notes){
>         my $encodednotes = HTML::Entities::encode($notes);
>         $xml.="<moby:serviceNotes>$encodednotes</moby:serviceNotes>";
>     }
>     return $xml;
> }
> 
> 
> --
> 
> Simon N. Twigger, Ph.D.
> Assistant Professor, Department of Physiology
> Medical College of Wisconsin
> 8701 Watertown Plank Road, 
> Milwaukee, WI, USA
> tel: 414-456-8802
> fax: 414-456-6595
> AIM/iChat: simontatmcw
-- 
Mark Wilkinson (mwilkinson at mrl.ubc.ca)
University of British Columbia iCAPTURE Centre