Menu
▾
▴
[DL-Learner SVN] SF.net SVN: dl-learner:[1341] trunk/src/dbpedia-navigator
|
From: <sk...@us...> - 2008-10-05 08:06:31
|
Revision: 1341
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=1341&view=rev
Author: sknappe
Date: 2008-10-05 08:02:09 +0000 (Sun, 05 Oct 2008)
Log Message:
-----------
changes according to email
Modified Paths:
--------------
trunk/src/dbpedia-navigator/ajax_get_article.php
trunk/src/dbpedia-navigator/ajax_learn_concepts.php
trunk/src/dbpedia-navigator/js/ajax.js
Modified: trunk/src/dbpedia-navigator/ajax_get_article.php
===================================================================
--- trunk/src/dbpedia-navigator/ajax_get_article.php 2008-10-02 09:20:38 UTC (rev 1340)
+++ trunk/src/dbpedia-navigator/ajax_get_article.php 2008-10-05 08:02:09 UTC (rev 1341)
@@ -61,14 +61,14 @@
$artTitle=urldecode(str_replace("_"," ",substr (strrchr ($url, "/"), 1)));
// display a picture if there is one
- if (isset($triples['http://dbpedia.org/property/imageCaption'])&&@$triples['http://dbpedia.org/property/imageCaption'][0]['type']!='uri') $alt=$triples['http://dbpedia.org/property/imageCaption'][0]['value'];
+ if (isset($triples['http://dbpedia.org/property/imageCaption'])&&$triples['http://dbpedia.org/property/imageCaption'][0]['type']!='uri') $alt=$triples['http://dbpedia.org/property/imageCaption'][0]['value'];
else if (isset($triples['http://dbpedia.org/property/caption'])&&$triples['http://dbpedia.org/property/imageCaption'][0]['type']!='uri') $alt=$triples['http://dbpedia.org/property/caption'][0]['value'];
else $alt='Picture of '.$artTitle;
if(isset($triples['http://xmlns.com/foaf/0.1/depiction'])&&@fopen($triples['http://xmlns.com/foaf/0.1/depiction'][0]['value'], 'r')){
$content.='<img src="'.$triples['http://xmlns.com/foaf/0.1/depiction'][0]['value'].'" alt="'.$alt.'" style="float:right; max-width:200px;" title="'.$alt.'"\>';
}
- else if(isset($triples['http://xmlns.com/foaf/0.1/img'])&&fopen($triples['http://xmlns.com/foaf/0.1/img'][0]['value'], 'r')){
+ else if(isset($triples['http://xmlns.com/foaf/0.1/img'])&&@fopen($triples['http://xmlns.com/foaf/0.1/img'][0]['value'], 'r')){
$content.='<img src="'.$triples['http://xmlns.com/foaf/0.1/img'][0]['value'].'" alt="'.$alt.'" style="float:right; max-width:200px;" title="'.$alt.'"\>';
}
@@ -77,6 +77,7 @@
if (isset($triples['http://dbpedia.org/property/redirect'])){
$content.="<span id=\"redirectedFrom\">redirected from '$subject'</span>";
$redirect=$triples['http://dbpedia.org/property/redirect'][0]['value'];
+ $uri=$redirect;
}
// add short description in english
@@ -318,16 +319,12 @@
//Add Positives to Session
if (!isset($_SESSION['positive'])){
- if ($redirect!=""){
- $array=array($redirect => $artTitle);
- }
- else $array=array($uri => $artTitle);
+ $array=array($uri => $artTitle);
$_SESSION['positive']=$array;
}
else{
$array=$_SESSION['positive'];
- if ($redirect!="") $array[$redirect] = $artTitle;
- else $array[$uri]=$artTitle;
+ $array[$uri]=$artTitle;
if (count($array)>3){
foreach ($array as $key=>$value){
unset($array[$key]);
@@ -349,19 +346,16 @@
$artTitle=$_SESSION['articles'][$fromCache]['subject'];
$lat=$_SESSION['articles'][$fromCache]['lat'];
$long=$_SESSION['articles'][$fromCache]['long'];
+ $uri=$_SESSION['articles'][$fromCache]['uri'];
//Add Positives to Session
if (!isset($_SESSION['positive'])){
- if ($redirect!=""){
- $array=array($redirect => $artTitle);
- }
- else $array=array($uri => $artTitle);
+ $array=array($uri => $artTitle);
$_SESSION['positive']=$array;
}
else{
$array=$_SESSION['positive'];
- if ($redirect!="") $array[$redirect] = $artTitle;
- else $array[$uri]=$artTitle;
+ $array[$uri]=$artTitle;
if (count($array)>3){
foreach ($array as $key=>$value){
unset($array[$key]);
Modified: trunk/src/dbpedia-navigator/ajax_learn_concepts.php
===================================================================
--- trunk/src/dbpedia-navigator/ajax_learn_concepts.php 2008-10-02 09:20:38 UTC (rev 1340)
+++ trunk/src/dbpedia-navigator/ajax_learn_concepts.php 2008-10-05 08:02:09 UTC (rev 1341)
@@ -107,7 +107,7 @@
foreach ($concepts as $conc){
foreach ($conc as $con){
$label=$sc->getNaturalDescription($con['descriptionKBSyntax']);
- $concept.="<tr><td><a href=\"\" onclick=\"getSubjectsFromConcept('kb=".htmlentities($con['descriptionKBSyntax'])."&number=10');return false;\" />".$label."</a> (accuracy: ".(floatVal($con['accuracy'])*100)."%)</td></tr>";
+ $concept.="<tr><td><a href=\"\" onclick=\"getSubjectsFromConcept('kb=".htmlentities($con['descriptionKBSyntax'])."&number=10');return false;\" />".$label."</a></td></tr>";
}
}
$concept.="</table>";
Modified: trunk/src/dbpedia-navigator/js/ajax.js
===================================================================
--- trunk/src/dbpedia-navigator/js/ajax.js 2008-10-02 09:20:38 UTC (rev 1340)
+++ trunk/src/dbpedia-navigator/js/ajax.js 2008-10-05 08:02:09 UTC (rev 1341)
@@ -25,8 +25,8 @@
}
if (XhrObj.readyState == 4){
setDatabaseRunning(false);
+ generateURL();
}
- generateURL();
}
XhrObj.setRequestHeader('Content-Type','application/x-www-form-urlencoded');
@@ -64,8 +64,8 @@
document.getElementById('LastArticlesBox').style.display='block';
learnConcept();
}else setTimeout("search_it('label='+document.getElementById('label').value+'&number=10')",2000);
+ generateURL();
}
- generateURL();
}
XhrObj.setRequestHeader('Content-Type','application/x-www-form-urlencoded');
@@ -95,9 +95,10 @@
document.getElementById('lastclasses').innerHTML=response[2];
document.getElementById('LastClassesBox').style.display='block';
}
- if (XhrObj.readyState == 4)
+ if (XhrObj.readyState == 4){
setDatabaseRunning(false);
- generateURL();
+ generateURL();
+ }
}
XhrObj.setRequestHeader('Content-Type','application/x-www-form-urlencoded');
@@ -124,8 +125,8 @@
document.getElementById('Positives').innerHTML=response[0];
document.getElementById('Negatives').innerHTML=response[1];
learnConcept();
+ generateURL();
}
- generateURL();
}
XhrObj.setRequestHeader('Content-Type','application/x-www-form-urlencoded');
@@ -152,8 +153,8 @@
document.getElementById('Positives').innerHTML=response[0];
document.getElementById('Negatives').innerHTML=response[1];
learnConcept();
+ generateURL();
}
- generateURL();
}
XhrObj.setRequestHeader('Content-Type','application/x-www-form-urlencoded');
@@ -177,8 +178,8 @@
{
if (XhrObj.readyState == 4 && XhrObj.status == 200){
document.getElementById('Positives').innerHTML = XhrObj.responseText;
+ generateURL();
}
- generateURL();
}
XhrObj.setRequestHeader('Content-Type','application/x-www-form-urlencoded');
@@ -203,8 +204,8 @@
if (XhrObj.readyState == 4 && XhrObj.status == 200){
document.getElementById('Negatives').innerHTML = XhrObj.responseText;
learnConcept();
+ generateURL();
}
- generateURL();
}
XhrObj.setRequestHeader('Content-Type','application/x-www-form-urlencoded');
@@ -231,8 +232,8 @@
document.getElementById('Positives').innerHTML=response[0];
document.getElementById('Negatives').innerHTML=response[1];
learnConcept();
+ generateURL();
}
- generateURL();
}
XhrObj.setRequestHeader('Content-Type','application/x-www-form-urlencoded');
@@ -259,8 +260,8 @@
document.getElementById('Positives').innerHTML=response[0];
document.getElementById('Negatives').innerHTML=response[1];
learnConcept();
+ generateURL();
}
- generateURL();
}
XhrObj.setRequestHeader('Content-Type','application/x-www-form-urlencoded');
@@ -345,8 +346,8 @@
document.getElementById('searchcontent').innerHTML=response[2];
document.getElementById('SearchResultBox').style.display='block';
}
+ generateURL();
}
- generateURL();
}
XhrObj.setRequestHeader('Content-Type','application/x-www-form-urlencoded');
@@ -378,9 +379,10 @@
document.getElementById('SearchResultBox').style.display='block';
}
}
- if (XhrObj.readyState == 4)
+ if (XhrObj.readyState == 4){
setDatabaseRunning(false);
- generateURL();
+ generateURL();
+ }
}
XhrObj.setRequestHeader('Content-Type','application/x-www-form-urlencoded');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
