Index: evoc/evoc.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/evoc/evoc.module,v
retrieving revision 1.1.2.7
diff -u -p -r1.1.2.7 evoc.module
--- evoc/evoc.module	25 Feb 2009 18:50:40 -0000	1.1.2.7
+++ evoc/evoc.module	23 May 2009 09:31:28 -0000
@@ -211,17 +211,17 @@ function evoc_fetch_vocabulary($vocabula
       $term = array();
       $term['id'] = $term_qname_parts[1];
       $term['type'] = $type;
-      $term['label'] = $res_term['label']->value ? $res_term['label']->value : $res_term['label'];
-      $term['comment'] = $res_term['comment']->value ? $res_term['comment']->value : $res_term['comment'];
+      $term['label'] = $res_term['label']->value ? $res_term['label']->value : NULL;
+      $term['comment'] = !empty($res_term['comment']) ? $res_term['comment']->value : NULL;
       switch ($type) {
         case 'class' :
-          $term['superclass'] = rdf_uri_to_qname($res_term['superclass']->uri);
+          $term['superclass'] = !empty($res_term['superclass']) ? rdf_uri_to_qname($res_term['superclass']->uri) : NULL;
           break;
 
         case 'property' :
           // Extract some information like domain and range.
-          $term['domain'] = rdf_uri_to_qname($res_term['domain']->uri);
-          $term['range'] = rdf_uri_to_qname($res_term['range']->uri);
+          $term['domain'] = !empty($res_term['domain']) ? rdf_uri_to_qname($res_term['domain']->uri) : NULL;
+          $term['range'] = !empty($res_term['range']) ? rdf_uri_to_qname($res_term['range']->uri) : NULL;
           break;
 
       }
@@ -246,7 +246,7 @@ function _evoc_save_rdf_terms($ns, $pref
   // Get the existing namespaces stored in the system.
   // Here we want to make sure we have the namespace stored in the db in case
   // the module defining this ns in hook_rdf_namespaces() is disabled.
-  $rdf_namespaces = rdf_db_rdf_namespaces();
+  $rdf_namespaces = rdf_rdf_namespaces();
 
   //var_dump($rdf_namespaces);
   if (!in_array($ns, $rdf_namespaces)) { //FIXME: check also the prefix and raise a warning