Merge branch 'master' of github.com:moma/ProjectExplorer

LOCALDB/default_div.php

@@ -108,7 +108,7 @@ foreach ($wos_ids as $id => $score) {
 				$sql = 'SELECT data FROM ISITITLE WHERE id='.$id.' group by data';
 
 				foreach ($base->query($sql) as $row) {
-					$external_link="<a href=http://google.com/webhp?#q=".urlencode('"'.$row['data'].'"')." target=blank>".' <img width=15px src="'.$twjs.'img/google.png"></a>';	
+					$external_link="<a href=http://google.com/webhp?#q=".urlencode('"'.$row['data'].'"')." target=blank>".' <img width=15px src="'.'img/google.png"></a>';	
 					$output.="<li title='".$score."'>";
 					$output.=$external_link.imagestar($score,$factor,$twjs).' ';	
 					$output.='<a href="JavaScript:newPopup(\''.$twjs.'default_doc_details.php?gexf='.urlencode($gexf).'&index='.$table.'&query='.urlencode($query).'&type='.urlencode($_GET["type"]).'&id='.$id.'	\')">'.$row['data']." </a> ";
@@ -294,10 +294,10 @@ function imagestar($score,$factor,$twjs) {
 	if ($score > .5) {
 		$star_image = '';
 		for ($s = 0; $s < min(5,$score/$factor); $s++) {
-			$star_image.='<img src="'.$twjs.'img/star.gif" border="0" >';
+			$star_image.='<img src="'.'img/star.gif" border="0" >';
 		}
 	} else {
-		$star_image.='<img src="'.$twjs.'img/stargrey.gif" border="0">';
+		$star_image.='<img src="'.'img/stargrey.gif" border="0">';
 	}
 	return $star_image;
 }

LOCALDB/default_doc_details.php

@@ -32,7 +32,7 @@ echo '
     <div id="tabs">
   <ul>
     <li><a href="#tabs-1">Selected Document</a></li>
-    <li><a href="full_doc_list.php?'.'gexf='.urlencode($gexf).'&query='.urlencode($_GET["query"]).'&type='.urlencode($_GET["type"]).'">Full list</a></li>';    
+    <li><a href="full_doc_list.php?'.'gexf='.urlencode($gexf).'&query='.urlencode($_GET["query"]).'&index='.$_GET["index"].'&type='.urlencode($_GET["type"]).'">Full list</a></li>';    
   echo '</ul>';
 
 echo '<div id="tabs-1">';

LOCALDB/full_doc_list.php

@@ -23,7 +23,7 @@ foreach ($base->query($sql) as $row) {
 $table = "";
 $column = "";
 $id="";
-$twjs="API_CNRS/"; // submod path of TinaWebJS
+$twjs=end( explode("/",getcwd()) )."/"; // LOCALDB folder.
 
 if($type=="social"){
   $table = "ISIAUTHOR";
@@ -34,7 +34,7 @@ if($type=="social"){
 }
 
 if($type=="semantic"){
-  $table = "ISItermsListV1";
+  $table = $_GET["index"];
   $column = "data";
   $id = "id";
   $restriction='';
@@ -55,7 +55,6 @@ FROM '.$table.' where (';
 GROUP BY '.$id.'
 ORDER BY count('.$id.') DESC
 LIMIT 1000';
-
 #$queryparsed=$sql;#####
 
 $wos_ids = array();

LOCALDB/parameters_details.php

@@ -7,9 +7,8 @@ $gexf_db = array();
 
 # $gexf_db["data/ClimateChange/ClimateChangeV1.gexf"] = "data/ClimateChange/wosclimatechange-61715-1-wosclimatechange-db(2).db";
 $gexf_db["data/ClimateChange/Maps_S_800.gexf"] = "data/ClimateChange/wos_climate-change_title_2014-2015.db";
-
-$gexf_db["data/AXA/EditedJan20151980 nodes V2 PageRank.gexf"] = "data/AXA/data.db";
-$gexf_db["data/AXA/RiskV2PageRank.gexf"] = "data/AXA/data.db";
+$gexf_db["data/AXA/RiskV2PageRank1000.gexf"] = "data/AXA/data.db";
+$gexf_db["data/AXA/RiskV2PageRank2500.gexf"] = "data/AXA/data.db";
 $gexf_db["data/AXA/RiskV2PageRank5000.gexf"] = "data/AXA/data.db";
 
 $gexf= str_replace('"','',$_GET["gexf"]);

db.json

@@ -4,16 +4,21 @@
 		"title":"ISITITLE",
 		"date":"ISIpubdate",
 		"abstract":"ISIABSTRACT",
-		"first" : "RiskV2PageRank5000.gexf",		
+		"first" : "RiskV2PageRank1000.gexf",		
 		"gexfs": {
-			"RiskV2PageRank5000.gexf": {
-                		"social": { "table":"ISIAUTHOR" , "textCol":"data","forkeyCol":"id"},
-                		"semantic": { "table":"ISItermsAxa_2015" , "textCol":"data","forkeyCol":"id"}
+			"RiskV2PageRank1000.gexf": {
+        		"social": { "table":"ISIAUTHOR" , "textCol":"data","forkeyCol":"id"},
+        		"semantic": { "table":"ISItermsAxa_2015" , "textCol":"data","forkeyCol":"id"}
 			},
-			"RiskV2PageRank.gexf": {
+			"RiskV2PageRank2500.gexf": {
+                         "social": { "table":"ISIAUTHOR" , "textCol":"data","forkeyCol":"id"},
+                         "semantic": { "table":"ISItermsAxa_2015" , "textCol":"data","forkeyCol":"id"}
+                        },
+			"RiskV2PageRank5000.gexf": {
 				"social": { "table":"ISIAUTHOR" , "textCol":"data","forkeyCol":"id"},
 				"semantic": { "table":"ISItermsAxa_2015" , "textCol":"data","forkeyCol":"id"}
 			}
+
 		}
 	},
 	"data/ClimateChange": {

settings_explorerjs.js

@@ -21,7 +21,7 @@ var TW = {}
     // //     "data/Elisa__Omodei.gexf",
          ];
     TW.APINAME = "LOCALDB/";
-    TW.tagcloud_limit = 20;
+    TW.tagcloud_limit = 50;
     TW.bridge={};
     TW.bridge["forFilteredQuery"] = "php/bridgeClientServer_filter.php";
     TW.bridge["forNormalQuery"] = "php/bridgeClientServer.php";

tinawebJS/sigma.parseCustom.js

@@ -295,8 +295,11 @@ function dictfyGexf( gexf , categories ){
 
     var attention = false
     if( TW.Clusters.length == 0 ) {
-        if( nodes[1].attributes["cluster_index"] ) {
-            attention = true;
+        for( var i in nodes ) {
+            if( nodes[i].attributes["cluster_index"] ) {
+                attention = true;
+            }
+            break
         }
     }