Fixed issue in base ontology. Fixed issue with no autogenerating docu…

…mentation for the ontology
it-innovation · Apr 24, 2012 · 7610620 · 7610620
1 parent 3dd5d85
commit 7610620
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 8 deletions.
diff --git a/http/current_spec.php b/http/current_spec.php
@@ -1,4 +1,5 @@
 <?php
+//ini_set('display_errors',1);
 include('include.inc.php');
 require_once('xmlfunc.inc.php');
 require_once('4storefunc.inc.php');
@@ -141,7 +142,7 @@
 $pagetitle="Ontology Specification";
 $ignoreloc=1;
 include('header.inc.php');
-if (sizeof($errs)>0){
+if (isset($errs) && sizeof($errs)>0){
         echo "    <!-- Errors -->\n";
         echo "    <div class=\"red\">\n";
         echo "      <h3>Errors:</h3>\n";

diff --git a/http/ontologies/CHANGELOG.php b/http/ontologies/CHANGELOG.php
@@ -6,6 +6,8 @@
 <p><big>This page includes the changelog for the <a href=".">myExperiment Ontology</a> and consequently myExperiment's RDF data.</big></p>
 
 <ul class="changelog">
+  <li><b>24/04/2012</b> Fixed mismatch between sioc:User and sioc:UserAccount in the base ontology.</li>
+  <li><b>02/03/2012</b> Added mecomp:waits-on and mecomp:is-waited-on to support chronologicial dependencies between Processors not explicitly defined by the data flow.</li>
   <li><b>12/10/2011</b> Changed mebase:User to be equivalent to a SIOC UserAccount rather than a SIOC User that no longer exists in the current specification.  A new mebase:Person class and migration of person based triples to this class will be performed shortly.</li>
   <li><b>03/10/2011</b> Corrected rdfs:label for Tagging as it was just set to Tag in Annotations module.  Corrected wrong namespace for Entry when defining PackEntry as a subClassOf it in Packs module.  Also modified all of the ontology module descriptors to include owl:versionInfo, so that dc:date captures the original modularization date of the ontology and owl:VersionInfo captures the last modification date of the ontology module.</li>
   <li><b>02/09/2011</b> Corrected rdfs:label for RestrictedAccess as it was just set to Access.</li>

diff --git a/http/ontologies/myexp_base.owl b/http/ontologies/myexp_base.owl
@@ -42,7 +42,7 @@
     <dc:contributor rdf:datatype="http://www.w3.org/2001/XMLSchema#string">David R Newman</dc:contributor>
     <dc:publisher rdf:resource="http://rdf.myexperiment.org"/>
     <dc:date rdf:datatype="http://www.w3.org/2001/XMLSchema#date">2009-01-28</dc:date>
-    <owl:versionInfo>$Date: 2010/11/25 $</owl:versionInfo>
+    <owl:versionInfo>$Date: 2012/04/24 $</owl:versionInfo>
     <dc:format rdf:datatype="http://www.w3.org/2001/XMLSchema#string">rdf/xml</dc:format>
     <owl:imports rdf:resource="&snarm;"/>
   </owl:Ontology>
@@ -659,7 +659,7 @@
   <owl:Class rdf:about="User">
     <rdfs:label>User</rdfs:label>
     <rdfs:comment>A User</rdfs:comment>
-    <owl:equivalentClass rdf:resource="&sioc;User"/>
+    <owl:equivalentClass rdf:resource="&sioc;UserAccount"/>
     <owl:disjointWith rdf:resource="Group"/>
     <rdfs:subClassOf rdf:resource="Actor" />
     <rdfs:subClassOf>

diff --git a/inc/4storefunc.inc.php b/inc/4storefunc.inc.php
@@ -115,7 +115,7 @@ function sparqlQueryClientMultiple($kb,$queries,$softlimit=1000,$timeout=30,$rea
 	foreach($qids as $qid){
 		$filenames[$qid]="${datapath}tmp/queries/".$qfp."_$qid";
 		$cmd=$lddir."4store/scripts/runquery.sh $kb \"".$queries[$qid]."\" $softlimit ".$filenames[$qid]." $reason &";
-//		echo $cmd."<br/>\n";
+		//echo $cmd."<br/>\n";
 		exec($cmd);
 	}
 
@@ -136,7 +136,8 @@ function sparqlQueryClientMultiple($kb,$queries,$softlimit=1000,$timeout=30,$rea
 			$fh=fopen($filenames[$qid],'r');
 			while(!feof($fh)){
 				$data=fread($fh,8192);
-				$results[$qid].=$data;
+                                if (!isset($results[$qid])) $results[$qid]=$data;
+				else $results[$qid].=$data;
 			}
 			exec("rm -f ".$filenames[$qid]);
 			fclose($fh);

diff --git a/inc/header.inc.php b/inc/header.inc.php
@@ -5,6 +5,7 @@
 		elseif (preg_match('/\/rdfdev\//',$_SERVER['REQUEST_URI'])) $hpath="/rdfdev";
 		elseif (preg_match('/\/linkeddata\//',$_SERVER['REQUEST_URI'])) $hpath="/linkeddata";
 	}
+        else $hpath="";
 ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> 
@@ -15,7 +16,7 @@
   <link rel="icon" href="<?=$hpath?>/img/favicon.ico" type="image/x-icon" />
   <meta http-equiv="Content-type" content="text/html;charset=UTF-8" />
 <?php
-	if (is_array($htmlheader)){
+	if (isset($htmlheader) && is_array($htmlheader)){
 		foreach ($htmlheader as $line) echo "  $line\n";
 	}
 ?>
@@ -25,7 +26,7 @@
 <div class="page">
  <div style="float: right;"><a href="http://www.myexperiment.org/feedback?subject=Linked%20Data">Submit Feedback/Bug Report</a></div> <h1>
 <?php
-if ($headerimg){
+if (isset($headerimg)){
 	if ($headerimg!="none") echo "    <img src=\"$headerimg\" alt=\"$headername Logo\"/>";
 	echo $pagetitle;
 }

diff --git a/inc/xmlfunc.inc.php b/inc/xmlfunc.inc.php
@@ -371,7 +371,8 @@ function tabulateSparqlResultsAssoc($parsedxml){
                 $vars[$v]=$vararray[$v]['attrs']['name'];
         }
 	$table=array();
-        $recs=$parsedxml[0]['children'][1]['children'];
+        if (isset($parsedxml[0]['children'][1]['children'])) $recs=$parsedxml[0]['children'][1]['children'];
+        else $recs=array();
         for ($r=0; $r<sizeof($recs); $r++){
                 for ($v=0; $v<sizeof($vars); $v++){
 			$bname=$recs[$r]['children'][$v]['attrs']['name'];