Index: /SPARQLBuilderWWW/web/jsgui.html
===================================================================
--- /SPARQLBuilderWWW/web/jsgui.html (revision 156)
+++ /SPARQLBuilderWWW/web/jsgui.html (revision 169)
@@ -64,13 +64,21 @@
 
 
+// 騾√ｉ繧後◆繝代せ縺ｮ菫晏ｭ伜�
+var jsontext = "";
+// 霑斐☆繝代せ縺ｮ繧ｪ繝悶ず繧ｧ繧ｯ繝�
 var pathobj = [];
+
+// 騾√ｉ繧後◆繝代せ縺ｮ謨ｰ
 var PATHNUM = 0;
+// 騾√ｉ繧後◆繝代せ縺ｮ譛螟ｧ豺ｱ縺�
 var MAXDEPTH = 0;
+// 繝代せ縺ｮ繝弱�繝蛾俣菴咏區
 var TREESPACE = 0;
+// 繝代せ髢薙�荳贋ｸ倶ｽ咏區
 var DRAWHEIGHT = 0;
+// 繝弱�繝峨�螟ｧ縺阪＆
 var NODEHEIGHT = 50;
+// 繝��繝ｫ繝√ャ繝励ｒ髫縺吶◆繧√�蜍輔″蛻､螳夂畑
 var MOUSEMOVED = 0;
