MadButterfly: nodejs/svg.js comparison

comparison nodejs/svg.js @ 1414:036f2b447860

Merge

author	Thinker K.F. Li <thinker@codemud.net>
date	Wed, 06 Apr 2011 14:37:34 +0800
parents	c918b79892ab
children	6fa411fd9549 13e126941bdd

comparison

equal deleted inserted replaced

-:b8dfa491ed9d
+:036f2b447860
 n =  this._groupMap[id];
 var m = [1,0,0,1,0,0]
 this.parseGroup(m,root,id, n)
 }
+function getName(n)
+{
+var attr = n.attr('mbname');
+var name;
+if (attr) {
+name = attr.value();
+if (name != '') return name;
+}
+attr = n.attr('label');
+if (attr) {
+name = attr.value();
+if (name != '') return name;
+}
+attr = n.attr('id');
+if (attr) {
+name = attr.value();
+if (name != '') return name;
+}
+return '';
+}
 loadSVG.prototype._check_duplicate_src=function(n,coord) {
-var id = n.attr('id');
+var id = getName(n);
-coord.id = id;
 if (id) {
-coord.id = id.value();
+coord.id = id;
+coord.refid = id;
 } else {
 coord.id = "NA";
+	coord.refid ="NA";
 }
 if (n.name()=="use") {
 n.coord.isuse = true
 } else {
 n.coord.isuse = false;
 try {
 if (this.mb_rt.mbnames[id].target) {
 	    sys.puts("duplicated");
 	}
 this.mb_rt.mbnames[id].target = coord;
+	coord.refid = this.mb_rt.mbnames[id].id;
 } catch(e) {
 sys.puts("id "+id+" is not defined");
 }
 }