[MOBY-guts] biomoby commit

[Eddie Kawas]

kawas
Tue Feb  3 13:05:03 EST 2009
Update of /home/repository/moby/moby-live/Perl/MOBY-Server/lib/MOBY/RDF/Ontologies
In directory dev.open-bio.org:/tmp/cvs-serv24944/Perl/MOBY-Server/lib/MOBY/RDF/Ontologies

Modified Files:
	Services.pm 
Log Message:
updated these modules to be more like their java counterparts. Namely, lsids are okay as URI and moved parsing out of URIs to the RDF parser, rather than having it occur in the RDF generator.
moby-live/Perl/MOBY-Server/lib/MOBY/RDF/Ontologies Services.pm,1.10,1.11
===================================================================
RCS file: /home/repository/moby/moby-live/Perl/MOBY-Server/lib/MOBY/RDF/Ontologies/Services.pm,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- /home/repository/moby/moby-live/Perl/MOBY-Server/lib/MOBY/RDF/Ontologies/Services.pm	2009/01/28 14:42:21	1.10
+++ /home/repository/moby/moby-live/Perl/MOBY-Server/lib/MOBY/RDF/Ontologies/Services.pm	2009/02/03 18:05:03	1.11
@@ -668,8 +668,10 @@
 						$oType,
 						$resource->new( MOBY::RDF::Predicates::RDF->type ),
 						new RDF::Core::Resource(
-							$self->{datatype_uri} . $_->objectType
-						)#TODO check for lsids
+							# check for lsids
+							LS::ID->new($_->objectType) ? 
+								$_->objectType : $self->{datatype_uri} . $_->objectType
+						)
 					)
 				);
 
@@ -738,8 +740,9 @@
 							$inNamespaces,
 							$resource->new( MOBY::RDF::Predicates::RDF->type ),
 							new RDF::Core::Resource(
-													 $self->{namespace_uri} . $n
-							  )  #TODO check for lsids
+								LS::ID->new($n) ? 
+									$n : $self->{namespace_uri} . $n
+							  )  # check for lsids
 						)
 					);
 				}
@@ -822,8 +825,9 @@
 							$oType,
 							$resource->new( MOBY::RDF::Predicates::RDF->type ),
 							new RDF::Core::Resource(
-									   $self->{datatype_uri} . $simp->objectType
-							  )#TODO check for lsids
+								LS::ID->new($simp->objectType) ? 
+									$simp->objectType : $self->{datatype_uri} . $simp->objectType	   
+							  )# check for lsids
 						)
 					);
 					my $namespaces = $simp->namespaces;
@@ -870,8 +874,9 @@
 												MOBY::RDF::Predicates::RDF->type
 								),
 								new RDF::Core::Resource(
-													 $self->{namespace_uri} . $n
-								  )#TODO check for lsids
+									LS::ID->new($n) ? 
+										$n : $self->{namespace_uri} . $n
+								  )# check for lsids
 							)
 						);
 					}
@@ -1075,8 +1080,9 @@
 						$oType,
 						$resource->new( MOBY::RDF::Predicates::RDF->type ),
 						new RDF::Core::Resource(
-										  $self->{datatype_uri} . $_->objectType
-						  )#TODO check for lsids
+							LS::ID->new($_->objectType) ? 
+								$_->objectType : $self->{datatype_uri} . $_->objectType
+						  )# check for lsids
 					)
 				);
 
@@ -1145,8 +1151,9 @@
 							$inNamespaces,
 							$resource->new( MOBY::RDF::Predicates::RDF->type ),
 							new RDF::Core::Resource(
-													 $self->{namespace_uri} . $n
-							  )#TODO check for lsids
+								LS::ID->new($n) ? 
+									$n : $self->{namespace_uri} . $n
+							  )# check for lsids
 						)
 					);
 				}
@@ -1229,8 +1236,9 @@
 							$oType,
 							$resource->new( MOBY::RDF::Predicates::RDF->type ),
 							new RDF::Core::Resource(
-									   $self->{datatype_uri} . $simp->objectType
-							  )#TODO check for lsids
+								LS::ID->new($simp->objectType) ? 
+									$simp->objectType : $self->{datatype_uri} . $simp->objectType
+							  )# check for lsids
 						)
 					);
 					my $namespaces = $simp->namespaces;
@@ -1277,8 +1285,9 @@
 												MOBY::RDF::Predicates::RDF->type
 								),
 								new RDF::Core::Resource(
-													 $self->{namespace_uri} . $n
-								  )#TODO check for lsids
+								LS::ID->new($n) ? 
+									$n : $self->{namespace_uri} . $n
+								  )
 							)
 						);
 					}