-var jsontext = "";
-var DURATION = 0;
 
 
@@ -78,6 +86,9 @@
 $(window).load(function() {
 
+	// 荳企Κ繝｡繝九Η繝ｼ縺ｮ蟷�ｼ育判髱｢繧ｵ繧､繧ｺ縺ｨ蜷後§��
 	var menuwidth = window.innerWidth + "px";
+	// 荳企Κ繝｡繝九Η繝ｼ蟾ｦ蛛ｴ驛ｨ蛻�ｼ亥�蜉帶ｬ�ｼ峨�繧ｵ繧､繧ｺ
 	var inputswidth = ((window.innerWidth - 100) / 2) + "px";
+	// 縺昴ｌ縺槭ｌ縺ｫ繧ｻ繝�ヨ
 	document.getElementById("menu").style.width = menuwidth;
 	document.endpoint.inputendpoint.style.width = inputswidth;
@@ -87,6 +98,8 @@
 	document.path.sparql.style.width = inputswidth;
 	document.path.sendsparql.style.width = inputswidth;
+	// 繧ｰ繝ｩ繝墓緒逕ｻ驛ｨ蛻�ｒ荳企Κ繝｡繝九Η繝ｼ逶ｴ蠕後↓謗･縺吶ｋ繧医≧縺ｫ險ｭ螳�
 	document.getElementById("graph").style.top = document.getElementById("menu").offsetHeight + "px";
 
+	// 繧ｨ繝ｳ繝峨�繧､繝ｳ繝井ｸ隕ｧ繧貞叙蠕励＠繧ｻ繝�ヨ
 	$.ajax({
 		type: "GET",
@@ -108,6 +121,4 @@
 	// make_data繝｡繧ｽ繝�ラ縺ｮ邨先棡繧貞叙蠕�
 	var json = make_data(0);
-	// 豺ｱ縺輔ｒ蜿門ｾ�
-	var dep = MAXDEPTH;
 
 	// 蜃ｺ譚･荳翫′縺｣縺溽ｵ先棡繧呈ｸ｡縺励※繝槭ャ繝嶺ｸ翫�繝ｭ繧ｱ繝ｼ繧ｷ繝ｧ繝ｳ繧偵そ繝�ヨ
@@ -125,19 +136,6 @@
 	        d3.select("#graph").select("svg").remove();
 	}
-	DURATION = 0;
-
-	/*
-	// 繝峨Λ繝�げ譎ゅ�蜃ｦ逅�
-	var drag = d3.behavior.drag().on("drag", function(d,i) {
-	    d.x += d3.event.dx
-	    d.y += d3.event.dy
-
-	    d. isDrag = true;
-	    DURATION = 0;
-	    redraw();
-	});
-	*/
-
-	// SVG縺ｮ霑ｽ蜉
+
+	// 逕ｻ髱｢繧ｵ繧､繧ｺ縺ｫ蜷医ｏ縺婀VG縺ｮ霑ｽ蜉
 	var svg = d3.select("#graph").append("svg")
 	    .attr("width", width)
@@ -153,129 +151,138 @@
 		.attr("fill", "#fafafa");
 
-	// 繝ｪ繝ｳ繧ｯ縺ｮ菴懈�
+	// links驟榊�繧呈ｸ｡縺励Μ繝ｳ繧ｯ縺ｮ菴懈�
 	var link = svg.selectAll(".link")
-	.data(json.links)
-	.enter().append("line")
-	.attr("class", "link")
-	.style("stroke-width", function(d) { return Math.sqrt(d.value);});
-
-	// 繝弱�繝峨�菴懈�
+		.data(json.links)
+		.enter().append("line")
+		.attr("class", "link")
+		.style("stroke-width", function(d) { return Math.sqrt(d.value);});
+
+	// nodes驟榊�繧呈ｸ｡縺励ヮ繝ｼ繝峨�菴懈�
 	var node = svg.selectAll(".node")
-	.data(json.nodes)
-	.enter().append("circle")
-	.attr("class", "node")
-	.attr("r", (NODEHEIGHT / 2))
-	.attr("cx", function(d) { return d.x;} )
-	.attr("cy",  function(d) { return d.y; })
-	.style("stroke", function(d) { return '#fafafa'; })
-	.style("stroke-width", function(d) { return '1.5px'; })
-	.style("fill", function(d) { return color(d.group); })
-	.style("cursor", function(d) { return 'pointer'; });
-	//.call(drag);
-
-	// 繝弱�繝峨ユ繧ｭ繧ｹ繝医�菴懈�
+		.data(json.nodes)
+		.enter().append("circle")
+		.attr("class", "node")
+		.attr("r", (NODEHEIGHT / 2))
+		.attr("cx", function(d) { return d.x;} )
+		.attr("cy",  function(d) { return d.y; })
+		.style("stroke", function(d) { return '#fafafa'; })
+		.style("stroke-width", function(d) { return '1.5px'; })
+		.style("fill", function(d) { return color(d.group); })
+		.style("cursor", function(d) { return 'pointer'; });
+
+	// nodes驟榊�繧呈ｸ｡縺励ヮ繝ｼ繝峨ユ繧ｭ繧ｹ繝医�菴懈�
 	var tnode = svg.selectAll("text.node")
-	.data(json.nodes)
-	.enter().append("svg:text")
-	.attr("class", "tnode")
-	.attr("x", function(d) { return d.x; })
-	.attr("y", function(d) { return d.y; })
-	.text(function(d) {
-		var nodetext = d.name
-		var nodesplit1 = nodetext.split("/");
-		var nodesplit2 = nodesplit1[nodesplit1.length - 1];
-		var nodesplit3 = nodesplit2.split("#");
-		nodetext = nodesplit3[nodesplit3.length - 1];
-		return nodetext;
-	})
-	.style("fill", function(d) { return '#000000'; })
-	//.style("stroke", function(d) { return '#000000'; })
-	//.style("stroke-width", function(d) { return '1.5px'; })
-	.style("text-anchor", function(d) { return 'middle'; })
-	.style("pointer-events", "none");
-	//.call(drag);
+		.data(json.nodes)
+		.enter().append("svg:text")
+		.attr("class", "tnode")
+		.attr("x", function(d) { return d.x; })
+		.attr("y", function(d) { return d.y; })
+		.text(function(d) { return d.name; })
+		.style("fill", function(d) { return '#000000'; })
+		.style("text-anchor", function(d) { return 'middle'; })
+		.style("pointer-events", "none");
 
 	// 繝ｪ繝ｳ繧ｯ繝�く繧ｹ繝医�菴懈�
 	var tlink = svg.selectAll("text.link")
-	.data(json.links)
-	.enter().append("svg:text")
-	.attr("class", "tlink")
-	.attr("x", function(d) { return (json.nodes[d.source].x + json.nodes[d.target].x) / 2; })
-	.attr("y", function(d) { return (json.nodes[d.source].y + json.nodes[d.target].y) / 2; })
-	.style("fill", function(d) { return '#000000'; })
-	.style("text-anchor", function(d) { return 'middle'; });
-
-	// 繝弱�繝峨∈縺ｮ繧ｯ繝ｪ繝�け縺ｧ繝代せ謗｢邏｢縲√ヱ繧ｹ荳ｭ縺ｮ繝ｪ繝ｳ繧ｯ譁�ｭ励ｒ陦ｨ遉ｺ
+		.data(json.links)
+		.enter().append("svg:text")
+		.attr("class", "tlink")
+		.attr("x", function(d) { return (json.nodes[d.source].x + json.nodes[d.target].x) / 2; })
+		.attr("y", function(d) { return (json.nodes[d.source].y + json.nodes[d.target].y) / 2; })
+		.style("fill", function(d) { return '#000000'; })
+		.style("text-anchor", function(d) { return 'middle'; });
+
+	// 繝弱�繝峨∈縺ｮ繧ｪ繝ｳ繝槭え繧ｹ縺ｧ繝代せ謗｢邏｢縲√ヱ繧ｹ荳ｭ縺ｮ繝ｪ繝ｳ繧ｯ譁�ｭ励ｒ陦ｨ遉ｺ
 	node.on("mouseover", function(d){
 
+		// 繝槭え繧ｹ縺ｮ蜍輔″繧ｫ繧ｦ繝ｳ繝医ｒ繝ｪ繧ｻ繝�ヨ
 		MOUSEMOVED = 0;
 
-		if(!d.isDrag){
-
-			var path = [];
-			var pathname = [];
-
-			if(d.nodeid != 0){
-				path.push(d.nodeid);
-				pathname.push(d.name);
-				do{
-					for(var i = 0; i < link.data().length; i++){
-						if(path[(path.length-1)] == link.data()[i].target){
-							path.push(link.data()[i].source);
-							pathname.push(link.data()[i].property);
-							pathname.push(node.data()[link.data()[i].source].name);
-						}
+		// 陦ｨ遉ｺ縺吶ｋ繝代せ菫晏ｭ倡畑驟榊�
+		var path = [];
+		// 繝��繝ｫ繝√ャ繝励∈縺ｮ蜷榊燕陦ｨ遉ｺ逕ｨ驟榊�
+		var pathname = [];
+
+		// 繝ｫ繝ｼ繝医ヮ繝ｼ繝我ｻ･螟悶↑繧�
+		if(d.nodeid != 0){
+			// 縺ｾ縺壹が繝ｳ繝槭え繧ｹ縺輔ｌ縺溘ヮ繝ｼ繝峨�id縺ｨ蜷榊燕繧偵◎繧後◇繧瑚ｿｽ蜉
+			path.push(d.nodeid);
+			pathname.push(d.name);
+
+			// 繝代せ謗｢邏｢
+			do{
+				// 繝ｪ繝ｳ繧ｯ縺ｮ謨ｰ縺縺醍ｹｰ繧願ｿ斐＠
+				for(var i = 0; i < link.data().length; i++){
+					// 迴ｾ蝨ｨ縺ｮ譛蠕悟ｰｾ縺ｫ郢九′繧九Μ繝ｳ繧ｯ縺後≠繧後�
+					if(path[(path.length-1)] == link.data()[i].target){
+						// 縺昴�繝ｪ繝ｳ繧ｯ縺ｮ繧ｽ繝ｼ繧ｹ蛛ｴ繝弱�繝峨�id繧定ｿｽ蜉
+						path.push(link.data()[i].source);
+						// 縺昴�繝ｪ繝ｳ繧ｯ縺ｮ蜷榊燕縺ｨ繧ｽ繝ｼ繧ｹ蛛ｴ繝弱�繝峨�蜷榊燕繧定ｿｽ蜉
+						pathname.push(link.data()[i].property);
+						pathname.push(node.data()[link.data()[i].source].name);
 					}
-				}while(path[(path.length-1)] != 0);
+				}
+			// 繝ｫ繝ｼ繝医ヮ繝ｼ繝峨↓霎ｿ繧顔捩縺上∪縺ｧ郢ｰ繧願ｿ斐☆
+			}while(path[(path.length-1)] != 0);
+
+			// 譛ｫ遶ｯ繝弱�繝峨〒縺ｪ縺�↑繧�
+			if(d.path == "notend"){
+				// 繝��繝ｫ繝√ャ繝励ｒ髱櫁｡ｨ遉ｺ縺ｫ
+				document.getElementById("showpath").style.display = "none";
+			}else{
+				// 譛ｫ遶ｯ繝弱�繝峨↑繧峨ヤ繝ｼ繝ｫ繝√ャ繝励�諠�ｱ繧呈峩譁ｰ
 				var resultText = "<h3>Selected Path</h3>";
+				// 繝代せ縺ｮ蜷榊燕驟榊�蛻�ｾ後ｍ縺九ｉ郢ｰ繧願ｿ斐＠縺ｪ縺後ｉ
 				for (var i = pathname.length;i > 0; i--){
+					// 螂�焚逡ｪ逶ｮ�医ヮ繝ｼ繝峨�蜷榊燕�峨�螟ｪ蟄励↓
 					if(i % 2 == 1){
 						resultText = resultText + "<span style=\"font-weight: bold;\">" + pathname[i - 1] + "</span><br><br>";
+					// 蛛ｶ謨ｰ逡ｪ逶ｮ�医Μ繝ｳ繧ｯ縺ｮ蜷榊燕�峨�縺昴�縺ｾ縺ｾ縺ｧ陦ｨ遉ｺ
 					}else{
 						resultText = resultText + pathname[i - 1] + "<br><br>";
 					}
 				}
-
+				// 繝��繝ｫ繝√ャ繝励�蜀�ｮｹ繧呈嶌縺肴鋤縺�
 				document.getElementById("selectpath").innerHTML=(resultText);
 
-				/*
-				if(d.group > (MAXDEPTH - 2)){
-					document.getElementById("getsparqlbutton").style.display = "block";
-				}else{
-					document.getElementById("getsparqlbutton").style.display = "none";
-				}
-				*/
-
-				if(d.path == "notend"){
-					document.getElementById("showpath").style.display = "none";
-				}else{
-
-					pathobj = d.path;
-
-					var xPosition = parseFloat(d3.select(this).attr("cx")) + parseFloat(d3.select(this).style("stroke-width")) + (NODEHEIGHT * 0.5);
-					var yPosition = parseFloat(d3.select(this).attr("cy") - document.getElementById("showpath").offsetHeight + document.getElementById("menu").offsetHeight) + (NODEHEIGHT * 0.5);
-
-					if(xPosition < 0){
-						xPosition = 0;
-					}
-					if(yPosition < 0){
-						yPosition = 0;
-					}
-
-					document.getElementById("showpath").style.left = xPosition + "px"
-					document.getElementById("showpath").style.top = yPosition + "px"
-					document.getElementById("showpath").style.display = "block";
-				}
-
-			}else{
-				document.getElementById("showpath").style.display = "none";
-			}
-
-			var movey = d.y;
-
-			node
+				// 繧ｵ繝ｼ繝悶Ξ繝�ヨ縺ｫ騾√ｊ霑斐☆繝代せ繧ｪ繝悶ず繧ｧ繧ｯ繝医ｒ菫晏ｭ�
+				pathobj = d.path;
+
+				// 繝��繝ｫ繝√ャ繝苓｡ｨ遉ｺ譎ゅ�蠎ｧ讓呻ｼ医が繝ｳ繝槭え繧ｹ縺輔ｌ縺溘ヮ繝ｼ繝峨�讓ｪ縺ｫ繝懊ち繝ｳ縺梧擂繧九ｈ縺��鄂ｮ��
+				var xPosition = parseFloat(d3.select(this).attr("cx")) + parseFloat(d3.select(this).style("stroke-width")) + (NODEHEIGHT * 0.5);
+				var yPosition = parseFloat(d3.select(this).attr("cy") - document.getElementById("showpath").offsetHeight + document.getElementById("menu").offsetHeight) + (NODEHEIGHT * 0.5);
+
+				// 繝��繝ｫ繝√ャ繝励′逕ｻ髱｢螟悶↓蜃ｺ縺ｪ縺�ｈ縺�｣懈ｭ｣
+				if(xPosition < 0){
+					xPosition = 0;
+				}
+				if(yPosition < 0){
+					yPosition = 0;
+				}
+
+				// 逕滓�縺励◆蠎ｧ讓吶↓繝��繝ｫ繝√ャ繝励ｒ陦ｨ遉ｺ
+				document.getElementById("showpath").style.left = xPosition + "px"
+				document.getElementById("showpath").style.top = yPosition + "px"
+				document.getElementById("showpath").style.display = "block";
+			}
+		// 繝ｫ繝ｼ繝医ヮ繝ｼ繝峨□縺｣縺溘↑繧�
+		}else{
+			// 繝��繝ｫ繝√ャ繝励ｒ髱櫁｡ｨ遉ｺ
+			document.getElementById("showpath").style.display = "none";
+		}
+
+		// 繧ｪ繝ｳ繝槭え繧ｹ縺輔ｌ縺溘ヮ繝ｼ繝峨�鬮倥＆縺ｫ隕ｪ繧貞粋繧上○繧�
+		// 蜷医ｏ縺帙ｋ鬮倥＆繧剃ｿ晏ｭ�
+		var movey = d.y;
+
+		// 蜷�ヮ繝ｼ繝峨↓蟇ｾ縺�
+		node
+			// 霈ｪ驛ｭ邱壹�濶ｲ繧定ｨｭ螳�
 			.style("stroke", function(d){
+				// 縺ｾ縺壹�閭梧勹濶ｲ�医ョ繝輔か繝ｫ繝茨ｼ峨ｒ謖�ｮ�
 				var strokecolor = "#fafafa";
+				// 蜑榊屓濶ｲ繧剃ｻ倥￠縺ｦ縺�◆繝弱�繝峨↑繧�
 				if(d.view == "now"){
+					// 繝弱�繝峨�濶ｲ莉倥￠繧偵↑縺励↓
 					d.view = "no";
 				}
@@ -312,5 +319,5 @@
 			});
 
-			tlink
+		tlink
 			.text(function(d) {
 				var linktext = "";
@@ -322,23 +329,15 @@
 					for(var t = 0; t < path.length; t++){
 						if(path[t] == d.target && node.data()[d.target].view != "hide"){
-							var propertytext = d.property
-							var linksplit1 = propertytext.split("/");
-							var linksplit2 = linksplit1[linksplit1.length - 1];
-							var linksplit3 = linksplit2.split("#");
-							linktext = linksplit3[linksplit3.length - 1];
+							linktext = d.property
 							d.view = "now";
 						}
 					}
 				}else if(d.view == "fix" && node.data()[d.target].view != "hide"){
-					var propertytext = d.property
-					var linksplit1 = propertytext.split("/");
-					var linksplit2 = linksplit1[linksplit1.length - 1];
-					var linksplit3 = linksplit2.split("#");
-					linktext = linksplit3[linksplit3.length - 1];
+					linktext = d.property
 				}
 				return linktext;
 			});
 
-			link
+		link
 			.style("stroke", function(d){
 				if(d.view == "no"){
@@ -349,6 +348,5 @@
 			});
 
-			redraw();
-		}
+		redraw();
 
 	}).on("click", function(d){
@@ -439,9 +437,5 @@
 			var linktext = "";
 			if((d.view == "now" || d.view == "fix") && (node.data()[d.target].view != "hide")){
-				var propertytext = d.property
-				var linksplit1 = propertytext.split("/");
-				var linksplit2 = linksplit1[linksplit1.length - 1];
-				var linksplit3 = linksplit2.split("#");
-				linktext = linksplit3[linksplit3.length - 1];
+				linktext = d.property
 				d.view = "fix";
 			}
@@ -452,12 +446,15 @@
 		redraw();
 
-	}).on("mouseout", function(d){
-		d.isDrag = false;
 	});
 
-	var redraw = function (){
+	var redraw = function (duration){
+
+		if(duration == undefined){
+			duration = 500;
+		}
+
 		link
 		.transition()
-		.duration(DURATION)
+		.duration(duration)
 		.attr("x1", function(d) {return node.data()[d.source].x;})
 		.attr("y1", function(d) {return node.data()[d.source].y;})
@@ -467,5 +464,5 @@
 		tlink
 		.transition()
-		.duration(DURATION)
+		.duration(duration)
 		.attr("x", function(d) {return (node.data()[d.source].x + node.data()[d.target].x) / 2;})
 		.attr("y", function(d) {return ((node.data()[d.source].y + node.data()[d.target].y) / 2) + 5;});
@@ -473,5 +470,5 @@
 		node
 		.transition()
-		.duration(DURATION)
+		.duration(duration)
 		.attr("cx", function(d) {return d.x;})
 		.attr("cy", function(d) {return d.y;})
@@ -503,5 +500,5 @@
 		tnode
 		.transition()
-		.duration(DURATION)
+		.duration(duration)
 		.attr("x", function(d) {return d.x;})
 		.attr("y", function(d) {
@@ -517,8 +514,4 @@
 		.text(function(d){
 			var nodetext = d.name
-			var nodesplit1 = nodetext.split("/");
-			var nodesplit2 = nodesplit1[nodesplit1.length - 1];
-			var nodesplit3 = nodesplit2.split("#");
-			nodetext = nodesplit3[nodesplit3.length - 1];
 			if(d.view == "hide"){
 				nodetext = "";
@@ -526,6 +519,4 @@
 			return nodetext;
 		});
-
-		DURATION = 500;
 
 	};
@@ -565,5 +556,5 @@
 	});
 
-	redraw();
+	redraw(0);
 }
 
@@ -587,5 +578,5 @@
 		if(i == 0){
 			// 蛻晏屓縺縺代Ν繝ｼ繝医ヮ繝ｼ繝峨ｒ繝励ャ繧ｷ繝･
-			ret['nodes'].push({'name':obj['paths'][0]['startClassURI'], 'group': 0, 'x':50, 'y':50, 'nodeid':ret['nodes'].length, 'view' : 'no', 'path': 'notend'});
+			ret['nodes'].push({'name': obj['paths'][0]['startClassLabel'], 'group': 0, 'x':50, 'y':50, 'nodeid':ret['nodes'].length, 'view' : 'no', 'path': 'notend'});
 		}
 		// 蜈医↓source縺ｫ0�医Ν繝ｼ繝茨ｼ峨ｒ莉｣蜈･
@@ -596,4 +587,11 @@
 		// classLinks縺ｮ謨ｰ縺縺醍ｹｰ繧願ｿ斐＠縺ｪ縺後ｉ
 		for(var j = 0;j < obj['paths'][i]['classLinks'].length; j++){
+
+			// 繝ｪ繝ｳ繧ｯ縺ｮ蜷榊燕繧旦RL譛ｫ蟆ｾ縺九ｉ蜿門ｾ�
+			var propertytext = obj['paths'][i]['classLinks'][j]['propertyURI'];
+			var propertysplit1 = propertytext.split("/");
+			var propertysplit2 = propertysplit1[propertysplit1.length - 1];
+			var propertysplit3 = propertysplit2.split("#");
+			propertytext = propertysplit3[propertysplit3.length - 1];
 
 			if(MAXDEPTH < j+1){
@@ -631,6 +629,6 @@
 					if(!isCommonNow){
 						isCommon = false;
-						ret['nodes'].push({'name':obj['paths'][i]['classLinks'][j]['linkedClassURI'], 'group': (j+1), 'x':0, 'y':0, 'dy':0, 'nodeid':ret['nodes'].length, 'view' : 'no', 'path': 'notend'});
-						ret['links'].push({'source':source, 'target':ret['nodes'].length - 1, 'value':5, 'property':obj['paths'][i]['classLinks'][j]['propertyURI'], 'view' : 'no'});
+						ret['nodes'].push({'name': obj['paths'][i]['classLinks'][j]['nodeLabel'], 'group': (j+1), 'x':0, 'y':0, 'dy':0, 'nodeid':ret['nodes'].length, 'view' : 'no', 'path': 'notend'});
+						ret['links'].push({'source':source, 'target':ret['nodes'].length - 1, 'value':5, 'property': propertytext, 'view' : 'no'});
 						source = ret['nodes'].length - 1;
 					}
@@ -640,12 +638,12 @@
 
 					isCommon = false;
-					ret['nodes'].push({'name':obj['paths'][i]['classLinks'][j]['linkedClassURI'], 'group': (j+1), 'x':0, 'y':0, 'dy':0, 'nodeid':ret['nodes'].length, 'view' : 'no', 'path': 'notend'});
-					ret['links'].push({'source':source, 'target':ret['nodes'].length - 1, 'value':5, 'property':obj['paths'][i]['classLinks'][j]['propertyURI'], 'view' : 'no'});
+					ret['nodes'].push({'name': obj['paths'][i]['classLinks'][j]['nodeLabel'], 'group': (j+1), 'x':0, 'y':0, 'dy':0, 'nodeid':ret['nodes'].length, 'view' : 'no', 'path': 'notend'});
+					ret['links'].push({'source':source, 'target':ret['nodes'].length - 1, 'value':5, 'property': propertytext, 'view' : 'no'});
 					source = ret['nodes'].length - 1;
 				}
 			// 譌｢縺ｫ蜈ｱ騾壹Ν繝ｼ繝医〒縺ｪ縺�↑繧画眠隕剰ｿｽ蜉縺励※谺｡縺ｸ
 			}else{
-				ret['nodes'].push({'name':obj['paths'][i]['classLinks'][j]['linkedClassURI'], 'group': (j+1), 'x':0, 'y':0, 'dy':0, 'nodeid':ret['nodes'].length, 'view' : 'no', 'path': 'notend'});
-				ret['links'].push({'source':source, 'target':ret['nodes'].length - 1, 'value':5, 'property':obj['paths'][i]['classLinks'][j]['propertyURI'], 'view' : 'no'});
+				ret['nodes'].push({'name': obj['paths'][i]['classLinks'][j]['nodeLabel'], 'group': (j+1), 'x':0, 'y':0, 'dy':0, 'nodeid':ret['nodes'].length, 'view' : 'no', 'path': 'notend'});
+				ret['links'].push({'source':source, 'target':ret['nodes'].length - 1, 'value':5, 'property': propertytext, 'view' : 'no'});
 				source = ret['nodes'].length - 1;
 			}
